diff --git a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c index 5c69c0d0..8e3e6c5e 100644 --- a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c +++ b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) -/* may have to swap the hands in this array since we do right side master*/ +/* These are horizontal encoders. Found I have to make it opposite the rotary encoders for it to feel intuitive*/ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_DEFAULT_LAYER_1] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [_DEFAULT_LAYER_2] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, @@ -40,7 +40,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) }, [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, - [_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, + [_CONFIG] = { ENCODER_CCW_CW(BASELYR, RBSELYR), ENCODER_CCW_CW(TR_RMOD, TR_RRMD) } }; #endif \ No newline at end of file diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/config.h b/keyboards/bluebell/swoop/keymaps/t4corun/config.h index 0c0ea11c..787ab082 100644 --- a/keyboards/bluebell/swoop/keymaps/t4corun/config.h +++ b/keyboards/bluebell/swoop/keymaps/t4corun/config.h @@ -1,3 +1,4 @@ +//Having this makes the left side encoder act like the right side #undef EE_HANDS #define RGB_MATRIX_LED_COUNT 36 diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c index 364a3eac..a303cfad 100644 --- a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c +++ b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_NAVIGATION] = { ENCODER_CCW_CW(ZOOMOUT, ZOOMIN), ENCODER_CCW_CW(___x___, ___x___) }, [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, - [_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(LSFT(TR_RMOD), TR_RMOD) }, + [_CONFIG] = { ENCODER_CCW_CW(RBSELYR, BASELYR), ENCODER_CCW_CW(TR_RRMD, TR_RMOD) } }; #endif //ENCODER_MAP_ENABLE @@ -49,62 +49,15 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { #if defined(RGB_MATRIX_ENABLE) /* - * Center: 133 - * 20 41 61 81 102 122 143 163 183 204 224 244 - * Center: 54 - * 16 11 10 04 03 21 22 28 29 34 21 - * 15 12 09 05 02 20 23 27 30 33 43 - * 14 13 08 06 01 19 24 26 31 32 64 - * 17 07 00 18 25 35 85 + * Center: 112 + * 0 20 41 61 81 102 122 143 163 183 204 224 + * Center: 32 + * 16 11 10 04 03 21 22 28 29 34 0 + * 15 12 09 05 02 20 23 27 30 33 21 + * 14 13 08 06 01 19 24 26 31 32 43 + * 17 07 00 18 25 35 64 */ -/* -led_config_t g_led_config = { - { - // Key matrix to LED index - // I still don't understand but make it match the split layout? - // Left 1-18 - {16, 11, 10, 4, 3}, - {15, 12, 9, 5, 2}, - {14, 13, 8, 6, 1}, - {NO_LED, NO_LED, 17, 7, 0}, - // Right 1-18 - {21, 22, 28, 29, 34}, - {20, 23, 27, 30, 33}, - {19, 24, 26, 31, 32}, - {18, 25, 35, NO_LED, NO_LED} - } - , { - // LED index to physical position - // Start from 0 and go to the end - // Left 1-18 - {122,85}, {102,64}, {102,43}, {102,21}, {81,21}, {81,43}, - {81,64}, {102,85}, {61,64}, {61,43}, {61,21}, {41,21}, - {41,43}, {41,64}, {20,64}, {20,43}, {20,21}, {81,85}, - // Right 1-18 - {143,85}, {163,64}, {163,43}, {163,21}, {183,21}, {183,43}, - {183,64}, {163,85}, {204,64}, {204,43}, {204,21}, {224,21}, - {224,43}, {224,64}, {244,64}, {244,43}, {244,21}, {183,85} - } - , { - // LED index to flag - // Start from 0 and go to the end - // Left 1-18 - LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, - LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, - LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, - LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, - LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, - // Right 1-18 - LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, - LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, - LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, - LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, - LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, - } -}; -*/ - led_config_t g_led_config = { { // Key matrix to LED index @@ -130,30 +83,17 @@ led_config_t g_led_config = { {81,64}, //7 middle thumb {41,43}, {41,21}, {41,0}, //8 {20,0}, {20,21}, {20,13}, //11 - {0,43}, {0,21}, {0,0}, //14 - {81,85}, //17 + {0,43}, {0,21}, {0,0}, //14 outer column + {81,85}, //17 outer thumb // Right 1-18 - /* this with the last table in the obsidian notes - * heatmap works, but the ones don't work when i press the slave side - {224,64}, //18 - {204,43}, {204,21}, {204,0}, //19 - {183,0} , {183,21}, {183,43}, //22 - {204,64}, //25 - {163,43}, {163,21}, {163,0}, //26 - {143,0}, {143,21}, {143,43}, //29 - {122,43}, {122,21}, {122,0}, //32 - {183,64} //35 - */ - //this time we will leave the top inverted but write the locations the - // way I understand - {122,64}, //18 - {143,43}, {143,21}, {143,0}, //19 + {122,64}, //18 inner thumb + {143,43}, {143,21}, {143,0}, //19 inner column {163,0} , {163,21}, {163,43}, //22 - {143,64}, //25 + {143,64}, //25 middle thumb {183,43}, {183,21}, {183,0}, //26 {204,0}, {204,21}, {204,43}, //29 - {224,43}, {224,21}, {224,0}, //32 - {163,64} //35 + {224,43}, {224,21}, {224,0}, //32 outer column + {163,64} //35 outer thumb } , { // LED index to flag diff --git a/keymap-drawer.yml b/keymap-drawer.yml index 830822c1..3a86fa40 100644 --- a/keymap-drawer.yml +++ b/keymap-drawer.yml @@ -33,8 +33,8 @@ layers: - {h: "NAV", t: "0"} - {t: Mute, type: ghost} NAV: - - [Escape, Home, ▲, End, Page Up, Insert, Caps Lock, Scroll Lock, null, null ] - - [null, ◄, ▼, ►, Page Down, null, Shift, Ctrl, Alt, Gui ] + - [Escape, Home, ▲, End, Page Up, Mouse Wheel Up, null, Sniper Toggle, Sniper DPI, Pointer DPI ] + - [Caps Lock, ◄, ▼, ►, Page Down, Mouse Wheel down, Shift, Ctrl, Alt, Gui ] - [Undo, Cut, Copy, Paste, Redo, null, App, Vol-, Vol+, Mute ] - {t: Zoom Reset, type: ghost} - NUM @@ -43,8 +43,8 @@ layers: - {type: held} - {t: Mute, type: ghost} NUM: - - [null, Win Snip, Win File, null, {h: "~", t: "`"}, null, "7", "8" ,"9", null ] - - [Gui, Alt, Ctrl, Shift, {h: ":", t: ";"}, null, "4", "5" ,"6", "."] + - [null, Win Snip, Win File, null, null, null, "7", "8" ,"9", {h: "<", t: ","} ] + - [Gui, Alt, Ctrl, Shift, null, null, "4", "5" ,"6", {h: ">", t: "."}] - [Undo, Cut, Copy, Paste, Redo, null, "1", "2" ,"3", {h: "_", t: "-"}] - {type: ghost} - {type: held} @@ -53,48 +53,37 @@ layers: - {h: "NAV", t: "0"} - {type: ghost} SYM: - - [null, null, "@", "$", {h: "~", t: "`"}, {h: "+", t: "="}, "#", "*", null, {h: "\"\"", t: "\""}] - - ["&", {h: "{}", t: "{"}, "}", "|", {h: ":", t: ";"}, null, "?", {h: "[]", t: "]"}, "]", {h: "''", t: "'"}] - - [{h: "^", t: "%"}, {h: "<>", t: "<"}, ">", "\\", "!", null, "/", {h: "()", t: ","}, {h: ")", t: "."}, {h: "_", t: "-"}] + - [null, null, "@", "$", {h: "~", t: "`"}, {h: "==", t: "="}, "#", "*", null, {h: "\"\"", t: "\""}] + - ["&", {h: "{}", t: "{"}, "}", {h: "||", t: "|"}, {h: ":", t: ";"}, {h: "++", t: "+"}, "?", {h: "[]", t: "]"}, "]", {h: "''", t: "'"}] + - [{h: "^", t: "%"}, {h: "<>", t: "<"}, ">", "\\", {h: "!=", t: "!"}, null, "/", {h: "()", t: "("}, ")", {h: "_", t: "-"}] - {type: ghost} - {type: held} - null - null - {type: held} - {type: ghost} - FUNCTION: - - [null, null, Mouse Up, null, Mouse Wheel Up, Print Screen, F7, F8, F9, F10] - - [null, Mouse Left, Mouse Down, Mouse Right, Mouse Wheel Down, Num Lock, F4, F5, F6, F11] - - [Pointer DPI, Sniper DPI, null, Drag Scroll Toggle, Sniper Toggle, Pause Break, F1, F2, F3, F12] - - {type: ghost} - - {type: held} - - {type: held} - - Macro Play - - Macro Record - - {type: ghost} CONFIG: - - [null, null, null, null, null, Clear EEPROM, Reboot, Boot Loader, null, null] - - [RGB Toggle, RGB Mode, null, null, null, Base Layer Toggle, Shift, Ctrl, Alt, Gui] - - [RGB Hue, RGB Sat, RGB Vib, RGB Spd, null, null, null, null, null, null ] + - [F10, F7, F8, F9, null, RGB Mode, null, null, EEPROM Clear, Boot Loader] + - [F11, F4, F5, F6, null, null, Shift, null, null, null] + - [F12, F1, F2, F3, null, RGB Hue, RGB Sat, RGB Vib, RGB Spd, RGB Toggle ] - {type: ghost} - - null - - null + - Macro Record + - Macro Play - {type: held} - {type: held} - {type: ghost} combos: - - { p: [1, 2], k: Esc, l: [base_QWERTY] } - - { p: [2, 3], k: MB4, l: [base_QWERTY] } - - { p: [3, 4], k: MB5, l: [base_QWERTY] } + - { p: [0, 1], k: Esc, l: [base_QWERTY] } - { p: [12, 13], k: MB1, l: [base_QWERTY] } - - { p: [13, 14], k: MB3, l: [base_QWERTY] } - - { p: [11, 12], k: DrgScr Tog, l: [base_QWERTY] } - - { p: [26, 27], k: Tab, l: [base_QWERTY] } - - { p: [21, 22], k: Enter, l: [base_QWERTY] } - { p: [22, 23], k: MB2, l: [base_QWERTY] } - - { p: [7, 8], k: Bksp, l: [base_QWERTY] } - - { p: [6, 7], k: Del, l: [base_QWERTY] } - - { p: [31, 32], k: FUNC, l: [base_QWERTY], align: top } + - { p: [23, 24], k: MB3, l: [base_QWERTY] } + - { p: [13, 14], k: MB4, l: [base_QWERTY] } + - { p: [4, 14], k: MB5, l: [base_QWERTY] } + - { p: [11, 12], k: DrgScr Tog, l: [base_QWERTY] } + - { p: [6, 7], k: Tab, l: [base_QWERTY] } + - { p: [21, 22], k: Enter, l: [base_QWERTY] } + - { p: [26, 27], k: Bksp, l: [base_QWERTY] } + - { p: [27, 28], k: Del, l: [base_QWERTY] } - { p: [33, 34], k: CONFIG, l: [base_QWERTY], align: top } draw_config: - small_pad: 6 + small_pad: 6 \ No newline at end of file diff --git a/my_keymap.png b/my_keymap.png index 7d38f253..cfe87471 100644 Binary files a/my_keymap.png and b/my_keymap.png differ diff --git a/users/t4corun/config/mouse_config.h b/users/t4corun/config/mouse_config.h index 9048caa3..a002e6bf 100644 --- a/users/t4corun/config/mouse_config.h +++ b/users/t4corun/config/mouse_config.h @@ -21,7 +21,7 @@ other modes: - Inertia: Cursor accelerates when key held, and decelerates after key release. Tracks X and Y velocity separately for more nuanced movements. Applies to cursor only, not scrolling. -https://docs.qmk.fm/#/feature_pointing_device +https://docs.qmk.fm/#/feature_mouse_keys?id=accelerated-mode notes: there are way more settings but I don't want to mess anything that Quentin set for the nano @@ -36,11 +36,25 @@ Explore These: //Clear variables we plan to use that might be set elsewhere #undef MOUSEKEY_DELAY #undef MOUSEKEY_INTERVAL +#undef MOUSEKEY_MOVE_DELTA #undef MOUSEKEY_MAX_SPEED #undef MOUSEKEY_TIME_TO_MAX +#undef MOUSEKEY_WHEEL_DELAY +#undef MOUSEKEY_WHEEL_INTERVAL +#undef MOUSEKEY_WHEEL_DELTA +#undef MOUSEKEY_WHEEL_MAX_SPEED +#undef MOUSEKEY_WHEEL_TIME_TO_MAX + //Set common configuration for all keyboards +#define MOUSEKEY_DELAY 20 #define MOUSEKEY_INTERVAL 12 +#define MOUSEKEY_MOVE_DELTA 8 #define MOUSEKEY_MAX_SPEED 6 #define MOUSEKEY_TIME_TO_MAX 50 -#define MOUSEKEY_DELAY 20 \ No newline at end of file + +#define MOUSEKEY_WHEEL_DELAY 10 +#define MOUSEKEY_WHEEL_INTERVAL 80 +#define MOUSEKEY_WHEEL_DELTA 2 +#define MOUSEKEY_WHEEL_MAX_SPEED 8 +#define MOUSEKEY_WHEEL_TIME_TO_MAX 40 \ No newline at end of file diff --git a/users/t4corun/config/rgbmatrix_config.h b/users/t4corun/config/rgbmatrix_config.h index ef0013f8..e9517d48 100644 --- a/users/t4corun/config/rgbmatrix_config.h +++ b/users/t4corun/config/rgbmatrix_config.h @@ -1,40 +1,24 @@ #pragma once -/* -https://docs.qmk.fm/#/feature_rgb_matrix - -My Keyboards: -KEYBOARD_bastardkb_charybdis_3x5 -KEYBOARD_crkbd_rev1 -KEYBOARD_dztech_dz60rgb_v2_1 ??? -the planck is RGBLIGHT not RGB MATRIX - -Explore These -#undef RGB_MATRIX_TYPING_HEATMAP_SLIM -#undef RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE -#undef RGB_MATRIX_TIMEOUT -*/ - //Clear variables we plan to use that might be set elsewhere #undef RGB_MATRIX_SLEEP +#undef RGB_MATRIX_TIMEOUT +#undef RGB_MATRIX_DEFAULT_MODE + +#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS #undef RGB_MATRIX_DEFAULT_HUE #undef RGB_MATRIX_DEFAULT_SAT #undef RGB_MATRIX_DEFAULT_VAL #undef RGB_MATRIX_DEFAULT_SPD -#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS -//#undef RGB_MATRIX_FRAMEBUFFER_EFFECTS -//#undef RGB_MATRIX_KEYPRESSES + #undef RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS #undef RGB_MATRIX_TYPING_HEATMAP_SPREAD #undef RGB_MATRIX_TYPING_HEATMAP_AREA_LIMIT #undef RGB_MATRIX_TYPING_HEATMAP_INCREASE_STEP -#undef RGB_MATRIX_DEFAULT_MODE // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects - -//Then undefine all the RGB Animations #undef ENABLE_RGB_MATRIX_ALPHAS_MODS #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN #undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT @@ -69,10 +53,56 @@ Explore These #undef ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE #undef ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT #undef ENABLE_RGB_MATRIX_RIVERFLOW -//These modes also require the RGB_MATRIX_FRAMEBUFFER_EFFECTS define to be available. #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN -//These modes also require the RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES define to be available. +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +#undef ENABLE_RGB_MATRIX_SPLASH +#undef ENABLE_RGB_MATRIX_MULTISPLASH +#undef ENABLE_RGB_MATRIX_SOLID_SPLASH +#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#undef ENABLE_RGB_MATRIX_ALPHAS_MODS +#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +#undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +#undef ENABLE_RGB_MATRIX_BREATHING +#undef ENABLE_RGB_MATRIX_BAND_SAT +#undef ENABLE_RGB_MATRIX_BAND_VAL +#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +#undef ENABLE_RGB_MATRIX_CYCLE_ALL +#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN +#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#undef ENABLE_RGB_MATRIX_DUAL_BEACON +#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON +#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +#undef ENABLE_RGB_MATRIX_FLOWER_BLOOMING +#undef ENABLE_RGB_MATRIX_RAINDROPS +#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +#undef ENABLE_RGB_MATRIX_HUE_BREATHING +#undef ENABLE_RGB_MATRIX_HUE_PENDULUM +#undef ENABLE_RGB_MATRIX_HUE_WAVE +#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL +#undef ENABLE_RGB_MATRIX_PIXEL_FLOW +#undef ENABLE_RGB_MATRIX_PIXEL_RAIN +#undef ENABLE_RGB_MATRIX_STARLIGHT +#undef ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE +#undef ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT +#undef ENABLE_RGB_MATRIX_RIVERFLOW +#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP +#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE @@ -92,11 +122,11 @@ Explore These - //Set common configuration for all keyboards #define RGB_MATRIX_SLEEP -//#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_TIMEOUT 60000 //1 min +#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 #define RGB_MATRIX_DEFAULT_HUE 4 #define RGB_MATRIX_DEFAULT_SAT 79 #define RGB_MATRIX_DEFAULT_VAL 59 @@ -104,11 +134,7 @@ Explore These //Set per keyboard configuration #if defined(KEYBOARD_bastardkb_charybdis_3x5) || defined(KEYBOARD_dztech_dz60rgb_v2_1) || defined(KEYBOARD_bluebell_swoop) -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 -//# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -//# define RGB_MATRIX_KEYPRESSES -//no extra defines required # define ENABLE_RGB_MATRIX_BREATHING # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL # define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT @@ -117,10 +143,10 @@ Explore These # define ENABLE_RGB_MATRIX_DUAL_BEACON # define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS # define ENABLE_RGB_MATRIX_HUE_BREATHING -//requires RGB_MATRIX_FRAMEBUFFER_EFFECTS + # define ENABLE_RGB_MATRIX_TYPING_HEATMAP # define ENABLE_RGB_MATRIX_DIGITAL_RAIN -//requires RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES + # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS # define ENABLE_RGB_MATRIX_SPLASH @@ -130,7 +156,6 @@ Explore These //enable minimal effects to save memory #else -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 # define ENABLE_RGB_MATRIX_BREATHING # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN # define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING diff --git a/users/t4corun/config/split_config.h b/users/t4corun/config/split_config.h index 5ed675fe..72e3419b 100644 --- a/users/t4corun/config/split_config.h +++ b/users/t4corun/config/split_config.h @@ -9,12 +9,15 @@ https://docs.qmk.fm/#/feature_split_keyboard #undef SPLIT_LAYER_STATE_ENABLE #undef SPLIT_LED_STATE_ENABLE #undef SPLIT_MODS_ENABLE +#undef SPLIT_OLED_ENABLE #undef SPLIT_USB_DETECT + #define SPLIT_TRANSPORT_MIRROR #define SPLIT_LAYER_STATE_ENABLE #define SPLIT_LED_STATE_ENABLE #define SPLIT_MODS_ENABLE +#define SPLIT_OLED_ENABLE //# define SPLIT_USB_DETECT #define MASTER_RIGHT \ No newline at end of file diff --git a/users/t4corun/features/combo.h b/users/t4corun/features/combo.h index ea2a7f3d..5616feb9 100644 --- a/users/t4corun/features/combo.h +++ b/users/t4corun/features/combo.h @@ -31,13 +31,13 @@ enum combos { #if defined(MOUSEKEY_ENABLE) const uint16_t PROGMEM mou_btn1_combo[] = { KC_D, KC_F, COMBO_END }; const uint16_t PROGMEM mou_btn2_combo[] = { KC_C, KC_V, COMBO_END }; -const uint16_t PROGMEM mou_btn3_combo[] = { KC_E, KC_R, COMBO_END }; +const uint16_t PROGMEM mou_btn3_combo[] = { KC_V, KC_B, COMBO_END }; const uint16_t PROGMEM mou_btn4_combo[] = { KC_F, KC_G, COMBO_END }; -const uint16_t PROGMEM mou_btn5_combo[] = { KC_R, KC_T, COMBO_END }; +const uint16_t PROGMEM mou_btn5_combo[] = { KC_T, KC_G, COMBO_END }; const uint16_t PROGMEM mou_drg_combo[] = { KC_S, KC_D, COMBO_END }; #endif //MOUSEKEY_ENABLE -const uint16_t PROGMEM key_esc_combo[] = { KC_W, KC_E, COMBO_END }; +const uint16_t PROGMEM key_esc_combo[] = { KC_Q, KC_W, COMBO_END }; const uint16_t PROGMEM key_ent_combo[] = { KC_X, KC_C, COMBO_END }; //const uint16_t PROGMEM lyr_fun_combo[] = { NUM, TR_LSFT, COMBO_END }; diff --git a/users/t4corun/features/oled.h b/users/t4corun/features/oled.h index 8a1397fd..22065475 100644 --- a/users/t4corun/features/oled.h +++ b/users/t4corun/features/oled.h @@ -19,6 +19,8 @@ #define OLED_RENDER_LAYER_CONFIG " Cfg " void render_crkbd_logo(void); +void render_rollow_logo(void); +void render_qmk_logo(void); void render_default_layer_state(void); void render_layer_state(void); void render_keylock_status(void); diff --git a/users/t4corun/features/tapping.c b/users/t4corun/features/tapping.c index 38bf9ce1..8e7f7e7c 100644 --- a/users/t4corun/features/tapping.c +++ b/users/t4corun/features/tapping.c @@ -11,6 +11,7 @@ bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { + default: return QUICK_TAP_TERM; } @@ -18,8 +19,6 @@ uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case NAV: - return TAPPING_TERM - 60; default: //uprintf("tapping term: %d \n", TAPPING_TERM); diff --git a/users/t4corun/t4corun.c b/users/t4corun/t4corun.c index c788547a..c9a52e63 100644 --- a/users/t4corun/t4corun.c +++ b/users/t4corun/t4corun.c @@ -1,7 +1,5 @@ #include "t4corun.h" -static uint8_t current_base_layer = _DEFAULT_LAYER_1; - layer_state_t layer_state_set_user(layer_state_t state) { state = update_tri_layer_state(state, _NAVIGATION, _NUMBER, _SYMBOL); @@ -20,10 +18,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; + case RBSELYR: + if (record->event.pressed) { + current_base_layer = (current_base_layer - 1) % NUM_BASE_LAYER; + set_single_persistent_default_layer(current_base_layer); + } + return false; + case PN_DRGS: if (record->event.pressed) { //tap numlock twice to toggle ploopy nano drag scroll - double_tap(KC_NUM, KC_NUM,WAIT_DELAY); + double_tap(KC_NUM, KC_NUM, WAIT_DELAY); } return false; diff --git a/users/t4corun/t4corun.h b/users/t4corun/t4corun.h index 554b4342..91bccb81 100644 --- a/users/t4corun/t4corun.h +++ b/users/t4corun/t4corun.h @@ -40,7 +40,8 @@ enum keycodes { PN_DRGS, PN_PDPI, - BASELYR + BASELYR, + RBSELYR }; #define ___x___ KC_NO @@ -149,13 +150,9 @@ enum keycodes { #if defined(DYNAMIC_MACRO_ENABLE) # define TR_DMR1 DM_REC1 # define TR_DMP1 DM_PLY1 -# define TR_DMR2 DM_REC2 -# define TR_DMP2 DM_PLY2 #else # define TR_DMR1 ___x___ # define TR_DMP1 ___x___ -# define TR_DMR2 ___x___ -# define TR_DMP2 ___x___ #endif //DYNAMIC_MACRO_ENABLE #if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE) @@ -165,6 +162,7 @@ enum keycodes { # define TR_RSPI RGB_SPI # define TR_RTOG RGB_TOG # define TR_RMOD RGB_MOD +# define TR_RRMD RGB_RMOD #else # define TR_RHUI ___x___ # define TR_RSAI ___x___ @@ -172,6 +170,7 @@ enum keycodes { # define TR_RSPI ___x___ # define TR_RTOG ___x___ # define TR_RMOD ___x___ +# define TR_RRMD ___x___ #endif //RGB_MATRIX_ENABLE || RGBLIGHT_ENABLE @@ -181,6 +180,8 @@ enum keycodes { #define _DEFAULT_LAYER_3 (FIRST_DEFAULT_LAYER + 2) #define NUM_BASE_LAYER 3 +static uint8_t current_base_layer = _DEFAULT_LAYER_1; + #define _NONE_3__________________ ___x___, ___x___, ___x___ #define _NONE_5____________________________________ ___x___, ___x___, ___x___, ___x___, ___x___ #define _GACS_MODS________________________ TR_LGUI, TR_LALT, TR_LCTL, TR_LSFT @@ -216,7 +217,7 @@ enum keycodes { #define LAYER_NAVIGATION \ - ___x___, KC_HOME, KC_UP, KC_END, KC_PGUP, TR_MWHU, TR_DRGS, TR_SNIP, TR_SDPI, TR_PDPI, \ + ___x___, KC_HOME, KC_UP, KC_END, KC_PGUP, TR_MWHU, ___x___, TR_SNIP, TR_SDPI, TR_PDPI, \ KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, TR_MWHD, _SCAG_MODS________________________, \ _UCCPR_L___________________________________, ___x___, KC_APP, KC_VOLD, KC_VOLU, KC_MUTE, \ ZOOMRST, _______, KC_ENT, _LAYER_TRANS_____________ @@ -237,8 +238,8 @@ enum keycodes { #define LAYER_CONFIG \ - KC_F10, KC_F7, KC_F8, KC_F9, ___x___, TR_RMOD, ___x___, ___x___, ___x___, QK_BOOT, \ - KC_F11, KC_F4, KC_F5, KC_F6, ___x___, BASELYR, TR_LSFT, _NONE_3__________________, \ + KC_F10, KC_F7, KC_F8, KC_F9, ___x___, TR_RMOD, ___x___, ___x___, EE_CLR, QK_BOOT, \ + KC_F11, KC_F4, KC_F5, KC_F6, ___x___, ___x___, TR_LSFT, _NONE_3__________________, \ KC_F12, KC_F1, KC_F2, KC_F3, ___x___, TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, TR_RTOG, \ ___x___, TR_DMR1, TR_DMP1, _NONE_3__________________