diff options
| author | QMK Bot <hello@qmk.fm> | 2021-07-09 09:41:24 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-07-09 09:41:24 +0000 |
| commit | 5179d573aa4e7b97a41725b1a572999f68a91174 (patch) | |
| tree | b0322aa511fa3f81ff4c7442bfebdcd7bea8de7d /keyboards/mechmini | |
| parent | 8ffdf830152a7c29e46445788421fd8f8d60a274 (diff) | |
| parent | 572a35d9a25584daa7e95df26ea45784650f0b1f (diff) | |
| download | qmk_firmware-5179d573aa4e7b97a41725b1a572999f68a91174.tar.gz qmk_firmware-5179d573aa4e7b97a41725b1a572999f68a91174.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/mechmini')
| -rw-r--r-- | keyboards/mechmini/v1/info.json | 49 | ||||
| -rw-r--r-- | keyboards/mechmini/v1/keymaps/default/keymap.c | 59 | ||||
| -rw-r--r-- | keyboards/mechmini/v1/v1.h | 44 |
3 files changed, 98 insertions, 54 deletions
diff --git a/keyboards/mechmini/v1/info.json b/keyboards/mechmini/v1/info.json index d99f36094..722f8ed8d 100644 --- a/keyboards/mechmini/v1/info.json +++ b/keyboards/mechmini/v1/info.json | |||
| @@ -1,10 +1,57 @@ | |||
| 1 | { | 1 | { |
| 2 | "keyboard_name": "MechMini", | 2 | "keyboard_name": "MechMini v1", |
| 3 | "url": "", | 3 | "url": "", |
| 4 | "maintainer": "qmk", | 4 | "maintainer": "qmk", |
| 5 | "width": 12, | 5 | "width": 12, |
| 6 | "height": 4, | 6 | "height": 4, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT": { | ||
| 9 | "layout": [ | ||
| 10 | {"x":0, "y":0}, | ||
| 11 | {"x":1, "y":0}, | ||
| 12 | {"x":2, "y":0}, | ||
| 13 | {"x":3, "y":0}, | ||
| 14 | {"x":4, "y":0}, | ||
| 15 | {"x":5, "y":0}, | ||
| 16 | {"x":6, "y":0}, | ||
| 17 | {"x":7, "y":0}, | ||
| 18 | {"x":8, "y":0}, | ||
| 19 | {"x":9, "y":0}, | ||
| 20 | {"x":10, "y":0}, | ||
| 21 | {"x":11, "y":0}, | ||
| 22 | |||
| 23 | {"x":0, "y":1, "w":1.25}, | ||
| 24 | {"x":1.25, "y":1}, | ||
| 25 | {"x":2.25, "y":1}, | ||
| 26 | {"x":3.25, "y":1}, | ||
| 27 | {"x":4.25, "y":1}, | ||
| 28 | {"x":5.25, "y":1}, | ||
| 29 | {"x":6.25, "y":1}, | ||
| 30 | {"x":7.25, "y":1}, | ||
| 31 | {"x":8.25, "y":1}, | ||
| 32 | {"x":9.25, "y":1}, | ||
| 33 | {"x":10.25, "y":1, "w":1.75}, | ||
| 34 | |||
| 35 | {"x":0, "y":2, "w":1.75}, | ||
| 36 | {"x":1.75, "y":2}, | ||
| 37 | {"x":2.75, "y":2}, | ||
| 38 | {"x":3.75, "y":2}, | ||
| 39 | {"x":4.75, "y":2}, | ||
| 40 | {"x":5.75, "y":2}, | ||
| 41 | {"x":6.75, "y":2}, | ||
| 42 | {"x":7.75, "y":2}, | ||
| 43 | {"x":8.75, "y":2}, | ||
| 44 | {"x":9.75, "y":2, "w":1.25}, | ||
| 45 | {"x":11, "y":2}, | ||
| 46 | |||
| 47 | {"x":0, "y":3, "w":1.25}, | ||
| 48 | {"x":1.25, "y":3}, | ||
| 49 | {"x":2.25, "y":3}, | ||
| 50 | {"x":3.25, "y":3, "w":6.25}, | ||
| 51 | {"x":9.5, "y":3, "w":1.25}, | ||
| 52 | {"x":10.75, "y":3, "w":1.25} | ||
| 53 | ] | ||
| 54 | }, | ||
| 8 | "LAYOUT_split_space": { | 55 | "LAYOUT_split_space": { |
| 9 | "layout": [ | 56 | "layout": [ |
| 10 | {"x":0, "y":0}, | 57 | {"x":0, "y":0}, |
diff --git a/keyboards/mechmini/v1/keymaps/default/keymap.c b/keyboards/mechmini/v1/keymaps/default/keymap.c index f9e446064..e0b746df9 100644 --- a/keyboards/mechmini/v1/keymaps/default/keymap.c +++ b/keyboards/mechmini/v1/keymaps/default/keymap.c | |||
| @@ -15,35 +15,36 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 15 | 15 | ||
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | #define _BL 0 // base layer | 18 | enum layer_names { |
| 19 | #define _FN1 1 // function layer 1 | 19 | _BL, // base layer |
| 20 | #define _FN2 2 // function layer 2 | 20 | _NV, // navigation layer |
| 21 | #define _FN3 3 // function layer 3 | 21 | _NP, // numbers and punctuation layer |
| 22 | #define _____ KC_TRNS | 22 | _FN // function keys |
| 23 | }; | ||
| 23 | 24 | ||
| 24 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 25 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 25 | [_BL] = KEYMAP( | 26 | [_BL] = LAYOUT( |
| 26 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | 27 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
| 27 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, | 28 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, |
| 28 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(_FN2), | 29 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(_NP), |
| 29 | KC_LCTL, KC_LGUI, KC_LALT, _____, KC_SPC, _____, MO(_FN1), MO(_FN3) | 30 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_NV), MO(_FN) |
| 30 | ), | 31 | ), |
| 31 | [_FN1] = KEYMAP( | 32 | [_NV] = LAYOUT( |
| 32 | KC_GRAVE, _____, KC_UP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MPLY, KC_MFFD, KC_SLCK, KC_PAUS, KC_DEL, | 33 | KC_GRV, _______, KC_UP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MPLY, KC_MFFD, KC_SLCK, KC_PAUS, KC_DEL, |
| 33 | KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, _____, _____, _____, KC_INS, KC_HOME, KC_PGUP, KC_PSCR, | 34 | KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_INS, KC_HOME, KC_PGUP, KC_PSCR, |
| 34 | _____, _____, M(0), M(1), M(2), _____, _____, KC_END, KC_PGDN, _____, _____, | 35 | _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, _______, _______, |
| 35 | _____, _____, _____, _____, _____, _____, _____, _____ | 36 | _______, _______, _______, _______, _______, _______ |
| 36 | ), | 37 | ), |
| 37 | [_FN2] = KEYMAP( | 38 | [_NP] = LAYOUT( |
| 38 | KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, | 39 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, |
| 39 | KC_CAPS, _____, _____, _____, _____, KC_LBRC, KC_RBRC, KC_BSLS, KC_MINS, KC_EQL, _____, | 40 | KC_CAPS, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, KC_MINS, KC_EQL, _______, |
| 40 | _____, _____, _____, _____, _____, _____, _____, KC_SCLN, KC_QUOT, KC_SLSH, _____, | 41 | _______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_SLSH, _______, |
| 41 | _____, _____, _____, _____, _____, _____, _____, _____ | 42 | _______, _______, _______, _______, _______, _______ |
| 42 | ), | 43 | ), |
| 43 | [_FN3] = KEYMAP( | 44 | [_FN] = LAYOUT( |
| 44 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, | 45 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, |
| 45 | _____, M(3), M(4), M(5), _____, _____, _____, _____, _____, _____, _____, | 46 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 46 | _____, M(6), _____, _____, _____, _____, _____, _____, _____, _____, _____, | 47 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 47 | _____, _____, _____, _____, _____, _____, _____, _____ | 48 | _______, _______, _______, _______, _______, _______ |
| 48 | ) | 49 | ) |
| 49 | }; | 50 | }; |
diff --git a/keyboards/mechmini/v1/v1.h b/keyboards/mechmini/v1/v1.h index 401eac85b..526f12e41 100644 --- a/keyboards/mechmini/v1/v1.h +++ b/keyboards/mechmini/v1/v1.h | |||
| @@ -15,38 +15,34 @@ You should have received a copy of the GNU General Public License | |||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #ifndef V1_H | 18 | #pragma once |
| 19 | #define V2_H | ||
| 20 | 19 | ||
| 21 | #include "../mechmini.h" | 20 | #include "mechmini.h" |
| 22 | #include "keycode.h" | 21 | |
| 23 | #include "action.h" | 22 | #define ___ KC_NO |
| 24 | #include "quantum.h" | ||
| 25 | 23 | ||
| 26 | #define LAYOUT( \ | 24 | #define LAYOUT( \ |
| 27 | K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, \ | 25 | K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \ |
| 28 | K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, \ | 26 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \ |
| 29 | K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, \ | 27 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ |
| 30 | K00, K10, K20, K56, K57, KB0, KC0, K66 \ | 28 | K00, K01, K02, K05, K09, K0A \ |
| 31 | ) \ | 29 | ) \ |
| 32 | { \ | 30 | { \ |
| 33 | { K00, K10, K20, K56, KC_NO, K57, KC_NO, KC_NO, KB0, KC0, K66, KC_NO }, \ | 31 | { K00, K01, K02, ___, ___, K05, ___, ___, ___, K09, K0A, ___ }, \ |
| 34 | { K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KC_NO }, \ | 32 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, ___ }, \ |
| 35 | { K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KC_NO }, \ | 33 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___ }, \ |
| 36 | { K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3 } \ | 34 | { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \ |
| 37 | } | 35 | } |
| 38 | 36 | ||
| 39 | #define LAYOUT_split_space( \ | 37 | #define LAYOUT_split_space( \ |
| 40 | K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, \ | 38 | K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \ |
| 41 | K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, \ | 39 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \ |
| 42 | K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, \ | 40 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ |
| 43 | K00, K10, K20, K56, K57, KB0, KC0, K66 \ | 41 | K00, K01, K02, K03, K06, K08, K09, K0A \ |
| 44 | ) \ | 42 | ) \ |
| 45 | { \ | 43 | { \ |
| 46 | { K00, K10, K20, K56, KC_NO, KC_NO, K57, KC_NO, KB0, KC0, K66, KC_NO }, \ | 44 | { K00, K01, K02, K03, ___, ___, K06, ___, K08, K09, K0A, ___ }, \ |
| 47 | { K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KC_NO }, \ | 45 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, ___ }, \ |
| 48 | { K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KC_NO }, \ | 46 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___ }, \ |
| 49 | { K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3 } \ | 47 | { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \ |
| 50 | } | 48 | } |
| 51 | |||
| 52 | #endif | ||
