From 0624698d331edc7f0201b2edc199616b852e456a Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 20 Jun 2021 00:13:34 -0700 Subject: [PATCH] MisonoWorks Karina Layout Macro Rework (#13259) --- keyboards/misonoworks/karina/info.json | 56 +++++++++++++++++-- keyboards/misonoworks/karina/karina.h | 17 +++--- .../karina/keymaps/default/keymap.c | 32 ++++++----- .../karina/keymaps/voltex/keymap.c | 32 ++++++----- keyboards/misonoworks/karina/readme.md | 8 ++- 5 files changed, 104 insertions(+), 41 deletions(-) diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json index 3d724ea4af..cc8a81e6a7 100644 --- a/keyboards/misonoworks/karina/info.json +++ b/keyboards/misonoworks/karina/info.json @@ -1,12 +1,56 @@ { - "keyboard_name": "Karina", - "url": "https://github.com/autumnisacutie/karina", - "maintainer": "MisonoWorks", - "width": 11, - "height": 5, + "keyboard_name": "Karina", + "url": "https://github.com/autumnisacutie/karina", + "maintainer": "MisonoWorks", + "width": 11, + "height": 5, "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":10, "y":0}, {"label":"Q", "x":0.5, "y":1}, {"label":"W", "x":1.5, "y":1}, {"label":"E", "x":2.5, "y":1}, {"label":"R", "x":3.5, "y":1}, {"label":"T", "x":4.5, "y":1}, {"label":"Y", "x":5.5, "y":1}, {"label":"U", "x":6.5, "y":1}, {"label":"I", "x":7.5, "y":1}, {"label":"O", "x":8.5, "y":1}, {"label":"P", "x":9.5, "y":1}, {"label":"Tab", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":"Enter", "x":10, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.5}, {"label":"Z", "x":1.5, "y":3}, {"label":"X", "x":2.5, "y":3}, {"label":"C", "x":3.5, "y":3}, {"label":"V", "x":4.5, "y":3}, {"label":"B", "x":5.5, "y":3}, {"label":"N", "x":6.5, "y":3}, {"label":"M", "x":7.5, "y":3}, {"label":"<", "x":8.5, "y":3}, {"label":"Shift", "x":9.5, "y":3, "w":1.5}, {"label":"Alt", "x":0, "y":4, "w":1.75}, {"x":1.75, "y":4, "w":1.25}, {"x":3, "y":4, "w":2.75}, {"x":5.75, "y":4, "w":2.25}, {"x":8, "y":4, "w":1.25}, {"label":"Control", "x":9.25, "y":4, "w":1.75}] + "layout": [ + {"label":"Encoder 1", "x":0, "y":0}, + {"label":"Encoder 2", "x":10, "y":0}, + + {"label":"Q", "x":0.5, "y":1}, + {"label":"W", "x":1.5, "y":1}, + {"label":"E", "x":2.5, "y":1}, + {"label":"R", "x":3.5, "y":1}, + {"label":"T", "x":4.5, "y":1}, + {"label":"Y", "x":5.5, "y":1}, + {"label":"U", "x":6.5, "y":1}, + {"label":"I", "x":7.5, "y":1}, + {"label":"O", "x":8.5, "y":1}, + {"label":"P", "x":9.5, "y":1}, + + {"label":"Tab", "x":0, "y":2}, + {"label":"A", "x":1, "y":2}, + {"label":"S", "x":2, "y":2}, + {"label":"D", "x":3, "y":2}, + {"label":"F", "x":4, "y":2}, + {"label":"G", "x":5, "y":2}, + {"label":"H", "x":6, "y":2}, + {"label":"J", "x":7, "y":2}, + {"label":"K", "x":8, "y":2}, + {"label":"L", "x":9, "y":2}, + {"label":"Enter", "x":10, "y":2}, + + {"label":"Shift", "x":0, "y":3, "w":1.5}, + {"label":"Z", "x":1.5, "y":3}, + {"label":"X", "x":2.5, "y":3}, + {"label":"C", "x":3.5, "y":3}, + {"label":"V", "x":4.5, "y":3}, + {"label":"B", "x":5.5, "y":3}, + {"label":"N", "x":6.5, "y":3}, + {"label":"M", "x":7.5, "y":3}, + {"label":"<", "x":8.5, "y":3}, + {"label":">", "x":9.5, "y":3, "w":1.5}, + + {"label":"Alt", "x":0, "y":4, "w":1.75}, + {"label":"MO(1)", "x":1.75, "y":4, "w":1.25}, + {"label":"Space", "x":3, "y":4, "w":2.75}, + {"label":"Backspace", "x":5.75, "y":4, "w":2.25}, + {"label":"MO(2)", "x":8, "y":4, "w":1.25}, + {"label":"Control", "x":9.25, "y":4, "w":1.75} + ] } } } diff --git a/keyboards/misonoworks/karina/karina.h b/keyboards/misonoworks/karina/karina.h index 3192b8e404..2baeb5db5c 100644 --- a/keyboards/misonoworks/karina/karina.h +++ b/keyboards/misonoworks/karina/karina.h @@ -20,13 +20,14 @@ along with this program. If not, see . #include "quantum.h" #define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \ - K300, K301, K303, K306, K308, K309 \ + K000, K210, \ + K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \ + K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ + K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, \ + K300, K301, K303, K306, K308, K309 \ ) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ - { K300, K301, KC_NO, K303, KC_NO, KC_NO, K306, KC_NO, K308, K309, KC_NO } \ + { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ + { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ + { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ + { K300, K301, KC_NO, K303, KC_NO, KC_NO, K306, KC_NO, K308, K309, KC_NO } \ } diff --git a/keyboards/misonoworks/karina/keymaps/default/keymap.c b/keyboards/misonoworks/karina/keymaps/default/keymap.c index 74c0324fe7..a9af182f8a 100644 --- a/keyboards/misonoworks/karina/keymaps/default/keymap.c +++ b/keyboards/misonoworks/karina/keymaps/default/keymap.c @@ -26,22 +26,28 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DEFAULT] = LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_MUTE, - KC_LALT, MO(SUPER), KC_SPC, KC_BSPC, MO(META), KC_LCTL), + KC_ESC, KC_MUTE, + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, + KC_LALT, MO(SUPER), KC_SPC, KC_BSPC, MO(META), KC_LCTL + ), [SUPER] = LAYOUT( - KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_MINUS, KC_EQUAL, KC_GRAVE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_SCLN, - KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_BSLS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS), + KC_TRNS, KC_TRNS, + 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_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_SCLN, + KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_BSLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS + ), - [META] = LAYOUT( - KC_NUMLOCK, 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_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, - KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_PLUS, KC_P2, KC_P0, KC_P1, KC_TRNS, KC_TRNS, KC_TRNS, - RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, KC_TRNS, RGB_MOD) + [META] = LAYOUT( + KC_NLCK, KC_TRNS, + 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_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, + KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PPLS, KC_P2, KC_P0, KC_P1, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, KC_TRNS, RGB_MOD + ) }; diff --git a/keyboards/misonoworks/karina/keymaps/voltex/keymap.c b/keyboards/misonoworks/karina/keymaps/voltex/keymap.c index 80fc13a579..f06522f92a 100644 --- a/keyboards/misonoworks/karina/keymaps/voltex/keymap.c +++ b/keyboards/misonoworks/karina/keymaps/voltex/keymap.c @@ -26,22 +26,28 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DEFAULT] = LAYOUT( - KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_TRNS, - KC_LALT, MO(SUPER), KC_SPC, KC_BSPC, MO(META), KC_LCTL), + KC_TRNS, KC_TRNS, + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, + KC_LALT, MO(SUPER), KC_SPC, KC_BSPC, MO(META), KC_LCTL + ), [SUPER] = LAYOUT( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_MINUS, KC_EQUAL, KC_GRAVE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_SCLN, - KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_BSLS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS), + KC_ESC, KC_TRNS, + 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_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_SCLN, + KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_BSLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS + ), - [META] = LAYOUT( - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, - KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_PLUS, KC_KP_2, KC_KP_0, KC_KP_1, KC_TRNS, KC_TRNS, KC_TRNS, - RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, KC_TRNS, RGB_MOD) + [META] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, + KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PPLS, KC_P2, KC_P0, KC_P1, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, KC_TRNS, RGB_MOD + ) }; diff --git a/keyboards/misonoworks/karina/readme.md b/keyboards/misonoworks/karina/readme.md index a6dcd84447..debd418b39 100644 --- a/keyboards/misonoworks/karina/readme.md +++ b/keyboards/misonoworks/karina/readme.md @@ -4,7 +4,7 @@ 35% keyboard with two rotary encoders and an LED bar. -* Keyboard Maintainer: [MisonoWorks](https://github.com/autumnisacutie/) +* Keyboard Maintainer: [MisonoWorks](https://github.com/misonoworks/) * Hardware Supported: Karina V1 PCB * Hardware Availability: [P3D Store](https://p3dstore.com/) @@ -12,4 +12,10 @@ Make example for this keyboard (after setting up your build environment): make misonoworks/karina:default +Flashing example for this keyboard: + + make misonoworks/karina:default:flash + +To reset the board into bootloader mode, hold Space+B while connecting the USB cable. + 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).