Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						7cc18f2b11
					
				| @ -16,9 +16,6 @@ | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| /* DIP switch */ | ||||
| #define DIP_SWITCH_PINS { D2 } | ||||
| 
 | ||||
| /* Increase I2C speed to 1000 KHz */ | ||||
| #define I2C1_CLOCK_SPEED 400000 | ||||
| #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 | ||||
|  | ||||
| @ -20,6 +20,9 @@ | ||||
|     "indicators": { | ||||
|         "caps_lock": "C9" | ||||
|     }, | ||||
|     "dip_switch": { | ||||
|         "pins": ["D2"] | ||||
|     }, | ||||
|     "matrix_pins": { | ||||
|         "cols": ["A0", "A1", "A2", "A3", "C0", "C1", "C2", "C3", "A8", "C12", "B9", "C6", "C7", "C4", "C5", "A15", "B10"], | ||||
|         "rows": ["B0", "B1", "B8", "B3", "B4", "B5"] | ||||
|  | ||||
| @ -16,9 +16,6 @@ | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| /* DIP switch */ | ||||
| #define DIP_SWITCH_PINS { D2 } | ||||
| 
 | ||||
| /* Indication led */ | ||||
| #define LED_MAC_OS_PIN C10 | ||||
| #define LED_WIN_OS_PIN C11 | ||||
|  | ||||
| @ -30,6 +30,9 @@ | ||||
|         "caps_lock": "C9", | ||||
|         "num_lock": "C8" | ||||
|     }, | ||||
|     "dip_switch": { | ||||
|         "pins": ["D2"] | ||||
|     }, | ||||
|     "layouts": { | ||||
|         "LAYOUT_104_ansi": { | ||||
|             "layout": [ | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user