From cd4a265560b45d117ac8296887188015c907e3c8 Mon Sep 17 00:00:00 2001 From: Artjoms Rizihs Date: Mon, 10 Oct 2022 01:04:30 -0700 Subject: [Keyboard][Keymap] Fix random keys being sent on Mac + userspace changes (#15648) * qmk art 2020+ * fix compilation * remove functions. translation matrix * fix edgecases * whitespace * fix memory oddity changing the keymap with every string print * return edge cases * support workman layout for git strings * subm * secrets * fix git ignore * rename var * workman HW feature toggle * remember lenght for inserting secrets * blink leds on secret finish * 75:fix LEDs not reflecting state on boot * move common led functions to user file * move common led funcs to separate file * move funcs file to separate folder * capsword * move string functions to a separate file * consolidate led funcs * tidy up variables * email * fix printing random keys on Mac + temp disable dynamic macro * make switch lang shortcut configurable * revert ergodone behaviour * move git ignore to userspace folder * ergodone clean up + saving space * navigation combos * shift caps always turns on caps lock. more combos * convert led funcs into header file * convert string funcs into header file * fix compilation for split75 * remove git cherry pick * update legal headers * more legal headers * home row macros * refactor combo names * redo combos for homerow + f10 11 12 * custom strings implementation (like secrets) * ergodone: more consistent f keys * tweak left right combos to minimise typing interference * ctr z shortcut * ergodone: move del to a more convenient key * rename secrets file to a shorter length * ergodone tweaks * fix after merge * removed included .c files * Update keyboards/ktec/ergodone/keymaps/art/user_config.c.example * Update keyboards/mt/split75/keymaps/art/user_config.c.example * Update users/art/secr.h.example * Update users/art/custom_definitions.h.example * Update users/art/art_user_config.h.example * Update users/art/art.h --- keyboards/ktec/ergodone/keymaps/art/keymap.c | 207 ++++++++++++++------------- 1 file changed, 107 insertions(+), 100 deletions(-) (limited to 'keyboards/ktec/ergodone/keymaps/art/keymap.c') diff --git a/keyboards/ktec/ergodone/keymaps/art/keymap.c b/keyboards/ktec/ergodone/keymaps/art/keymap.c index 7fcbd5b615..d43a340769 100644 --- a/keyboards/ktec/ergodone/keymaps/art/keymap.c +++ b/keyboards/ktec/ergodone/keymaps/art/keymap.c @@ -1,68 +1,51 @@ +// Copyright 2022 Artjoms Rizihs (@artjomsR) +// SPDX-License-Identifier: GPL-2.0-or-later + #include "art.h" #include "sendstring_workman_zxcvm.h" -bool is_win = true; - enum custom_keycodes { keyboardSpecificKeyCode = NEW_SAFE_RANGE //not used }; -void led_show_current_os(void) { - if (is_win) { - ergodox_right_led_1_on(); - wait_ms(50); - ergodox_right_led_1_off(); - wait_ms(50); - ergodox_right_led_1_on(); - wait_ms(50); - ergodox_right_led_1_off(); - wait_ms(50); - ergodox_right_led_1_on(); - wait_ms(50); - ergodox_right_led_1_off(); - wait_ms(50); - } else { - ergodox_right_led_3_on(); - wait_ms(50); - ergodox_right_led_3_off(); - wait_ms(50); - ergodox_right_led_3_on(); - wait_ms(50); - ergodox_right_led_3_off(); - wait_ms(50); - ergodox_right_led_3_on(); - wait_ms(50); - ergodox_right_led_3_off(); - wait_ms(50); - } +void num_led_on(void) { + ergodox_right_led_1_on(); } -void matrix_init_user(void) { - led_show_current_os(); +void num_led_off(void) { + ergodox_right_led_1_off(); } -void led_set_user(uint8_t usb_led) { - if (usb_led & (1< | Win |Alt | ctrl | | Home | End |Workmn| | RCtrl| * `----------------------------------' `----------------------------------' * ,-------------. ,---------------. * | Del | Ins | | Left | Right | @@ -93,27 +76,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [QWERTY] = LAYOUT_ergodox( // -----------------------------------------------------left hand----------------------------------------------------- KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESCAPE, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_BSLASH, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, TT(FKEYS), - KC_LCTRL, LT(MEDIA, KC_BSLASH), KC_LWIN, KC_LALT, LT(NAV, KC_RIGHT), + KC_LEFT, KC_RIGHT, KC_LWIN, KC_LALT, KC_LCTRL, - KC_DEL, KC_INS, - KC_PGUP, - KC_SPC, LT(COMBOS,KC_BSPC), KC_PGDOWN, + KC_INS, KC_PGUP, + LT(MEDIA,KC_PGDOWN), + LT(NAV,KC_SPC), KC_BSPC, LT(COMBOS,KC_DEL), // -----------------------------------------------------right hand----------------------------------------------------- KC_MINS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_RBRC, KC_EQL, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, TT(FKEYS), KC_N, KC_M, KC_COMM, KC_DOT, LT(GIT,KC_SLSH), KC_RSFT, - KC_HOME, KC_END, DF(WORKMAN), KC_RALT, KC_RCTRL, + KC_HOME, KC_END, TO(WORKMAN), KC_RALT, KC_RCTRL, KC_LEFT, KC_RIGHT, LT(SHIFT_NAV, KC_UP), - LT(CTRL_NAV, KC_DOWN), MO(NAV), KC_ENT + LT(CTRL_NAV, KC_DOWN), TT(NAV), KC_ENT ), - /* Workman +/* Workman * * ,--------------------------------------------------. ,--------------------------------------------------. * | | | | | | | | | | | | | | | | @@ -134,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | * `--------------------' `----------------------' */ -[WORKMAN] = LAYOUT_ergodox( +[WORKMAN] = LAYOUT_ergodox( // -----------------------------------------------------left hand----------------------------------------------------- _______, _______, _______, _______, _______, _______, _______, _______, KC_Q, KC_D, KC_R, KC_W, KC_B, _______, @@ -150,8 +133,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, KC_J, KC_F, KC_U, KC_P, KC_SCLN, _______, KC_Y, KC_N, KC_E, KC_O, KC_I, _______, - _______, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, _______, - _______, _______, DF(QWERTY), _______, _______, + _______, KC_K, KC_L, _______, _______, _______, _______, + _______, _______, TO(QWERTY), _______, _______, _______, _______, _______, @@ -160,8 +143,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [FKEYS] = LAYOUT_ergodox( // -----------------------------------------------------left hand----------------------------------------------------- - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, - _______, _______, _______, _______, _______, _______, _______, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, + _______, _______, _______, _______, _______, _______, KC_LALT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -170,11 +153,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, // -----------------------------------------------------right hand----------------------------------------------------- - _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - _______, _______, _______, _______, _______, _______, KC_F12, - _______, _______, _______, _______, _______, KC_PSCREEN, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, + _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + KC_LALT, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, KC_F11, + _______, _______, _______, KC_PSCREEN, KC_F12, _______, _______, _______, @@ -183,20 +166,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [NAV] = LAYOUT_ergodox( // -----------------------------------------------------left hand----------------------------------------------------- - _______, LALT(KC_F1), LALT(KC_F2), LALT(KC_F3), LALT(KC_F4), LALT(KC_F5), _______, - _______, _______, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, - _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDOWN, - _______, _______, _______, _______, KC_LALT, _______, _______, - _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, KC_ESC, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, + _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDOWN, + _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), XXXXXXX, _______, + _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_DEL, _______, + KC_DEL, _______, _______, // -----------------------------------------------------right hand----------------------------------------------------- - _______, LALT(KC_F6), LALT(KC_F7), LALT(KC_F8), LALT(KC_F9), LALT(KC_F10), LALT(KC_F11), - _______, _______, _______, _______, _______, _______, LALT(KC_F12), - _______, CTR_ALT, KC_RSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, XXXXXXX, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2, _______, _______, + KC_APP, CTR_ALT, KC_RSFT, CTR_ALT_SHIFT, _______, _______, + _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -209,7 +192,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, CTL_ALT(KC_HOME), CTL_ALT(KC_UP), CTL_ALT(KC_END), CTL_ALT(KC_PGUP), _______, _______, _______, CTL_ALT(KC_LEFT), CTL_ALT(KC_DOWN), CTL_ALT(KC_RIGHT),CTL_ALT(KC_PGDOWN), - _______, _______, CTL_ALT(KC_X), CTL_ALT(KC_C), CTL_ALT(KC_V), _______, _______, + _______, _______, LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), _______, _______, _______, _______, _______, _______, _______, CTL_ALT(KC_DEL), _______, @@ -232,7 +215,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, LSFT(KC_HOME), LSFT(KC_UP), LSFT(KC_END), LSFT(KC_PGUP), _______, _______, _______, LSFT(KC_LEFT), LSFT(KC_DOWN), LSFT(KC_RIGHT), LSFT(KC_PGDOWN), - _______, _______, _______, _______, _______, _______, _______, + _______, _______, LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -252,12 +235,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { CTR_ALT, _______, _______ ), -[COMBOS] = LAYOUT_ergodox( +[COMBOS] = LAYOUT_ergodox( // -----------------------------------------------------left hand----------------------------------------------------- - TILD_BLOCK, PRESCRIPTION, _______, _______, FOURS, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, ADMINS, SARCASM, _______, CTRL_CTV, _______, - _______, _______, _______, _______, _______, _______, _______, + TILD_BLOCK, _______, QUOTES_RU, K_CUST1, K_CUST2, K_CUST3, _______, + _______, _______, _______, NEUTRAL_COPY, _______, BEAT_BROWSER, _______, + _______, ADMINS, SARCASM, ALL_BEST, CTRL_CTV, _______, + _______, _______, _______, CTRL_CAV, _______, LMB_SPAM, _______, _______, _______, _______, _______, _______, _______, _______, @@ -265,9 +248,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, // -----------------------------------------------------right hand----------------------------------------------------- - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, + DASHES, _______, _______, STARS, PARENTHS, _______, TOG_OS, + _______, K_SECR1, K_SECR2, K_SECR3, K_SECR4, _______, BRACES, + AT_EMAIL, _______, _______, _______, _______, QUOTES, _______, _______, CTRL_LCTV, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -276,7 +259,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______ ), -// [STRINGS] = LAYOUT_ergodox( +// [STRINGS] = LAYOUT_ergodox( // // -----------------------------------------------------left hand----------------------------------------------------- // _______, _______, _______, _______, _______, _______, _______, // _______, _______, _______, _______, _______, _______, _______, @@ -300,12 +283,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // _______, _______, _______ // ), -[MEDIA] = LAYOUT_ergodox( +[MEDIA] = LAYOUT_ergodox( // -----------------------------------------------------left hand----------------------------------------------------- _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_MPRV, KC_VOLU, KC_MNXT, _______, _______, - _______, _______, _______, KC_VOLD, _______, _______, - _______, _______, _______, KC_MUTE, KC_MPLY, _______, _______, + XXXXXXX, KC_MPRV, KC_VOLU, KC_MNXT, _______, _______, _______, + _______, _______, KC_VOLD, _______, _______, _______, + _______, _______, KC_MUTE, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -315,7 +298,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // -----------------------------------------------------right hand----------------------------------------------------- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, TOG_OS, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -324,12 +307,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______ ), -[GIT] = LAYOUT_ergodox( +[GIT] = LAYOUT_ergodox( // -----------------------------------------------------left hand----------------------------------------------------- _______, _______, _______, _______, _______, _______, _______, - _______, _______, G_DIFF, G_RST, _______, G_BRCH, _______, + _______, _______, G_DIFF, G_R, _______, G_BRCH, _______, _______, G_ADD, G_S, _______, _______, _______, - _______, _______, _______, G_C, _______, G_MERG, _______, + _______, G_DEV, _______, G_C, _______, G_MERG, _______, _______, _______, _______, _______, _______, _______, _______, @@ -338,9 +321,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // -----------------------------------------------------right hand----------------------------------------------------- _______, _______, _______, _______, _______, _______, _______, - _______, _______, G_FTCH, _______, G_P, _______, _______, + _______, _______, G_FTCH, G_PULL, G_PUSH, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, G_LOG, _______, G_DEV, _______, _______, + _______, _______, G_LOG, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -348,13 +331,37 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______ ), -[GIT_C] = LAYOUT_ergodox( +[GIT_C] = LAYOUT_ergodox( // -----------------------------------------------------left hand----------------------------------------------------- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, G_CHEC, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, + + XXXXXXX, XXXXXXX, + XXXXXXX, + XXXXXXX, KC_BSPC, XXXXXXX, + + // -----------------------------------------------------right hand----------------------------------------------------- + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, G_COMM, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, + + XXXXXXX, XXXXXXX, + XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX +), + +[GIT_R] = LAYOUT_ergodox( + // -----------------------------------------------------left hand----------------------------------------------------- + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, G_RBASE, XXXXXXX, + XXXXXXX, XXXXXXX, G_RST, XXXXXXX, XXXXXXX, XXXXXXX, + _______, XXXXXXX, XXXXXXX, XXXXXXX, G_RVERT, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, @@ -365,20 +372,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, G_COMM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), -[GIT_S] = LAYOUT_ergodox( +[GIT_S] = LAYOUT_ergodox( // -----------------------------------------------------left hand----------------------------------------------------- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, G_STSH, G_SHOW, G_STAT, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, @@ -389,7 +396,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, G_COMM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, @@ -412,7 +419,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------' */ -// [] = LAYOUT_ergodox( +// [] = LAYOUT_ergodox( // // -----------------------------------------------------left hand----------------------------------------------------- // _______, _______, _______, _______, _______, _______, _______, // _______, _______, _______, _______, _______, _______, _______, -- cgit v1.2.3