Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						9e18f41fcf
					
				
					 285 changed files with 52 additions and 332 deletions
				
			
		| 
						 | 
				
			
			@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    John M Daly
 | 
			
		||||
#define PRODUCT         CO60
 | 
			
		||||
#define DESCRIPTION     An open hardware sixty percent PCB
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,7 +24,6 @@
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    John M Daly
 | 
			
		||||
#define PRODUCT         CO60 rev6
 | 
			
		||||
#define DESCRIPTION     An open hardware sixty percent PCB
 | 
			
		||||
 | 
			
		||||
/* Address for jumping to bootloader on STM32 chips. */
 | 
			
		||||
/* It is chip dependent, the correct number can be looked up here:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER	0x0001
 | 
			
		||||
#define MANUFACTURER    John M Daly
 | 
			
		||||
#define PRODUCT         CO60 rev7
 | 
			
		||||
#define DESCRIPTION     An open hardware sixty percent PCB
 | 
			
		||||
 | 
			
		||||
/* Address for jumping to bootloader on STM32 chips. */
 | 
			
		||||
/* It is chip dependent, the correct number can be looked up here:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue