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 --- users/art/art.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 10 deletions(-) (limited to 'users/art/art.h') diff --git a/users/art/art.h b/users/art/art.h index 58b005b933..71af966bef 100644 --- a/users/art/art.h +++ b/users/art/art.h @@ -1,18 +1,30 @@ +// Copyright 2022 Artjoms Rizihs (@artjomsR) +// SPDX-License-Identifier: GPL-2.0-or-later + #pragma once #include QMK_KEYBOARD_H #define CTL_ALT(kc) (CTL_ALT_START + ((kc) & 0xff)) extern bool is_win; +#define TYPING_INTERVAL 20 +#define LONG_TYPING_INTERVAL 50 enum layer_names { +#if SPLIT75_SETUP_FOR_PUBLIC_USE_BY_DEFAULT && defined(KEYBOARD_wheatfield_split75) // defined by "KEYBOARD" followed by folder structure + BASE, QWERTY, - WORKMAN, - BASE, //only specific for split75 -#if defined(KEYBOARD_wheatfield_split75) - QWERTY_MOD, +#else + QWERTY, + BASE, +#endif + + WORKMAN, +#if defined(KEYBOARD_mt_split75) + CONFIG, LAYOUT_CHG, -#elif defined(KEYBOARD_ergodone) + QWERTY_MOD, +#elif defined(KEYBOARD_ktec_ergodone) FKEYS, CTRL_NAV, SHIFT_NAV, @@ -20,12 +32,12 @@ enum layer_names { MEDIA, COMBOS, - STRINGS, - CONFIG, + //STRINGS, NAV, NUMPAD, GIT, GIT_C, + GIT_R, GIT_S }; @@ -33,35 +45,61 @@ enum custom_keycodes_art { CTRL_CTV = SAFE_RANGE, CTRL_LCTV, CTRL_CAV, + BEAT_BROWSER, + NEUTRAL_COPY, SARCASM, + LMB_SPAM, TOG_OS, CTR_ALT, + CTR_ALT_SHIFT, OS_CTRL, OS_WIN, TILD_BLOCK, + ALL_BEST, + AT_EMAIL, + BRACES, + DASHES, + PARENTHS, + STARS, + QUOTES, + QUOTES_RU, + ADMINS, PRESCRIPTION, FOURS, - + G_ADD, G_BRCH, G_C, - G_CHEC, + G_CHEC, G_COMM, G_DEV, G_DIFF, G_FTCH, G_LOG, G_MERG, - G_P, + G_PULL, + G_PUSH, + G_R, + G_RBASE, + G_RVERT, G_RST, G_S, G_STAT, G_STSH, G_SHOW, + K_CUST1, + K_CUST2, + K_CUST3, + + K_SECR1, + K_SECR2, + K_SECR3, + K_SECR4, + CTL_ALT_START, CTL_ALT_END = CTL_ALT_START + 0xff, -- cgit v1.2.3