Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						ca7da3866d
					
				
					 162 changed files with 980 additions and 180 deletions
				
			
		| 
						 | 
				
			
			@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    ckeys_handwire
 | 
			
		||||
#define PRODUCT         ckeys_handwire
 | 
			
		||||
#define DESCRIPTION     4x4 handwire workshop board
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 4
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    cKeys
 | 
			
		||||
#define PRODUCT         naKey
 | 
			
		||||
#define DESCRIPTION     The cKeys through hole ten key pad
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    You
 | 
			
		||||
#define PRODUCT         obelus
 | 
			
		||||
#define DESCRIPTION     4x4 QMK test platform
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 4
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,7 +24,6 @@
 | 
			
		|||
#define DEVICE_VER 0x0001
 | 
			
		||||
#define MANUFACTURER ckeys
 | 
			
		||||
#define PRODUCT thedora
 | 
			
		||||
#define DESCRIPTION A board for keyboard exploration.
 | 
			
		||||
 | 
			
		||||
#define ENCODERS_PAD_A { B13 }
 | 
			
		||||
#define ENCODERS_PAD_B { B15 }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER 0x0001
 | 
			
		||||
#define MANUFACTURER merlin04
 | 
			
		||||
#define PRODUCT Washington Macropad
 | 
			
		||||
#define DESCRIPTION Washington State shaped macropad
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 3
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue