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    KBDFans
 | 
			
		||||
#define PRODUCT         kbd19x
 | 
			
		||||
#define DESCRIPTION     A compact-1800 keyboard kit.
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 8
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    KBDFans
 | 
			
		||||
#define PRODUCT         KBD4x
 | 
			
		||||
#define DESCRIPTION     A compact 40% (12x4) ortholinear keyboard kit.
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 4
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    KBDFans
 | 
			
		||||
#define PRODUCT         KBD66
 | 
			
		||||
#define DESCRIPTION     QMK keyboard firmware for KBD66
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    KBDFans
 | 
			
		||||
#define PRODUCT         KBD67 Hotswap
 | 
			
		||||
#define DESCRIPTION     A custom 65% keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    KBDfans
 | 
			
		||||
#define PRODUCT         KBD67-MKII
 | 
			
		||||
#define DESCRIPTION     65% Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,6 @@
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    KBDfans
 | 
			
		||||
#define PRODUCT         kbd67mkiirgb v1
 | 
			
		||||
#define DESCRIPTION     kbd67mkii rgb keyboard
 | 
			
		||||
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
#define MATRIX_COLS 15
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,6 @@
 | 
			
		|||
#define DEVICE_VER      0x0002
 | 
			
		||||
#define MANUFACTURER    KBDfans
 | 
			
		||||
#define PRODUCT         kbd67mkiirgb v2
 | 
			
		||||
#define DESCRIPTION     kbd67mkii rgb keyboard
 | 
			
		||||
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
#define MATRIX_COLS 15
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    kbdfans
 | 
			
		||||
#define PRODUCT         kbd67
 | 
			
		||||
#define DESCRIPTION     65% Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0002
 | 
			
		||||
#define MANUFACTURER    KBDFans
 | 
			
		||||
#define PRODUCT         KBD67v2
 | 
			
		||||
#define DESCRIPTION     65% Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,11 +2,9 @@
 | 
			
		|||
 | 
			
		||||
#undef MANUFACTURER
 | 
			
		||||
#undef PRODUCT
 | 
			
		||||
#undef DESCRIPTION
 | 
			
		||||
 | 
			
		||||
#define MANUFACTURER    Potato Inc.
 | 
			
		||||
#define PRODUCT         Qt3.14
 | 
			
		||||
#define DESCRIPTION     Look, a keyboard!
 | 
			
		||||
 | 
			
		||||
/* send tap key if no layer key was used even after tap delay */
 | 
			
		||||
#define TAPPING_TERM 50
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    You
 | 
			
		||||
#define PRODUCT         kbd6x
 | 
			
		||||
#define DESCRIPTION     Dual USB-C Tsangan Hot Swap PCB
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,7 +6,6 @@
 | 
			
		|||
#define VENDOR_ID       0x4B42
 | 
			
		||||
#define MANUFACTURER    qmkbuilder
 | 
			
		||||
#define PRODUCT         KBD75
 | 
			
		||||
#define DESCRIPTION     QMK keyboard firmware for KBD75
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 6
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,11 +2,9 @@
 | 
			
		|||
 | 
			
		||||
#undef MANUFACTURER
 | 
			
		||||
#undef PRODUCT
 | 
			
		||||
#undef DESCRIPTION
 | 
			
		||||
 | 
			
		||||
#define MANUFACTURER    Potato Inc.
 | 
			
		||||
#define PRODUCT         Qt3.14
 | 
			
		||||
#define DESCRIPTION     Look, a keyboard!
 | 
			
		||||
 | 
			
		||||
/* send tap key if no layer key was used even after tap delay */
 | 
			
		||||
#define TAPPING_TERM 250
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    KBDFans
 | 
			
		||||
#define PRODUCT         kbd8x
 | 
			
		||||
#define DESCRIPTION     Custom TKL Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 6
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    KBDfans
 | 
			
		||||
#define PRODUCT         KBD8X-MKII
 | 
			
		||||
#define DESCRIPTION     TKL Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 12
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,7 +9,6 @@
 | 
			
		|||
#define MANUFACTURER    DZTECH
 | 
			
		||||
 | 
			
		||||
#define PRODUCT         KBDMINI
 | 
			
		||||
#define DESCRIPTION     KBDMINI RGB keyboard
 | 
			
		||||
#define MATRIX_ROWS 4
 | 
			
		||||
#define MATRIX_COLS 13
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    KBDfans
 | 
			
		||||
#define PRODUCT         KBDPAD-MKII
 | 
			
		||||
#define DESCRIPTION     Numpad
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 6
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,7 +7,6 @@
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    KBDFANS
 | 
			
		||||
#define PRODUCT         MAJA
 | 
			
		||||
#define DESCRIPTION     MAJA RGB keyboard
 | 
			
		||||
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
#define MATRIX_COLS 15
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue