qmk

Unnamed repository; edit this file 'description' to name the repository.
git clone git://git.z3bra.org/qmk.git
Log | Files | Refs | Submodules | LICENSE

commit 0470017c21608b501af8ab01ab708ab2898e8141
parent 585f753ffee5b81c5c7262d1d288d95342e28cd6
Author: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date:   Sun,  1 Jul 2018 11:02:26 -0700

Miuni32 refactor and Configurator support (#3273)

* Matrix refactor

* Keymap refactor

* Configurator support

* Readme formatting update

Diffstat:
keyboards/miuni32/info.json | 17+++++++++++++++++
keyboards/miuni32/keymaps/adam-lee/keymap.c | 91+++++++++++++++++++++++++++++++++++++++++--------------------------------------
keyboards/miuni32/keymaps/default/keymap.c | 91+++++++++++++++++++++++++++++++++++++++++--------------------------------------
keyboards/miuni32/keymaps/ht_156/keymap.c | 111+++++++++++++++++++++++++++++++++++++++++--------------------------------------
keyboards/miuni32/keymaps/ki/keymap.c | 102++++++++++++++++++++++++++++++++++++++++---------------------------------------
keyboards/miuni32/miuni32.h | 23++++++++++++++++++-----
keyboards/miuni32/readme.md | 4++--
7 files changed, 240 insertions(+), 199 deletions(-)

diff --git a/keyboards/miuni32/info.json b/keyboards/miuni32/info.json @@ -0,0 +1,17 @@ +{ + "keyboard_name": "miuni32", + "url": "", + "maintainer": "qmk", + "width": 11, + "height": 3, + "layouts": { + "LAYOUT": { + "key_count": 32, + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "w":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}] + }, + "LAYOUT_ortho_3x11": { + "key_count": 33, + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}] + } + } +} diff --git a/keyboards/miuni32/keymaps/adam-lee/keymap.c b/keyboards/miuni32/keymaps/adam-lee/keymap.c @@ -1,4 +1,7 @@ -#include "miuni32.h" +#include QMK_KEYBOARD_H + +#define _______ KC_TRNS +#define XXXXXXX KC_NO const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Level 0: Default Layer @@ -7,56 +10,56 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------------------------------| * | A | S | D | F | G | H | J | K | L | ENT |LT(1|,)| * |---------------------------------------------------------------------------------------| - * |LT(3|Z)| X | C | V | NO | SPC | B | N | M | RSFT |LT(2|.)| + * |LT(3|Z)| X | C | V | SPC | B | N | M | RSFT |LT(2|.)| * |---------------------------------------------------------------------------------------| */ - [0] ={ - {KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, - {KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, LT(1, KC_COMMA)}, - {LT(3, KC_Z), KC_X, KC_C, KC_V, KC_NO, KC_SPC, KC_B, KC_N, KC_M, KC_RSFT, LT(2, KC_DOT)} - }, - /* Level 1: Numbers Layer + [0] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, LT(1, KC_COMMA), + LT(3, KC_Z), KC_X, KC_C, KC_V, KC_SPC, KC_B, KC_N, KC_M, KC_RSFT, LT(2, KC_DOT) + ), + /* Level 1: Numbers Layer * ,---------------------------------------------------------------------------------------. * | ESC | 7 | 8 | 9 | / | * | . | , | ( | ) | DEL | * |---------------------------------------------------------------------------------------| * | TAB | 4 | 5 | 6 | - | + | HOME | UP | END | PGUP | TRNS | * |---------------------------------------------------------------------------------------| - * | LATL | 1 | 2 | 3 | 0 | NO | LEFT | DOWN | RGHT | PGDN | RSHFT | + * | LATL | 1 | 2 | 3 | 0 | LEFT | DOWN | RGHT | PGDN | RSHFT | * |---------------------------------------------------------------------------------------| */ - [1] ={ - {KC_ESC, KC_7, KC_8, KC_9, KC_SLSH, KC_ASTR, KC_DOT, KC_COMM, KC_LPRN, KC_RPRN, KC_DEL}, - {KC_TAB, KC_4, KC_5, KC_6, KC_MINS, KC_PLUS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS}, - {KC_LALT, KC_1, KC_2, KC_3, KC_0, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_RSFT} - }, - /* Level 2: Symbols Layer + [1] = LAYOUT( + KC_ESC, KC_7, KC_8, KC_9, KC_SLSH, KC_ASTR, KC_DOT, KC_COMM, KC_LPRN, KC_RPRN, KC_DEL, + KC_TAB, KC_4, KC_5, KC_6, KC_MINS, KC_PLUS, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, + KC_LALT, KC_1, KC_2, KC_3, KC_0, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_RSFT + ), + /* Level 2: Symbols Layer * ,---------------------------------------------------------------------------------------. * | ! | @ | # | $ | % | ^ | & | * | - | + | = | * |---------------------------------------------------------------------------------------| * | { | } | [ | ] | TRNS | TRNS | \ | ; | : | ` | ? | * |---------------------------------------------------------------------------------------| - * | LSFT | LCTL | L | T | TRNS | TAB | N | TRNS | TRNS | RCTL | TRNS | + * | LSFT | LCTL | L | T | TAB | N | TRNS | TRNS | RCTL | TRNS | * |---------------------------------------------------------------------------------------| */ - [2] ={ - {KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_PLUS, KC_EQL}, - {KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_BSLS, KC_SCLN, KC_COLN, KC_GRV, KC_QUES}, - {KC_LSFT, KC_LCTL, KC_L, KC_T, KC_TRNS, KC_TAB, KC_N, KC_TRNS, KC_TRNS, KC_RCTL, KC_TRNS} - }, - /* Level 3: RGB Layer + [2] = LAYOUT( + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_PLUS, KC_EQL, + KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, _______, _______, KC_BSLS, KC_SCLN, KC_COLN, KC_GRV, KC_QUES, + KC_LSFT, KC_LCTL, KC_L, KC_T, KC_TAB, KC_N, _______, _______, KC_RCTL, _______ + ), + /* Level 3: RGB Layer * ,---------------------------------------------------------------------------------------. * | RESET | TRNS | TRNS | TRNS | TRNS | F1 | F2 | F3 | F4 | F5 | F6 | * |---------------------------------------------------------------------------------------| * |RGB_TOG|RGB_MOD|RGB_HUI|RGB_HUD| NO |RGB_SAI|RGB_SAD|RGB_VAI|RGB_VAD| TRNS | TRNS | * |---------------------------------------------------------------------------------------| - * | TRNS | TRNS | TRNS | TRNS | NO | F7 | F8 | F9 | F10 | F11 | F12 | + * | TRNS | TRNS | TRNS | TRNS | F7 | F8 | F9 | F10 | F11 | F12 | * |---------------------------------------------------------------------------------------| */ - [3] ={ - {RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6}, - {RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, KC_NO, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12} - } + [3] = LAYOUT( + RESET, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, KC_NO, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, + _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 + ) }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) @@ -81,39 +84,39 @@ void matrix_scan_user(void) { } bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; + return true; } void led_set_user(uint8_t usb_led) { - if (usb_led & (1 << USB_LED_NUM_LOCK)) { + if (usb_led & (1 << USB_LED_NUM_LOCK)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { + if (usb_led & (1 << USB_LED_CAPS_LOCK)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { + if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_COMPOSE)) { + if (usb_led & (1 << USB_LED_COMPOSE)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_KANA)) { + if (usb_led & (1 << USB_LED_KANA)) { - } else { + } else { - } + } } diff --git a/keyboards/miuni32/keymaps/default/keymap.c b/keyboards/miuni32/keymaps/default/keymap.c @@ -1,4 +1,7 @@ -#include "miuni32.h" +#include QMK_KEYBOARD_H + +#define _______ KC_TRNS +#define XXXXXXX KC_NO const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Level 0: Default Layer @@ -7,56 +10,56 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------------------------------| * | A | S | D | F | G | H | J | K | L | ENT |LT(1|,)| * |---------------------------------------------------------------------------------------| - * |LT(3|Z)| X | C | V | NO | SPC | B | N | M | RSFT |LT(2|.)| + * |LT(3|Z)| X | C | V | SPC | B | N | M | RSFT |LT(2|.)| * |---------------------------------------------------------------------------------------| */ - [0] ={ - {KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, - {KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, LT(1, KC_COMMA)}, - {LT(3, KC_Z), KC_X, KC_C, KC_V, KC_NO, KC_SPC, KC_B, KC_N, KC_M, KC_RSFT, LT(2, KC_DOT)} - }, - /* Level 1: Numbers Layer + [0] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, LT(1, KC_COMMA), + LT(3, KC_Z), KC_X, KC_C, KC_V, KC_SPC, KC_B, KC_N, KC_M, KC_RSFT, LT(2, KC_DOT) + ), + /* Level 1: Numbers Layer * ,---------------------------------------------------------------------------------------. * | ESC | 7 | 8 | 9 | / | * | . | , | ( | ) | DEL | * |---------------------------------------------------------------------------------------| * | TAB | 4 | 5 | 6 | - | + | HOME | UP | END | PGUP | TRNS | * |---------------------------------------------------------------------------------------| - * | LATL | 1 | 2 | 3 | 0 | NO | LEFT | DOWN | RGHT | PGDN | RSHFT | + * | LATL | 1 | 2 | 3 | 0 | LEFT | DOWN | RGHT | PGDN | RSHFT | * |---------------------------------------------------------------------------------------| */ - [1] ={ - {KC_ESC, KC_7, KC_8, KC_9, KC_SLSH, KC_ASTR, KC_DOT, KC_COMM, KC_LPRN, KC_RPRN, KC_DEL}, - {KC_TAB, KC_4, KC_5, KC_6, KC_MINS, KC_PLUS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS}, - {KC_LALT, KC_1, KC_2, KC_3, KC_0, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_RSFT} - }, - /* Level 2: Symbols Layer + [1] = LAYOUT( + KC_ESC, KC_7, KC_8, KC_9, KC_SLSH, KC_ASTR, KC_DOT, KC_COMM, KC_LPRN, KC_RPRN, KC_DEL, + KC_TAB, KC_4, KC_5, KC_6, KC_MINS, KC_PLUS, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, + KC_LALT, KC_1, KC_2, KC_3, KC_0, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_RSFT + ), + /* Level 2: Symbols Layer * ,---------------------------------------------------------------------------------------. * | ! | @ | # | $ | % | ^ | & | * | - | + | = | * |---------------------------------------------------------------------------------------| * | { | } | [ | ] | TRNS | TRNS | \ | ; | : | ` | ? | * |---------------------------------------------------------------------------------------| - * | LSFT | LCTL | L | T | TRNS | TAB | N | TRNS | TRNS | RCTL | TRNS | + * | LSFT | LCTL | L | T | TAB | N | TRNS | TRNS | RCTL | TRNS | * |---------------------------------------------------------------------------------------| */ - [2] ={ - {KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_PLUS, KC_EQL}, - {KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_BSLS, KC_SCLN, KC_COLN, KC_GRV, KC_QUES}, - {KC_LSFT, KC_LCTL, KC_L, KC_T, KC_TRNS, KC_TAB, KC_N, KC_TRNS, KC_TRNS, KC_RCTL, KC_TRNS} - }, - /* Level 3: RGB Layer + [2] = LAYOUT( + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_PLUS, KC_EQL, + KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, _______, _______, KC_BSLS, KC_SCLN, KC_COLN, KC_GRV, KC_QUES, + KC_LSFT, KC_LCTL, KC_L, KC_T, KC_TAB, KC_N, _______, _______, KC_RCTL, _______ + ), + /* Level 3: RGB Layer * ,---------------------------------------------------------------------------------------. * | RESET | TRNS | TRNS | TRNS | TRNS | F1 | F2 | F3 | F4 | F5 | F6 | * |---------------------------------------------------------------------------------------| * |RGB_TOG|RGB_MOD|RGB_HUI|RGB_HUD| NO |RGB_SAI|RGB_SAD|RGB_VAI|RGB_VAD| TRNS | TRNS | * |---------------------------------------------------------------------------------------| - * | TRNS | TRNS | TRNS | TRNS | NO | F7 | F8 | F9 | F10 | F11 | F12 | + * | TRNS | TRNS | TRNS | TRNS | F7 | F8 | F9 | F10 | F11 | F12 | * |---------------------------------------------------------------------------------------| */ - [3] ={ - {RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6}, - {RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, KC_NO, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12} - } + [3] = LAYOUT( + RESET, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, KC_NO, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, + _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 + ) }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) @@ -81,39 +84,39 @@ void matrix_scan_user(void) { } bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; + return true; } void led_set_user(uint8_t usb_led) { - if (usb_led & (1 << USB_LED_NUM_LOCK)) { + if (usb_led & (1 << USB_LED_NUM_LOCK)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { + if (usb_led & (1 << USB_LED_CAPS_LOCK)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { + if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_COMPOSE)) { + if (usb_led & (1 << USB_LED_COMPOSE)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_KANA)) { + if (usb_led & (1 << USB_LED_KANA)) { - } else { + } else { - } + } } diff --git a/keyboards/miuni32/keymaps/ht_156/keymap.c b/keyboards/miuni32/keymaps/ht_156/keymap.c @@ -1,4 +1,7 @@ -#include "miuni32.h" +#include QMK_KEYBOARD_H + +#define _______ KC_TRNS +#define XXXXXXX KC_NO // Keyboard layer definitions #define BASE 0 @@ -22,12 +25,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |LT(2|Z)|LT(3|X)| C | V | B | SPC | N | M | , |LT(1|.)| RCTL | * |---------------------------------------------------------------------------------------| */ - [BASE] ={ - {KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, - {KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_RSFT}, - {LT(2, KC_Z), LT(3, KC_X), KC_C, KC_V, KC_B, KC_SPC, KC_N, KC_M, KC_COMMA, LT(1, KC_DOT), KC_RCTL} - }, - /* Level 1: Numbers Layer + [BASE] = LAYOUT_ortho_3x11( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_RSFT, + LT(2, KC_Z), LT(3, KC_X), KC_C, KC_V, KC_B, KC_SPC, KC_N, KC_M, KC_COMMA, LT(1, KC_DOT), KC_RCTL + ), + /* Level 1: Numbers Layer * ,---------------------------------------------------------------------------------------. * | ESC | 7 | 8 | 9 | / | * | . | , | ( | ) | DEL | * |---------------------------------------------------------------------------------------| @@ -36,12 +39,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | LATL | 1 | 2 | 3 | 0 | ENT | LEFT | DOWN | RGHT | !TRNS!| PGDN | * |---------------------------------------------------------------------------------------| */ - [NUMBERS] ={ - {KC_ESC, KC_7, KC_8, KC_9, KC_SLSH, KC_ASTR, KC_DOT, KC_COMM, KC_LPRN, KC_RPRN, KC_DEL}, - {KC_TAB, KC_4, KC_5, KC_6, KC_MINS, KC_PLUS, KC_HOME, KC_UP, KC_END, KC_INSERT, KC_PGUP}, - {KC_LALT, KC_1, KC_2, KC_3, KC_0, KC_ENT, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_PGDN} - }, - /* Level 2: Symbols Layer + [NUMBERS] = LAYOUT_ortho_3x11( + KC_ESC, KC_7, KC_8, KC_9, KC_SLSH, KC_ASTR, KC_DOT, KC_COMM, KC_LPRN, KC_RPRN, KC_DEL, + KC_TAB, KC_4, KC_5, KC_6, KC_MINS, KC_PLUS, KC_HOME, KC_UP, KC_END, KC_INSERT, KC_PGUP, + KC_LALT, KC_1, KC_2, KC_3, KC_0, KC_ENT, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_PGDN + ), + /* Level 2: Symbols Layer * ,---------------------------------------------------------------------------------------. * | ! | @ | # | $ | % | ^ | & | * | _ | = | ? | * |---------------------------------------------------------------------------------------| @@ -50,25 +53,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | !TRNS!| LCTL | TRNS | [ | ] | TAB | < | > | TRNS | RCTL | TRNS | * |---------------------------------------------------------------------------------------| */ - [SYMBOLS] ={ - {KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_EQL, KC_QUES}, - {RESET, KC_LSFT, KC_TILD, KC_LCBR, KC_RCBR, KC_BSLS, KC_PIPE, KC_SCLN, KC_COLN, KC_GRV, KC_DQUO}, - {KC_TRNS, KC_LCTL, KC_TRNS, KC_LBRC, KC_RBRC, KC_TAB, KC_LABK, KC_RABK, KC_TRNS, KC_RCTL, KC_TRNS} - }, - /* Level 3: Media Layer - * ,---------------------------------------------------------------------------------------. - * |RGB_TOG|RGB_HUI|RGB_SAI|RGB_VAI| GIT_CM| CALC | WREF | WFAV | MUTE | VOLD | VOLU | - * |---------------------------------------------------------------------------------------| - * |RGB_MOD|RGB_HUD|RGB_SAD|RGB_VAD| GIT_ST| WHOM | WBAK | WFWD | TRNS | STOP | PLAY | - * |---------------------------------------------------------------------------------------| - * | TRNS | !TRNS!| TRNS | HM_DIR| GIT_PU| MYCM | WSTP | WSCH | MSEL | MPRV | MNXT | - * |---------------------------------------------------------------------------------------| - */ - [MEDIA] ={ - {RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, GIT_CM, KC_CALC, KC_WREF, KC_WFAV, KC_MUTE, KC_VOLD, KC_VOLU}, - {RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, GIT_ST, KC_WHOM, KC_WBAK, KC_WFWD, KC_TRNS, KC_MSTP, KC_MPLY}, - {KC_TRNS, KC_TRNS, KC_TRNS, HM_DIR, GIT_PU, KC_MYCM, KC_WSTP, KC_WSCH, KC_MSEL, KC_MPRV, KC_MNXT} - } + [SYMBOLS] = LAYOUT_ortho_3x11( + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_EQL, KC_QUES, + RESET, KC_LSFT, KC_TILD, KC_LCBR, KC_RCBR, KC_BSLS, KC_PIPE, KC_SCLN, KC_COLN, KC_GRV, KC_DQUO, + _______, KC_LCTL, _______, KC_LBRC, KC_RBRC, KC_TAB, KC_LABK, KC_RABK, _______, KC_RCTL, _______ + ), + /* Level 3: Media Layer + * ,---------------------------------------------------------------------------------------. + * |RGB_TOG|RGB_HUI|RGB_SAI|RGB_VAI| GIT_CM| CALC | WREF | WFAV | MUTE | VOLD | VOLU | + * |---------------------------------------------------------------------------------------| + * |RGB_MOD|RGB_HUD|RGB_SAD|RGB_VAD| GIT_ST| WHOM | WBAK | WFWD | TRNS | STOP | PLAY | + * |---------------------------------------------------------------------------------------| + * | TRNS | !TRNS!| TRNS | HM_DIR| GIT_PU| MYCM | WSTP | WSCH | MSEL | MPRV | MNXT | + * |---------------------------------------------------------------------------------------| + */ + [MEDIA] = LAYOUT_ortho_3x11( + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, GIT_CM, KC_CALC, KC_WREF, KC_WFAV, KC_MUTE, KC_VOLD, KC_VOLU, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, GIT_ST, KC_WHOM, KC_WBAK, KC_WFWD, _______, KC_MSTP, KC_MPLY, + _______, _______, _______, HM_DIR, GIT_PU, KC_MYCM, KC_WSTP, KC_WSCH, KC_MSEL, KC_MPRV, KC_MNXT + ) }; void press_and_release_key(uint8_t code) @@ -88,31 +91,31 @@ void press_and_release_mod_key(uint8_t mod, uint8_t code) const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function - switch(id) + switch(id) { case 0: - if (record->event.pressed) + if (record->event.pressed) { return MACRO(T(G), T(I), T(T), T(SPC), T(S), T(T), T(A), T(T), T(U), T(S), END); } break; case 1: - if (record->event.pressed) + if (record->event.pressed) { return MACRO(T(G), T(I), T(T), T(SPC), T(P), T(U), T(L), T(L), END); } break; case 2: - if (record->event.pressed) + if (record->event.pressed) { return MACRO(T(G), T(I), T(T), T(SPC), T(C), T(O), T(M), T(M), T(I), T(T), END); } break; case 3: - if (record->event.pressed) + if (record->event.pressed) { /*press_and_release_key(KC_C); press_and_release_key(KC_D); @@ -128,7 +131,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) D(LSFT), T(GRV), U(LSFT), T(SLSH), T(Q), T(M), T(K), D(LSFT), T(MINS), U(LSFT), T(F), T(I), T(R), T(M), T(W), T(A), T(R), T(E), T(SLSH), - T(K), T(E), T(Y), T(B), T(O), T(A), T(R), T(D), T(S), T(SLSH), + T(K), T(E), T(Y), T(B), T(O), T(A), T(R), T(D), T(S), T(SLSH), T(M), T(I), T(U), T(N), T(I), T(3), T(2), T(SLSH), T(K), T(E), T(Y), T(M), T(A), T(P), T(S), END); } @@ -143,39 +146,39 @@ void matrix_scan_user(void) { } bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; + return true; } void led_set_user(uint8_t usb_led) { - if (usb_led & (1 << USB_LED_NUM_LOCK)) { + if (usb_led & (1 << USB_LED_NUM_LOCK)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { + if (usb_led & (1 << USB_LED_CAPS_LOCK)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { + if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_COMPOSE)) { + if (usb_led & (1 << USB_LED_COMPOSE)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_KANA)) { + if (usb_led & (1 << USB_LED_KANA)) { - } else { + } else { - } + } } diff --git a/keyboards/miuni32/keymaps/ki/keymap.c b/keyboards/miuni32/keymaps/ki/keymap.c @@ -1,5 +1,7 @@ -#include "miuni32.h" -#include "action_layer.h" +#include QMK_KEYBOARD_H + +#define _______ KC_TRNS +#define XXXXXXX KC_NO enum miuni32_layers { _BEAKL, @@ -17,21 +19,21 @@ enum miuni32_keycodes { #define SPC_SHF SFT_T(KC_SPC) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Level 0: BEAKL - * ,---------------------------------------------------------------------------------------. - * | J | H | O | U | K | LOWER | G | C | R | F | Z | - * |---------------------------------------------------------------------------------------| - * | Q | I | E | A | Y | RAISE | D | S | T | N | B | - * |---------------------------------------------------------------------------------------| - * | / | , | ' | . | X |SPC\SHF| W | M | L | P | V | - * |---------------------------------------------------------------------------------------| - */ - [_BEAKL] ={ - {KC_J, KC_H, KC_O, KC_U, KC_K, KC_NO, KC_G, KC_C, KC_R, KC_F, KC_Z}, - {KC_Q, KC_I, KC_E, KC_A, KC_Y, RAISE, KC_D, KC_S, KC_T, KC_N, KC_B}, - {KC_SLSH, KC_COMM, KC_QUOT, KC_DOT, KC_X, SPC_SHF, KC_W, KC_M, KC_L, KC_P, KC_V} - }, - /* Lower + /* Level 0: BEAKL + * ,---------------------------------------------------------------------------------------. + * | J | H | O | U | K | LOWER | G | C | R | F | Z | + * |---------------------------------------------------------------------------------------| + * | Q | I | E | A | Y | RAISE | D | S | T | N | B | + * |---------------------------------------------------------------------------------------| + * | / | , | ' | . | X |SPC\SHF| W | M | L | P | V | + * |---------------------------------------------------------------------------------------| + */ + [_BEAKL] = LAYOUT_ortho_3x11( + KC_J, KC_H, KC_O, KC_U, KC_K, LOWER, KC_G, KC_C, KC_R, KC_F, KC_Z, + KC_Q, KC_I, KC_E, KC_A, KC_Y, RAISE, KC_D, KC_S, KC_T, KC_N, KC_B, + KC_SLSH, KC_COMM, KC_QUOT, KC_DOT, KC_X, SPC_SHF, KC_W, KC_M, KC_L, KC_P, KC_V + ), + /* Lower * ,---------------------------------------------------------------------------------------. * | Tab | { | _ | } | & | | Gui | [ | % | ] | Bkspc | * |---------------------------------------------------------------------------------------| @@ -40,12 +42,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | 5 | 4 | 3 | 2 | Ctl | | Alt | 9 | 8 | 7 | 6 | * |---------------------------------------------------------------------------------------| */ - [_LOWER] ={ - {KC_TAB, KC_LCBR, KC_UNDS, KC_RBRC, KC_AMPR, _______, KC_RGUI, KC_LBRC, KC_PERC, KC_RBRC, KC_BSPC}, - {KC_BSLS, KC_LPRN, KC_1, KC_RPRN, KC_HASH, _______, KC_DLR, KC_LT, KC_0, KC_GT, KC_PIPE}, - {KC_5, KC_4, KC_3, KC_2, KC_LCTL, _______, KC_RALT, KC_9, KC_8, KC_7, KC_6} - }, - /* Raise + [_LOWER] = LAYOUT_ortho_3x11( + KC_TAB, KC_LCBR, KC_UNDS, KC_RBRC, KC_AMPR, _______, KC_RGUI, KC_LBRC, KC_PERC, KC_RBRC, KC_BSPC, + KC_BSLS, KC_LPRN, KC_1, KC_RPRN, KC_HASH, _______, KC_DLR, KC_LT, KC_0, KC_GT, KC_PIPE, + KC_5, KC_4, KC_3, KC_2, KC_LCTL, _______, KC_RALT, KC_9, KC_8, KC_7, KC_6 + ), + /* Raise * ,---------------------------------------------------------------------------------------. * | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | * |---------------------------------------------------------------------------------------| @@ -54,12 +56,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | % | $ | # | @ | | | | ( | * | & | ^ | * |---------------------------------------------------------------------------------------| */ - [_RAISE] ={ - {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_EXLM, KC_MINS, KC_PLUS, _______, KC_EQL, KC_SCLN, KC_RPRN, KC_GRV, KC_QUES}, - {KC_PERC, KC_DLR, KC_HASH, KC_AT, _______, _______, _______, KC_LPRN, KC_ASTR, KC_AMPR, KC_CIRC} - }, - /* Union + [_RAISE] = LAYOUT_ortho_3x11( + 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_EXLM, KC_MINS, KC_PLUS, _______, KC_EQL, KC_SCLN, KC_RPRN, KC_GRV, KC_QUES, + KC_PERC, KC_DLR, KC_HASH, KC_AT, _______, _______, _______, KC_LPRN, KC_ASTR, KC_AMPR, KC_CIRC + ), + /* Union * ,---------------------------------------------------------------------------------------. * | RESET | | | | | | | | | | Del | * |---------------------------------------------------------------------------------------| @@ -68,11 +70,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | | * |---------------------------------------------------------------------------------------| */ - [_UNION] ={ - {RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, - {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, - {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} - } + [_UNION] = LAYOUT_ortho_3x11( + RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) }; void matrix_init_user(void) { @@ -111,39 +113,39 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return false; break; } - return true; + return true; } void led_set_user(uint8_t usb_led) { - if (usb_led & (1 << USB_LED_NUM_LOCK)) { + if (usb_led & (1 << USB_LED_NUM_LOCK)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { + if (usb_led & (1 << USB_LED_CAPS_LOCK)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { + if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_COMPOSE)) { + if (usb_led & (1 << USB_LED_COMPOSE)) { - } else { + } else { - } + } - if (usb_led & (1 << USB_LED_KANA)) { + if (usb_led & (1 << USB_LED_KANA)) { - } else { + } else { - } + } } diff --git a/keyboards/miuni32/miuni32.h b/keyboards/miuni32/miuni32.h @@ -3,13 +3,26 @@ #include "quantum.h" -#define KEYMAP( \ +#define LAYOUT( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ - K20, K21, K22, K23, K25, K26, K27, K28, K29, K2A ) { \ - { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A }, \ - { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A }, \ - { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_NO, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A } \ + K20, K21, K22, K23, K25, K26, K27, K28, K29, K2A \ + ) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \ + { K20, K21, K22, K23, KC_NO, K25, K26, K27, K28, K29, K2A } \ } +#define LAYOUT_ortho_3x11( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \ + ) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A } \ +} + +#define LAYOUT_all LAYOUT_ortho_3x11 + #endif diff --git a/keyboards/miuni32/readme.md b/keyboards/miuni32/readme.md @@ -3,8 +3,8 @@ miuni32 A compact 30% keyboard. -Keyboard Maintainer: QMK Community -Hardware Supported: miuni32 PCB +Keyboard Maintainer: QMK Community +Hardware Supported: miuni32 PCB Hardware Availability: https://zealpc.net/products/miuni32 Make example for this keyboard (after setting up your build environment):