fix: Adjust keymap layout and enable chordal hold functionality
This commit is contained in:
		
							parent
							
								
									ac0b03a50c
								
							
						
					
					
						commit
						ffdd049589
					
				
					 2 changed files with 5 additions and 10 deletions
				
			
		| 
						 | 
					@ -52,14 +52,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
        ____________NORTNAVIGATION_1_______________, _________________NUMPAD_1__________________,
 | 
					        ____________NORTNAVIGATION_1_______________, _________________NUMPAD_1__________________,
 | 
				
			||||||
        ____________NORTNAVIGATION_2_______________, _________________NUMPAD_2__________________,
 | 
					        ____________NORTNAVIGATION_2_______________, _________________NUMPAD_2__________________,
 | 
				
			||||||
        ____________NORTNAVIGATION_3_______________, _________________NUMPAD_3__________________,
 | 
					        ____________NORTNAVIGATION_3_______________, _________________NUMPAD_3__________________,
 | 
				
			||||||
                           _______, _______, _______, _______, _______, TG(_SETUP)
 | 
					                           _______, _______, _______, _______, TG(_SETUP), _______
 | 
				
			||||||
    ),
 | 
					    ),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    [_SYMFKEYS] = LAYOUT_sweeeeep_base_wrapper(
 | 
					    [_SYMFKEYS] = LAYOUT_sweeeeep_base_wrapper(
 | 
				
			||||||
        ___________________FKEY______L1________________, ________________NORTSYMBOLS_R1_________________,
 | 
					        ___________________FKEY______L1________________, ________________NORTSYMBOLS_R1_________________,
 | 
				
			||||||
        ___________________FKEY______L2________________, ________________NORTSYMBOLS_R2_________________,
 | 
					        ___________________FKEY______L2________________, ________________NORTSYMBOLS_R2_________________,
 | 
				
			||||||
        ___________________FKEY______L3________________, ________________NORTSYMBOLS_R3_________________,
 | 
					        ___________________FKEY______L3________________, ________________NORTSYMBOLS_R3_________________,
 | 
				
			||||||
                           TG(_SETUP), _______, _______, _______, _______, _______
 | 
					                           _______, TG(_SETUP), _______, _______, _______, _______
 | 
				
			||||||
    ),
 | 
					    ),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        [_SETUP] = LAYOUT_sweeeeep_base_wrapper(
 | 
					        [_SETUP] = LAYOUT_sweeeeep_base_wrapper(
 | 
				
			||||||
| 
						 | 
					@ -71,8 +71,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Chordal hold layout (disabled - conflicts with multi-modifier shortcuts)
 | 
					 | 
				
			||||||
/*
 | 
					 | 
				
			||||||
const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM =
 | 
					const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM =
 | 
				
			||||||
    LAYOUT(
 | 
					    LAYOUT(
 | 
				
			||||||
        'L', 'L', 'L', 'L', 'L',  'R', 'R', 'R', 'R', 'R',
 | 
					        'L', 'L', 'L', 'L', 'L',  'R', 'R', 'R', 'R', 'R',
 | 
				
			||||||
| 
						 | 
					@ -80,7 +78,6 @@ const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM =
 | 
				
			||||||
        'L', 'L', 'L', 'L', 'L',  'R', 'R', 'R', 'R', 'R',
 | 
					        'L', 'L', 'L', 'L', 'L',  'R', 'R', 'R', 'R', 'R',
 | 
				
			||||||
                  '*', 'L', 'L',  'R', 'R', '*'
 | 
					                  '*', 'L', 'L',  'R', 'R', '*'
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
*/
 | 
					 | 
				
			||||||
#ifdef OLED_ENABLE
 | 
					#ifdef OLED_ENABLE
 | 
				
			||||||
//    static uint32_t oled_timer = 0;
 | 
					//    static uint32_t oled_timer = 0;
 | 
				
			||||||
    bool process_record_oled(uint16_t keycode, keyrecord_t *record);
 | 
					    bool process_record_oled(uint16_t keycode, keyrecord_t *record);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -24,14 +24,13 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Tapping and timing configuration
 | 
					// Tapping and timing configuration
 | 
				
			||||||
#define TAPPING_TERM 200
 | 
					#define TAPPING_TERM 200
 | 
				
			||||||
//#define FLOW_TAP
 | 
					#define FLOW_TAP 130
 | 
				
			||||||
//#define PERMISSIVE_HOLD         // Activate mod immediately when another key pressed _REDUNDANT due to SpeculativeHold
 | 
					//#define PERMISSIVE_HOLD         // Activate mod immediately when another key pressed _REDUNDANT due to SpeculativeHold
 | 
				
			||||||
#define AUTO_SHIFT_TIMEOUT 150  // Slightly longer than TAPPING_TERM
 | 
					#define AUTO_SHIFT_TIMEOUT 140  // at what point are you holding the key to send a SHIFTED value
 | 
				
			||||||
#define RETRO_SHIFT             // Enable retroactive shift
 | 
					#define RETRO_SHIFT             // Enable retroactive shift
 | 
				
			||||||
#define RETRO_TAPPING           // Enable retroactive tapping
 | 
					#define RETRO_TAPPING           // Enable retroactive tapping
 | 
				
			||||||
#define HOLD_ON_OTHER_KEY_PRESS // Enable hold on other key press
 | 
					#define HOLD_ON_OTHER_KEY_PRESS // Enable hold on other key press
 | 
				
			||||||
//#define CHORDAL_HOLD        // Enable chordal hold (mod activates if another key is pressed before tapping term)
 | 
					#define CHORDAL_HOLD        // Enable chordal hold (mod activates if another key is pressed before tapping term)
 | 
				
			||||||
                            // DISABLED: Conflicts with multi-modifier shortcuts like Ctrl+Shift+P
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Combo configuration
 | 
					// Combo configuration
 | 
				
			||||||
#define CASEMODES_ENABLE
 | 
					#define CASEMODES_ENABLE
 | 
				
			||||||
| 
						 | 
					@ -40,4 +39,3 @@
 | 
				
			||||||
#ifdef OLED_ENABLE
 | 
					#ifdef OLED_ENABLE
 | 
				
			||||||
#define OLED_DISPLAY_128X32
 | 
					#define OLED_DISPLAY_128X32
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue