Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						c202602938
					
				
					 170 changed files with 508 additions and 750 deletions
				
			
		| 
						 | 
				
			
			@ -17,9 +17,6 @@
 | 
			
		|||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
/* USB Device descriptor parameter */
 | 
			
		||||
#define DEVICE_VER 0x0003
 | 
			
		||||
 | 
			
		||||
#undef MATRIX_ROWS
 | 
			
		||||
#undef MATRIX_COLS
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										5
									
								
								keyboards/hadron/ver3/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								keyboards/hadron/ver3/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,5 @@
 | 
			
		|||
{
 | 
			
		||||
    "usb": {
 | 
			
		||||
        "device_version": "0.0.3"
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue