Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						8c8f4b3c06
					
				| @ -60,7 +60,7 @@ | ||||
|     }, | ||||
|     "encoder": { | ||||
|         "rotary": [ | ||||
|             {"pin_a": "B14", "pin_b": "B13", "resolution": 4} | ||||
|             {"pin_a": "B13", "pin_b": "B14", "resolution": 4} | ||||
|         ] | ||||
|     }, | ||||
|     "qmk": { | ||||
|  | ||||
| @ -64,10 +64,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 
 | ||||
| #if defined(ENCODER_MAP_ENABLE) | ||||
| const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { | ||||
|     [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, | ||||
|     [WIN_FN] = { ENCODER_CCW_CW(RM_SATU, RM_SATD) }, | ||||
|     [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, | ||||
|     [MAC_FN] = { ENCODER_CCW_CW(RM_SATU, RM_SATD) }, | ||||
|     [WIN_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, | ||||
|     [WIN_FN] = { ENCODER_CCW_CW(RM_SATD, RM_SATU) }, | ||||
|     [MAC_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, | ||||
|     [MAC_FN] = { ENCODER_CCW_CW(RM_SATD, RM_SATU) }, | ||||
| }; | ||||
| #endif | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										1
									
								
								keyboards/inland/kb83/keymaps/default/rules.mk
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								keyboards/inland/kb83/keymaps/default/rules.mk
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1 @@ | ||||
| ENCODER_MAP_ENABLE = yes | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user