diff options
| -rw-r--r-- | keyboards/merge/uma/config.h | 47 | ||||
| -rw-r--r-- | keyboards/merge/uma/info.json | 19 | ||||
| -rw-r--r-- | keyboards/merge/uma/keymaps/default/keymap.c | 65 | ||||
| -rw-r--r-- | keyboards/merge/uma/keymaps/default/readme.md | 3 | ||||
| -rw-r--r-- | keyboards/merge/uma/keymaps/default/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/merge/uma/keymaps/via/keymap.c | 65 | ||||
| -rw-r--r-- | keyboards/merge/uma/keymaps/via/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/merge/uma/readme.md | 22 | ||||
| -rw-r--r-- | keyboards/merge/uma/rules.mk | 23 | ||||
| -rw-r--r-- | keyboards/merge/uma/uma.c | 109 | ||||
| -rw-r--r-- | keyboards/merge/uma/uma.h | 192 |
11 files changed, 548 insertions, 0 deletions
diff --git a/keyboards/merge/uma/config.h b/keyboards/merge/uma/config.h new file mode 100644 index 000000000..46bad7185 --- /dev/null +++ b/keyboards/merge/uma/config.h | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | /* Copyright 2021 duoshock | ||
| 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 "config_common.h" | ||
| 18 | |||
| 19 | #define VENDOR_ID 0x4D65 | ||
| 20 | #define PRODUCT_ID 0x3232 | ||
| 21 | #define DEVICE_VER 0x0001 | ||
| 22 | #define MANUFACTURER Merge | ||
| 23 | #define PRODUCT UM-A | ||
| 24 | |||
| 25 | #define MATRIX_ROWS 10 | ||
| 26 | #define MATRIX_COLS 8 | ||
| 27 | |||
| 28 | #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } | ||
| 29 | #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 } | ||
| 30 | #define UNUSED_PINS | ||
| 31 | |||
| 32 | #define BACKLIGHT_PIN C6 | ||
| 33 | |||
| 34 | /* COL2ROW or ROW2COL */ | ||
| 35 | #define DIODE_DIRECTION COL2ROW | ||
| 36 | |||
| 37 | #define SOFT_SERIAL_PIN D2 | ||
| 38 | #define SPLIT_USB_DETECT | ||
| 39 | #define SPLIT_MODS_ENABLE | ||
| 40 | |||
| 41 | #define DEBOUNCE 5 | ||
| 42 | |||
| 43 | #define ENCODERS_PAD_A { B4 } | ||
| 44 | #define ENCODERS_PAD_B { B5 } | ||
| 45 | |||
| 46 | #define BOOTMAGIC_LITE_ROW 0 | ||
| 47 | #define BOOTMAGIC_LITE_COLUMN 0 \ No newline at end of file | ||
diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json new file mode 100644 index 000000000..8cd1ca3dd --- /dev/null +++ b/keyboards/merge/uma/info.json | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | { | ||
| 2 | "keyboard_name": "UM-A", | ||
| 3 | "url": "https://mergedesign.store/products/um-a", | ||
| 4 | "maintainer": "duoshock", | ||
| 5 | "layouts": { | ||
| 6 | "LAYOUT_ansi_rspace_2u_bksp": { | ||
| 7 | "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"Backspace", "x":16.5, "y":0, "w":2}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"label":"Alt", "x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}] | ||
| 8 | }, | ||
| 9 | "LAYOUT_ansi_rspace_split_bksp": { | ||
| 10 | "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"~", "x":16.5, "y":0}, {"label":"Backspace", "x":17.5, "y":0}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"label":"Alt", "x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}] | ||
| 11 | }, | ||
| 12 | "LAYOUT_ansi_lspace_2u_bksp": { | ||
| 13 | "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"Backspace", "x":16.5, "y":0, "w":2}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":2.25}, {"label":"Alt", "x":7.5, "y":4, "w":1.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}] | ||
| 14 | }, | ||
| 15 | "LAYOUT_ansi_lspace_split_bksp": { | ||
| 16 | "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"~", "x":16.5, "y":0}, {"label":"Backspace", "x":17.5, "y":0}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":2.25}, {"label":"Alt", "x":7.5, "y":4, "w":1.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}] | ||
| 17 | } | ||
| 18 | } | ||
| 19 | } | ||
diff --git a/keyboards/merge/uma/keymaps/default/keymap.c b/keyboards/merge/uma/keymaps/default/keymap.c new file mode 100644 index 000000000..7105d1e0a --- /dev/null +++ b/keyboards/merge/uma/keymaps/default/keymap.c | |||
| @@ -0,0 +1,65 @@ | |||
| 1 | /* Copyright 2021 duoshock | ||
| 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 | |||
| 21 | /* | ||
| 22 | * .---------------------------. .-------------------------------. .---. | ||
| 23 | * |Esc| 1| 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| Bsp | |EC | | ||
| 24 | * |-------------------------. .---------------------------------| |---| | ||
| 25 | * |Tab | Q| W| E| R| T| | Y| U| I| O| P| [| ]| \ | |Hom| | ||
| 26 | * .---. |-------------------------. '---------------------------------| |---| | ||
| 27 | * |M0 | |CapsL | A| S| D| F| G| | H| J| K| L| ;| :| Retn | |End| | ||
| 28 | * |---| |----------------------------. '--------------------------------| .---. '---' | ||
| 29 | * |M1 | |Shft|ISO\| Z| X| C| V| B| | N| M| ,| ,| /| Shift| |Up | | ||
| 30 | * |---| |------------------- ---------| |---------------------------' .-----------. | ||
| 31 | * |M2 | |Ctl |Gui| |Alt |Space | | Space| Alt| Ctl| |Lef|Dow|Rig| | ||
| 32 | * '---' '----------- -----------------' '-----------------------' '-----------' | ||
| 33 | */ | ||
| 34 | |||
| 35 | [0] = LAYOUT_ansi_rspace_2u_bksp( | ||
| 36 | KC_ESC, 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_MUTE, | ||
| 37 | 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_HOME, | ||
| 38 | KC_1, 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_END, | ||
| 39 | KC_2, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, | ||
| 40 | KC_3, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | ||
| 41 | ), | ||
| 42 | |||
| 43 | [1] = LAYOUT_ansi_rspace_2u_bksp( | ||
| 44 | 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, | ||
| 45 | 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, | ||
| 46 | 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, | ||
| 47 | 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, | ||
| 48 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
| 49 | ), | ||
| 50 | [2] = LAYOUT_ansi_rspace_2u_bksp( | ||
| 51 | 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, | ||
| 52 | 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, | ||
| 53 | 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, | ||
| 54 | 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, | ||
| 55 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
| 56 | ), | ||
| 57 | [3] = LAYOUT_ansi_rspace_2u_bksp( | ||
| 58 | 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, | ||
| 59 | 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, | ||
| 60 | 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, | ||
| 61 | 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, | ||
| 62 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
| 63 | ), | ||
| 64 | }; | ||
| 65 | |||
diff --git a/keyboards/merge/uma/keymaps/default/readme.md b/keyboards/merge/uma/keymaps/default/readme.md new file mode 100644 index 000000000..2ef78dd3a --- /dev/null +++ b/keyboards/merge/uma/keymaps/default/readme.md | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | # Default UM-A Layout | ||
| 2 | |||
| 3 |  | ||
diff --git a/keyboards/merge/uma/keymaps/default/rules.mk b/keyboards/merge/uma/keymaps/default/rules.mk new file mode 100644 index 000000000..90fc9b184 --- /dev/null +++ b/keyboards/merge/uma/keymaps/default/rules.mk | |||
| @@ -0,0 +1 @@ | |||
| WPM_ENABLE = yes \ No newline at end of file | |||
diff --git a/keyboards/merge/uma/keymaps/via/keymap.c b/keyboards/merge/uma/keymaps/via/keymap.c new file mode 100644 index 000000000..46688d4a7 --- /dev/null +++ b/keyboards/merge/uma/keymaps/via/keymap.c | |||
| @@ -0,0 +1,65 @@ | |||
| 1 | /* Copyright 2021 duoshock | ||
| 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 | |||
| 21 | /* | ||
| 22 | * .---------------------------. .-------------------------------. .---. | ||
| 23 | * |Esc| 1| 2| 3| 4| 5| 6| | 7| 8| 9| 0| -| =| Bsp | |EC | | ||
| 24 | * |-------------------------. .---------------------------------| |---| | ||
| 25 | * |Tab | Q| W| E| R| T| | Y| U| I| O| P| [| ]| \ | |Hom| | ||
| 26 | * .---. |-------------------------. '---------------------------------| |---| | ||
| 27 | * |M0 | |CapsL | A| S| D| F| G| | H| J| K| L| ;| :| Retn | |End| | ||
| 28 | * |---| |----------------------------. '--------------------------------| .---. '---' | ||
| 29 | * |M1 | |Shft|ISO\| Z| X| C| V| B| | N| M| ,| ,| /| Shift| |Up | | ||
| 30 | * |---| |------------------- ---------| |---------------------------' .-----------. | ||
| 31 | * |M2 | |Ctl |Gui| |Alt |Space | | Space| Alt| Ctl| |Lef|Dow|Rig| | ||
| 32 | * '---' '----------- -----------------' '-----------------------' '-----------' | ||
| 33 | */ | ||
| 34 | |||
| 35 | [0] = LAYOUT_all( | ||
| 36 | KC_ESC, 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_BSPC, KC_MUTE, | ||
| 37 | 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_HOME, | ||
| 38 | KC_1, 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_END, | ||
| 39 | KC_2, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, | ||
| 40 | KC_3, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | ||
| 41 | ), | ||
| 42 | |||
| 43 | [1] = LAYOUT_all( | ||
| 44 | 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, | ||
| 45 | 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, | ||
| 46 | 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, | ||
| 47 | 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, | ||
| 48 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
| 49 | ), | ||
| 50 | [2] = LAYOUT_all( | ||
| 51 | 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, | ||
| 52 | 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, | ||
| 53 | 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, | ||
| 54 | 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, | ||
| 55 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
| 56 | ), | ||
| 57 | [3] = LAYOUT_all( | ||
| 58 | 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, | ||
| 59 | 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, | ||
| 60 | 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, | ||
| 61 | 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, | ||
| 62 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
| 63 | ), | ||
| 64 | }; | ||
| 65 | |||
diff --git a/keyboards/merge/uma/keymaps/via/rules.mk b/keyboards/merge/uma/keymaps/via/rules.mk new file mode 100644 index 000000000..d03b5f1ca --- /dev/null +++ b/keyboards/merge/uma/keymaps/via/rules.mk | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | VIA_ENABLE = yes | ||
| 2 | WPM_ENABLE = yes \ No newline at end of file | ||
diff --git a/keyboards/merge/uma/readme.md b/keyboards/merge/uma/readme.md new file mode 100644 index 000000000..7a7958b16 --- /dev/null +++ b/keyboards/merge/uma/readme.md | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | # UM-A | ||
| 2 | |||
| 3 |  | ||
| 4 | |||
| 5 | A Alice like layout keyboard with arrow keys, encoder and OLED screen sold by Merge. [Product page](https://mergedesign.store/products/um-70) | ||
| 6 | |||
| 7 | * Keyboard Maintainer: [duoshock](https://github.com/duoshock) | ||
| 8 | * Hardware Availability: [Merge Store](https://mergedesign.store/products/um-a) | ||
| 9 | |||
| 10 | Make example for this keyboard (after setting up your build environment): | ||
| 11 | |||
| 12 | make merge/uma:default | ||
| 13 | |||
| 14 | 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). | ||
| 15 | |||
| 16 | ## Bootloader | ||
| 17 | |||
| 18 | Enter the bootloader in 2 ways: | ||
| 19 | |||
| 20 | * **Bootmagic reset**: Hold down the Esc key on the left side or '7' key on the right side and plug in the keyboard. | ||
| 21 | |||
| 22 | * **Physical reset button**: Briefly press the button on the back of the PCB. | ||
diff --git a/keyboards/merge/uma/rules.mk b/keyboards/merge/uma/rules.mk new file mode 100644 index 000000000..27f0425b4 --- /dev/null +++ b/keyboards/merge/uma/rules.mk | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | # MCU name | ||
| 2 | MCU = atmega32u4 | ||
| 3 | |||
| 4 | # Bootloader selection | ||
| 5 | BOOTLOADER = atmel-dfu | ||
| 6 | |||
| 7 | # Build Options | ||
| 8 | # change yes to no to disable | ||
| 9 | # | ||
| 10 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite | ||
| 11 | MOUSEKEY_ENABLE = yes # Mouse keys | ||
| 12 | EXTRAKEY_ENABLE = yes # Audio control and System control | ||
| 13 | CONSOLE_ENABLE = no # Console for debug | ||
| 14 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
| 15 | NKRO_ENABLE = yes # Enable N-Key Rollover | ||
| 16 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | ||
| 17 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | ||
| 18 | AUDIO_ENABLE = no # Audio output | ||
| 19 | ENCODER_ENABLE = yes | ||
| 20 | SPLIT_KEYBOARD = yes | ||
| 21 | LTO_ENABLE = yes | ||
| 22 | OLED_ENABLE = yes | ||
| 23 | OLED_DRIVER = SSD1306 | ||
diff --git a/keyboards/merge/uma/uma.c b/keyboards/merge/uma/uma.c new file mode 100644 index 000000000..376cdfd3f --- /dev/null +++ b/keyboards/merge/uma/uma.c | |||
| @@ -0,0 +1,109 @@ | |||
| 1 | /* Copyright 2021 duoshock | ||
| 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 "uma.h" | ||
| 18 | |||
| 19 | #ifdef OLED_ENABLE | ||
| 20 | void suspend_power_down_user(void) { | ||
| 21 | oled_off(); | ||
| 22 | } | ||
| 23 | |||
| 24 | oled_rotation_t oled_init_kb(oled_rotation_t rotation) { | ||
| 25 | if (is_keyboard_master()) { | ||
| 26 | return OLED_ROTATION_90; | ||
| 27 | } | ||
| 28 | |||
| 29 | return rotation; | ||
| 30 | } | ||
| 31 | |||
| 32 | static void render_logo(void) { | ||
| 33 | static const char PROGMEM raw_logo[] = { | ||
| 34 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192,192,224,224,224,224,224,224,224,224,224,224,224,224,224,224,192,192,128,128,192,192,224,224,224,224,224,224,224,224,192,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
| 35 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, 15, 3, 1, 0, 1,255,255,255,255,255,255,255,255,255,255,255,255,255,255,254,252,240, 0, 0, 0, 0, 0, 0, 0, 0, 0,254,254,254, 0, 0, 0, 0, 0, 0,254,254,254, 0, 0, 0,254,254,254,252,240,224,128,128,224,240,252,254,254,254, 0, 0,128,128,128,128,128,128, 0, 0, 0, 0, 0,224,248,252, 62, 62,252,240,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
| 36 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,240,192,128, 0,128,255,255,255,255,255,255,255,255,255,255,255,255,255,255,127, 63, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 31, 63,120,112,112,112,112,120, 63, 31, 15, 0, 0, 0,127,127,127, 0, 1, 7, 7, 7, 7, 1, 0,127,127,127, 0, 0, 3, 3, 3, 3, 3, 3, 1, 0,112,124,127, 31, 15, 14, 14, 14, 15, 15, 31,127,124, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
| 37 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 3, 3, 1, 1, 3, 3, 7, 7, 7, 7, 7, 7, 7, 7, 3, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
| 38 | }; | ||
| 39 | oled_write_raw_P(raw_logo, sizeof(raw_logo)); | ||
| 40 | } | ||
| 41 | |||
| 42 | |||
| 43 | // 32 * 18 Merge logos | ||
| 44 | static const char PROGMEM merge_logo[] = { | ||
| 45 | 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0e, | ||
| 46 | 0x06, 0x04, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xf0, 0xc0, | ||
| 47 | 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xc0, | ||
| 48 | 0x80, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, | ||
| 49 | 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, | ||
| 50 | 0x01, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00 | ||
| 51 | }; | ||
| 52 | |||
| 53 | int current_wpm = 0; | ||
| 54 | |||
| 55 | static void print_status_narrow(void) { | ||
| 56 | oled_set_cursor(0,1); | ||
| 57 | oled_write_raw_P(merge_logo, sizeof(merge_logo)); | ||
| 58 | oled_set_cursor(0,5); | ||
| 59 | oled_write_P(PSTR("-----"), false); | ||
| 60 | oled_set_cursor(0,6); | ||
| 61 | oled_write_P(PSTR("LYR "), false); | ||
| 62 | switch (get_highest_layer(layer_state)) { | ||
| 63 | case 0: | ||
| 64 | oled_write_P(PSTR("0"), false); | ||
| 65 | break; | ||
| 66 | case 1: | ||
| 67 | oled_write_P(PSTR("1"), false); | ||
| 68 | break; | ||
| 69 | case 2: | ||
| 70 | oled_write_P(PSTR("2"), false); | ||
| 71 | break; | ||
| 72 | case 3: | ||
| 73 | oled_write_P(PSTR("3"), false); | ||
| 74 | break; | ||
| 75 | default: | ||
| 76 | oled_write_ln_P(PSTR("Undef"), false); | ||
| 77 | } | ||
| 78 | led_t led_usb_state = host_keyboard_led_state(); | ||
| 79 | oled_write_ln_P(PSTR(" "), false); | ||
| 80 | oled_write_P(PSTR("CAP "), false); | ||
| 81 | oled_write_P(PSTR("."), led_usb_state.caps_lock); | ||
| 82 | oled_write_P(PSTR("NUM "), false); | ||
| 83 | oled_write_P(PSTR("."), led_usb_state.num_lock); | ||
| 84 | oled_write_P(PSTR("SCR "), false); | ||
| 85 | oled_write_P(PSTR("."), led_usb_state.scroll_lock); | ||
| 86 | //oled_write_ln_P(PSTR(" "), false); | ||
| 87 | oled_write_P(PSTR("-----"), false); | ||
| 88 | |||
| 89 | // WPM counter Start | ||
| 90 | oled_set_cursor(0,13); | ||
| 91 | oled_write(" ", false); | ||
| 92 | oled_write(get_u8_str(get_current_wpm(), '0'), false); | ||
| 93 | oled_set_cursor(0,14); | ||
| 94 | oled_write(" WPM ", false); | ||
| 95 | // WPM counter End | ||
| 96 | } | ||
| 97 | |||
| 98 | bool oled_task_kb(void) { | ||
| 99 | if (!oled_task_user()) { return false; } | ||
| 100 | if (is_keyboard_master()) { | ||
| 101 | print_status_narrow(); | ||
| 102 | //render_logo(); | ||
| 103 | } else { | ||
| 104 | render_logo(); | ||
| 105 | //print_status_narrow(); | ||
| 106 | } | ||
| 107 | return false; | ||
| 108 | } | ||
| 109 | #endif \ No newline at end of file | ||
diff --git a/keyboards/merge/uma/uma.h b/keyboards/merge/uma/uma.h new file mode 100644 index 000000000..b7fb9a5d6 --- /dev/null +++ b/keyboards/merge/uma/uma.h | |||
| @@ -0,0 +1,192 @@ | |||
| 1 | /* Copyright 2021 duoshock | ||
| 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 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
| 20 | |||
| 21 | #define XXX KC_NO | ||
| 22 | |||
| 23 | #define LAYOUT_all( \ | ||
| 24 | L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \ | ||
| 25 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ | ||
| 26 | L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ | ||
| 27 | L46, L30, L41, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ | ||
| 28 | L47, L40, L42, L43, L44, R40, R41, R42, R43, R44, R45 \ | ||
| 29 | ) { \ | ||
| 30 | { L00, L01, L02, L03, L04, L05, L06, XXX }, \ | ||
| 31 | { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ | ||
| 32 | { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ | ||
| 33 | { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ | ||
| 34 | { L40, L41, L42, L43, L44, L45, L46, L47 }, \ | ||
| 35 | { R00, R01, R02, R03, R04, R05, R06, R07 }, \ | ||
| 36 | { R10, R11, R12, R13, R14, R15, R16, R17 }, \ | ||
| 37 | { R20, R21, R22, R23, R24, R25, R26, R27 }, \ | ||
| 38 | { R30, R31, R32, R33, R34, R35, R36, R37 }, \ | ||
| 39 | { R40, R41, R42, R43, R44, R45, R46, R47 } \ | ||
| 40 | } | ||
| 41 | |||
| 42 | #define LAYOUT_ansi_rspace_split_bksp( \ | ||
| 43 | L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \ | ||
| 44 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ | ||
| 45 | L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ | ||
| 46 | L46, L30, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ | ||
| 47 | L47, L40, L42, L43, L44, R40, R41, R42, R43, R44, R45 \ | ||
| 48 | ) { \ | ||
| 49 | { L00, L01, L02, L03, L04, L05, L06, XXX }, \ | ||
| 50 | { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ | ||
| 51 | { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ | ||
| 52 | { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ | ||
| 53 | { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ | ||
| 54 | { R00, R01, R02, R03, R04, R05, R06, R07 }, \ | ||
| 55 | { R10, R11, R12, R13, R14, R15, R16, R17 }, \ | ||
| 56 | { R20, R21, R22, R23, R24, R25, R26, R27 }, \ | ||
| 57 | { R30, R31, R32, R33, R34, R35, R36, R37 }, \ | ||
| 58 | { R40, R41, R42, R43, R44, R45, R46, R47 } \ | ||
| 59 | } | ||
| 60 | |||
| 61 | #define LAYOUT_ansi_rspace_2u_bksp( \ | ||
| 62 | L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, R27, \ | ||
| 63 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ | ||
| 64 | L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ | ||
| 65 | L46, L30, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ | ||
| 66 | L47, L40, L42, L43, L44, R40, R41, R42, R43, R44, R45 \ | ||
| 67 | ) { \ | ||
| 68 | { L00, L01, L02, L03, L04, L05, L06, XXX }, \ | ||
| 69 | { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ | ||
| 70 | { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ | ||
| 71 | { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ | ||
| 72 | { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ | ||
| 73 | { R00, R01, R02, R03, R04, R05, XXX, R07 }, \ | ||
| 74 | { R10, R11, R12, R13, R14, R15, R16, R17 }, \ | ||
| 75 | { R20, R21, R22, R23, R24, R25, R26, R27 }, \ | ||
| 76 | { R30, R31, R32, R33, R34, R35, R36, R37 }, \ | ||
| 77 | { R40, R41, R42, R43, R44, R45, R46, R47 } \ | ||
| 78 | } | ||
| 79 | |||
| 80 | #define LAYOUT_ansi_lspace_2u_bksp( \ | ||
| 81 | L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, R27, \ | ||
| 82 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ | ||
| 83 | L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ | ||
| 84 | L46, L30, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ | ||
| 85 | L47, L40, L42, L44, L43, R40, R41, R42, R43, R44, R45 \ | ||
| 86 | ) { \ | ||
| 87 | { L00, L01, L02, L03, L04, L05, L06, XXX }, \ | ||
| 88 | { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ | ||
| 89 | { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ | ||
| 90 | { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ | ||
| 91 | { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ | ||
| 92 | { R00, R01, R02, R03, R04, R05, XXX, R07 }, \ | ||
| 93 | { R10, R11, R12, R13, R14, R15, R16, R17 }, \ | ||
| 94 | { R20, R21, R22, R23, R24, R25, R26, R27 }, \ | ||
| 95 | { R30, R31, R32, R33, R34, R35, R36, R37 }, \ | ||
| 96 | { R40, R41, R42, R43, R44, R45, R46, R47 } \ | ||
| 97 | } | ||
| 98 | |||
| 99 | #define LAYOUT_ansi_lspace_split_bksp( \ | ||
| 100 | L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \ | ||
| 101 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ | ||
| 102 | L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ | ||
| 103 | L46, L30, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ | ||
| 104 | L47, L40, L42, L44, L43, R40, R41, R42, R43, R44, R45 \ | ||
| 105 | ) { \ | ||
| 106 | { L00, L01, L02, L03, L04, L05, L06, XXX }, \ | ||
| 107 | { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ | ||
| 108 | { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ | ||
| 109 | { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ | ||
| 110 | { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ | ||
| 111 | { R00, R01, R02, R03, R04, R05, R06, R07 }, \ | ||
| 112 | { R10, R11, R12, R13, R14, R15, R16, R17 }, \ | ||
| 113 | { R20, R21, R22, R23, R24, R25, R26, R27 }, \ | ||
| 114 | { R30, R31, R32, R33, R34, R35, R36, R37 }, \ | ||
| 115 | { R40, R41, R42, R43, R44, R45, R46, R47 } \ | ||
| 116 | } | ||
| 117 | |||
| 118 | #define LAYOUT_iso_rspace_split_bksp( \ | ||
| 119 | L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \ | ||
| 120 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ | ||
| 121 | L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ | ||
| 122 | L46, L30, L41, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ | ||
| 123 | L47, L40, L42, L43, L44, R40, R41, R42, R43, R44, R45 \ | ||
| 124 | ) { \ | ||
| 125 | { L00, L01, L02, L03, L04, L05, L06, XXX }, \ | ||
| 126 | { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ | ||
| 127 | { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ | ||
| 128 | { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ | ||
| 129 | { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ | ||
| 130 | { R00, R01, R02, R03, R04, R05, R06, R07 }, \ | ||
| 131 | { R10, R11, R12, R13, R14, R15, R16, R17 }, \ | ||
| 132 | { R20, R21, R22, R23, R24, R25, R26, R27 }, \ | ||
| 133 | { R30, R31, R32, R33, R34, R35, R36, R37 }, \ | ||
| 134 | { R40, R41, R42, R43, R44, R45, R46, R47 } \ | ||
| 135 | } | ||
| 136 | |||
| 137 | #define LAYOUT_iso_rspace_2u_bksp( \ | ||
| 138 | L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, R27, \ | ||
| 139 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ | ||
| 140 | L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ | ||
| 141 | L46, L30, L41, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ | ||
| 142 | L47, L40, L42, L43, L44, R40, R41, R42, R43, R44, R45 \ | ||
| 143 | ) { \ | ||
| 144 | { L00, L01, L02, L03, L04, L05, L06, XXX }, \ | ||
| 145 | { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ | ||
| 146 | { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ | ||
| 147 | { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ | ||
| 148 | { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ | ||
| 149 | { R00, R01, R02, R03, R04, R05, XXX, R07 }, \ | ||
| 150 | { R10, R11, R12, R13, R14, R15, R16, R17 }, \ | ||
| 151 | { R20, R21, R22, R23, R24, R25, R26, R27 }, \ | ||
| 152 | { R30, R31, R32, R33, R34, R35, R36, R37 }, \ | ||
| 153 | { R40, R41, R42, R43, R44, R45, R46, R47 } \ | ||
| 154 | } | ||
| 155 | |||
| 156 | #define LAYOUT_iso_lspace_2u_bksp( \ | ||
| 157 | L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, R27, \ | ||
| 158 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ | ||
| 159 | L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ | ||
| 160 | L46, L30, L41, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ | ||
| 161 | L47, L40, L42, L44, L43, R40, R41, R42, R43, R44, R45 \ | ||
| 162 | ) { \ | ||
| 163 | { L00, L01, L02, L03, L04, L05, L06, XXX }, \ | ||
| 164 | { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ | ||
| 165 | { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ | ||
| 166 | { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ | ||
| 167 | { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ | ||
| 168 | { R00, R01, R02, R03, R04, R05, XXX, R07 }, \ | ||
| 169 | { R10, R11, R12, R13, R14, R15, R16, R17 }, \ | ||
| 170 | { R20, R21, R22, R23, R24, R25, R26, R27 }, \ | ||
| 171 | { R30, R31, R32, R33, R34, R35, R36, R37 }, \ | ||
| 172 | { R40, R41, R42, R43, R44, R45, R46, R47 } \ | ||
| 173 | } | ||
| 174 | |||
| 175 | #define LAYOUT_iso_lspace_split_bksp( \ | ||
| 176 | L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \ | ||
| 177 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ | ||
| 178 | L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ | ||
| 179 | L46, L30, L41, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ | ||
| 180 | L47, L40, L42, L44, L43, R40, R41, R42, R43, R44, R45 \ | ||
| 181 | ) { \ | ||
| 182 | { L00, L01, L02, L03, L04, L05, L06, XXX }, \ | ||
| 183 | { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ | ||
| 184 | { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ | ||
| 185 | { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ | ||
| 186 | { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ | ||
| 187 | { R00, R01, R02, R03, R04, R05, R06, R07 }, \ | ||
| 188 | { R10, R11, R12, R13, R14, R15, R16, R17 }, \ | ||
| 189 | { R20, R21, R22, R23, R24, R25, R26, R27 }, \ | ||
| 190 | { R30, R31, R32, R33, R34, R35, R36, R37 }, \ | ||
| 191 | { R40, R41, R42, R43, R44, R45, R46, R47 } \ | ||
| 192 | } | ||
