Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						5fb4772323
					
				
					 5 changed files with 7 additions and 9 deletions
				
			
		| 
						 | 
				
			
			@ -25,6 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define PRODUCT_ID      0x0001
 | 
			
		||||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    foostan
 | 
			
		||||
#define PRODUCT         Corne
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
// Rows are doubled-up
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#define PRODUCT         Corne Keyboard Rev.1 (Split Common)
 | 
			
		||||
 | 
			
		||||
#define USE_SERIAL
 | 
			
		||||
#define SOFT_SERIAL_PIN D2
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,4 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
 | 
			
		||||
#include "serial_config.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT         Corne Keyboard Rev.1 (Legacy Split)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,10 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#pragma once
 | 
			
		||||
 | 
			
		||||
/* USB Device descriptor parameter */
 | 
			
		||||
#define VENDOR_ID       0xFEED
 | 
			
		||||
#define PRODUCT_ID      0x9991
 | 
			
		||||
#define VENDOR_ID       0x04D8
 | 
			
		||||
#define PRODUCT_ID      0xEA3B
 | 
			
		||||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    monksoffunk
 | 
			
		||||
#define MANUFACTURER    25KEYS
 | 
			
		||||
#define PRODUCT         zinc rev.1
 | 
			
		||||
 | 
			
		||||
#define TAPPING_FORCE_HOLD
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,10 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#pragma once
 | 
			
		||||
 | 
			
		||||
/* USB Device descriptor parameter */
 | 
			
		||||
#define VENDOR_ID       0xFEED
 | 
			
		||||
#define PRODUCT_ID      0x9991
 | 
			
		||||
#define VENDOR_ID       0x04D8
 | 
			
		||||
#define PRODUCT_ID      0xEA3B
 | 
			
		||||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    monksoffunk
 | 
			
		||||
#define MANUFACTURER    25KEYS
 | 
			
		||||
#define PRODUCT         zinc rev.A
 | 
			
		||||
 | 
			
		||||
#define TAPPING_FORCE_HOLD
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue