diff options
| author | kb-elmo <lorwel@mailbox.org> | 2021-06-11 12:35:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 20:35:13 +1000 |
| commit | 0ef145db151f907c33973e3ceab8dc51f7c00b16 (patch) | |
| tree | 6365619adec626d926f6cd64a1a154ac15adec76 /keyboards/matrix/m12og/rev2 | |
| parent | 2e90ef05363893f3aa49c99af408e774609aa97a (diff) | |
| download | qmk_firmware-0ef145db151f907c33973e3ceab8dc51f7c00b16.tar.gz qmk_firmware-0ef145db151f907c33973e3ceab8dc51f7c00b16.zip | |
Add Matrix 8XV1.2 OG rev1 PCB (#11614)
* add v1 12og pcb
* update
* matrix changes for testing
* Update matrix.c
* finalized files
* rename board versions
* update readmes
* typo in readme
* fix board filenames
* Update keyboards/matrix/m12og/rev1/rev1.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* change function
* update halconf and chconf
* merge master
* Update readme.md
* Update readme.md
* Update readme.md
Co-authored-by: Drashna Jaelre <drashna@live.com>
Diffstat (limited to 'keyboards/matrix/m12og/rev2')
| -rw-r--r-- | keyboards/matrix/m12og/rev2/config.h | 38 | ||||
| -rw-r--r-- | keyboards/matrix/m12og/rev2/info.json | 15 | ||||
| -rw-r--r-- | keyboards/matrix/m12og/rev2/keymaps/default/keymap.c | 25 | ||||
| -rw-r--r-- | keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c | 24 | ||||
| -rw-r--r-- | keyboards/matrix/m12og/rev2/keymaps/via/keymap.c | 57 | ||||
| -rw-r--r-- | keyboards/matrix/m12og/rev2/keymaps/via/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/matrix/m12og/rev2/readme.md | 16 | ||||
| -rw-r--r-- | keyboards/matrix/m12og/rev2/rev2.c | 21 | ||||
| -rw-r--r-- | keyboards/matrix/m12og/rev2/rev2.h | 57 | ||||
| -rw-r--r-- | keyboards/matrix/m12og/rev2/rules.mk | 26 |
10 files changed, 280 insertions, 0 deletions
diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h new file mode 100644 index 000000000..fae5192a3 --- /dev/null +++ b/keyboards/matrix/m12og/rev2/config.h | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | /** | ||
| 2 | * config.h | ||
| 3 | */ | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | #include "config_common.h" | ||
| 8 | |||
| 9 | /* USB Device descriptor parameter */ | ||
| 10 | #define VENDOR_ID 0x4D58 // MX | ||
| 11 | #define PRODUCT_ID 0x8712 // matrix 1.2 og | ||
| 12 | #define DEVICE_VER 0x0001 | ||
| 13 | #define MANUFACTURER matrix | ||
| 14 | #define PRODUCT M12OG | ||
| 15 | |||
| 16 | /* key matrix size */ | ||
| 17 | #define MATRIX_ROWS 7 | ||
| 18 | #define MATRIX_COLS 14 | ||
| 19 | |||
| 20 | /* key matrix pins */ | ||
| 21 | #define MATRIX_ROW_PINS { E6, F0, B7, C7, D3, B0, D1 } | ||
| 22 | #define MATRIX_COL_PINS { F1, F4, F5, F6, F7, B6, B5, B4, D7, D0, D2, D6, D4, D5 } | ||
| 23 | #define UNUSED_PINS | ||
| 24 | |||
| 25 | /* COL2ROW or ROW2COL */ | ||
| 26 | #define DIODE_DIRECTION COL2ROW | ||
| 27 | |||
| 28 | #define RGB_DI_PIN B3 | ||
| 29 | |||
| 30 | #ifdef RGB_DI_PIN | ||
| 31 | #define RGBLIGHT_ANIMATIONS | ||
| 32 | #define RGBLED_NUM 16 | ||
| 33 | #define RGBLIGHT_HUE_STEP 8 | ||
| 34 | #define RGBLIGHT_SAT_STEP 8 | ||
| 35 | #define RGBLIGHT_VAL_STEP 8 | ||
| 36 | #define RGBLIGHT_SLEEP | ||
| 37 | #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB | ||
| 38 | #endif | ||
diff --git a/keyboards/matrix/m12og/rev2/info.json b/keyboards/matrix/m12og/rev2/info.json new file mode 100644 index 000000000..3b610d715 --- /dev/null +++ b/keyboards/matrix/m12og/rev2/info.json | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | { | ||
| 2 | "keyboard_name": "Matrix 8XV1.2 OG ISO/ANSI", | ||
| 3 | "url": "", | ||
| 4 | "maintainer": "qmk", | ||
| 5 | "width": 18.25, | ||
| 6 | "height": 6.5, | ||
| 7 | "layouts": { | ||
| 8 | "LAYOUT_tkl_ansi": { | ||
| 9 | "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":"PrtSc", "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.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":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Menu", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] | ||
| 10 | }, | ||
| 11 | "LAYOUT_tkl_iso": { | ||
| 12 | "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":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"\u00ac", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"\"", "x":2, "y":1.5}, {"label":"\u00a3", "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":"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":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"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":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"AltGr", "x":11, "y":5.5, "w":1.5}, {"label":"Menu", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] | ||
| 13 | } | ||
| 14 | } | ||
| 15 | } | ||
diff --git a/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c new file mode 100644 index 000000000..1444e4bff --- /dev/null +++ b/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | /** | ||
| 2 | * keymap.c | ||
| 3 | */ | ||
| 4 | |||
| 5 | #include QMK_KEYBOARD_H | ||
| 6 | |||
| 7 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 8 | [0]=LAYOUT_tkl_ansi( | ||
| 9 | 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_SLCK, LT(1,KC_PAUS), | ||
| 10 | |||
| 11 | 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, | ||
| 12 | 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, | ||
| 13 | 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, | ||
| 14 | 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, | ||
| 15 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), | ||
| 16 | |||
| 17 | [1]=LAYOUT_tkl_ansi( | ||
| 18 | KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 19 | |||
| 20 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 21 | KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 22 | RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 23 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, | ||
| 24 | _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), | ||
| 25 | }; | ||
diff --git a/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c new file mode 100644 index 000000000..70d0d7bc1 --- /dev/null +++ b/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | /** | ||
| 2 | * keymap.c | ||
| 3 | */ | ||
| 4 | |||
| 5 | #include QMK_KEYBOARD_H | ||
| 6 | |||
| 7 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 8 | [0]=LAYOUT_tkl_iso( | ||
| 9 | 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_SLCK, LT(1,KC_PAUS), | ||
| 10 | 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, | ||
| 11 | 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, | ||
| 12 | 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_BSLS, KC_ENT, | ||
| 13 | KC_LSFT, KC_LGUI, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, | ||
| 14 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), | ||
| 15 | |||
| 16 | [1]=LAYOUT_tkl_iso( | ||
| 17 | KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 18 | |||
| 19 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 20 | KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, | ||
| 21 | RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 22 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, | ||
| 23 | _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), | ||
| 24 | }; | ||
diff --git a/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c new file mode 100644 index 000000000..1ae1400fe --- /dev/null +++ b/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c | |||
| @@ -0,0 +1,57 @@ | |||
| 1 | /* Copyright 2021 kb-elmo<mail@elmo.space> | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #include QMK_KEYBOARD_H | ||
| 18 | |||
| 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 20 | [0]=LAYOUT_all( | ||
| 21 | 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_SLCK, KC_PAUS, | ||
| 22 | |||
| 23 | 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_BSPC, KC_INS, KC_HOME, KC_PGUP, | ||
| 24 | 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, | ||
| 25 | 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, | ||
| 26 | 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, MO(1), KC_UP, | ||
| 27 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | ||
| 28 | ), | ||
| 29 | |||
| 30 | [1]=LAYOUT_all( | ||
| 31 | KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 32 | |||
| 33 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 34 | KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 35 | RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, | ||
| 37 | _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT | ||
| 38 | ), | ||
| 39 | [2]=LAYOUT_all( | ||
| 40 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 41 | |||
| 42 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 43 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 44 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 46 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 47 | ), | ||
| 48 | [3]=LAYOUT_all( | ||
| 49 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 50 | |||
| 51 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 52 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 53 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 54 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 55 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 56 | ) | ||
| 57 | }; | ||
diff --git a/keyboards/matrix/m12og/rev2/keymaps/via/rules.mk b/keyboards/matrix/m12og/rev2/keymaps/via/rules.mk new file mode 100644 index 000000000..1e5b99807 --- /dev/null +++ b/keyboards/matrix/m12og/rev2/keymaps/via/rules.mk | |||
| @@ -0,0 +1 @@ | |||
| VIA_ENABLE = yes | |||
diff --git a/keyboards/matrix/m12og/rev2/readme.md b/keyboards/matrix/m12og/rev2/readme.md new file mode 100644 index 000000000..bf8d6905b --- /dev/null +++ b/keyboards/matrix/m12og/rev2/readme.md | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | # Matrix 8XV1.2 OG keyboard | ||
| 2 | |||
| 3 |  | ||
| 4 | |||
| 5 | This was the Matrix 8XV1.2 OG keyboard made by the Matrix team. | ||
| 6 | Note: This firmware only supports ISO/ANSI version (white PCB), and DOES NOT support the 8XV1.2 OG ANSI only version. | ||
| 7 | |||
| 8 | * Keyboard Maintainer: [astro](https://github.com/yulei) | ||
| 9 | * Hardware Supported: Matrix 8XV1.2 OG (ISO/ANSI) PCB | ||
| 10 | * Hardware Availability: Matrix Lab | ||
| 11 | |||
| 12 | Make example for this keyboard (after setting up your build environment): | ||
| 13 | |||
| 14 | make matrix/m12og/rev2:default | ||
| 15 | |||
| 16 | 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/matrix/m12og/rev2/rev2.c b/keyboards/matrix/m12og/rev2/rev2.c new file mode 100644 index 000000000..4f2af13eb --- /dev/null +++ b/keyboards/matrix/m12og/rev2/rev2.c | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | /** | ||
| 2 | * rev2.c | ||
| 3 | */ | ||
| 4 | |||
| 5 | #include "rev2.h" | ||
| 6 | |||
| 7 | void matrix_init_user(void) { | ||
| 8 | setPinOutput(C6); | ||
| 9 | setPinOutput(B2); | ||
| 10 | setPinOutput(B1); | ||
| 11 | } | ||
| 12 | |||
| 13 | bool led_update_kb(led_t led_state) { | ||
| 14 | bool res = led_update_user(led_state); | ||
| 15 | if (res) { | ||
| 16 | writePin(B1, !led_state.num_lock); | ||
| 17 | writePin(C6, !led_state.caps_lock); | ||
| 18 | writePin(B2, !led_state.scroll_lock); | ||
| 19 | } | ||
| 20 | return res; | ||
| 21 | } | ||
diff --git a/keyboards/matrix/m12og/rev2/rev2.h b/keyboards/matrix/m12og/rev2/rev2.h new file mode 100644 index 000000000..b2aa4aea7 --- /dev/null +++ b/keyboards/matrix/m12og/rev2/rev2.h | |||
| @@ -0,0 +1,57 @@ | |||
| 1 | /** | ||
| 2 | * m12og.h | ||
| 3 | */ | ||
| 4 | #pragma once | ||
| 5 | |||
| 6 | #include "quantum.h" | ||
| 7 | |||
| 8 | #define LAYOUT_all( \ | ||
| 9 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K500, K501, K502,\ | ||
| 10 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K013, K503, K504, K505,\ | ||
| 11 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K506, K507, K508,\ | ||
| 12 | K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ | ||
| 13 | K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K610, \ | ||
| 14 | K600, K601, K602, K603, K604, K605, K606, K607, K608, K609 \ | ||
| 15 | ) { \ | ||
| 16 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ | ||
| 17 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ | ||
| 18 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ | ||
| 19 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ | ||
| 20 | { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413 }, \ | ||
| 21 | { K500, K501, K502, K503, K504, K505, K506, K507, K508, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 22 | { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610, KC_NO, KC_NO, KC_NO } \ | ||
| 23 | } | ||
| 24 | |||
| 25 | #define LAYOUT_tkl_iso( \ | ||
| 26 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K500, K501, K502, \ | ||
| 27 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013, K503, K504, K505, \ | ||
| 28 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K506, K507, K508, \ | ||
| 29 | K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ | ||
| 30 | K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K610, \ | ||
| 31 | K600, K601, K602, K603, K604, K605, K606, K607, K608, K609 \ | ||
| 32 | ) { \ | ||
| 33 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ | ||
| 34 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO }, \ | ||
| 35 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO }, \ | ||
| 36 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ | ||
| 37 | { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO }, \ | ||
| 38 | { K500, K501, K502, K503, K504, K505, K506, K507, K508, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 39 | { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610, KC_NO, KC_NO, KC_NO } \ | ||
| 40 | } | ||
| 41 | |||
| 42 | #define LAYOUT_tkl_ansi( \ | ||
| 43 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K500, K501, K502, \ | ||
| 44 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013, K503, K504, K505, \ | ||
| 45 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K506, K507, K508, \ | ||
| 46 | K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ | ||
| 47 | K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K610, \ | ||
| 48 | K600, K601, K602, K603, K604, K605, K606, K607, K608, K609 \ | ||
| 49 | ) { \ | ||
| 50 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ | ||
| 51 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO }, \ | ||
| 52 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ | ||
| 53 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313 }, \ | ||
| 54 | { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO }, \ | ||
| 55 | { K500, K501, K502, K503, K504, K505, K506, K507, K508, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 56 | { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610, KC_NO, KC_NO, KC_NO } \ | ||
| 57 | } | ||
diff --git a/keyboards/matrix/m12og/rev2/rules.mk b/keyboards/matrix/m12og/rev2/rules.mk new file mode 100644 index 000000000..58ec898a6 --- /dev/null +++ b/keyboards/matrix/m12og/rev2/rules.mk | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | # MCU name | ||
| 2 | MCU = atmega32u4 | ||
| 3 | |||
| 4 | # Bootloader selection | ||
| 5 | # Teensy halfkay | ||
| 6 | # Pro Micro caterina | ||
| 7 | # Atmel DFU atmel-dfu | ||
| 8 | # LUFA DFU lufa-dfu | ||
| 9 | # QMK DFU qmk-dfu | ||
| 10 | # ATmega32A bootloadHID | ||
| 11 | # ATmega328P USBasp | ||
| 12 | BOOTLOADER = atmel-dfu | ||
| 13 | |||
| 14 | # Build Options | ||
| 15 | # comment out to disable the options. | ||
| 16 | # | ||
| 17 | BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration | ||
| 18 | MOUSEKEY_ENABLE = no # Mouse keys | ||
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | ||
| 20 | CONSOLE_ENABLE = no # Console for debug | ||
| 21 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
| 22 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
| 23 | NKRO_ENABLE = yes # USB Nkey Rollover | ||
| 24 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | ||
| 25 | AUDIO_ENABLE = no | ||
| 26 | RGBLIGHT_ENABLE = yes | ||
