Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						ca7da3866d
					
				
					 162 changed files with 980 additions and 180 deletions
				
			
		| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT AN-C
 | 
			
		||||
#define DESCRIPTION AN-C Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT Atlas
 | 
			
		||||
#define DESCRIPTION Atlas Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT Chimera65
 | 
			
		||||
#define DESCRIPTION Chimera65 Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT DB60
 | 
			
		||||
#define DESCRIPTION DB60 Keyboard
 | 
			
		||||
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
#define MATRIX_COLS 15
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT DevastatingTKL
 | 
			
		||||
#define DESCRIPTION Devastating Keyboard
 | 
			
		||||
 | 
			
		||||
#define MATRIX_ROWS 6
 | 
			
		||||
#define MATRIX_COLS 18
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT Instant60
 | 
			
		||||
#define DESCRIPTION Instant 60 Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER SmithAndRune
 | 
			
		||||
#define PRODUCT Iron165
 | 
			
		||||
#define DESCRIPTION Iron165 Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT Obliterated75
 | 
			
		||||
#define DESCRIPTION Obliterated75 Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 6
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER QMK
 | 
			
		||||
#define PRODUCT Ortho48
 | 
			
		||||
#define DESCRIPTION Ortho48
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 4
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER QMK
 | 
			
		||||
#define PRODUCT Ortho60
 | 
			
		||||
#define DESCRIPTION Ortho60
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT Ortho75
 | 
			
		||||
#define DESCRIPTION Ortho75
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT Practice 60
 | 
			
		||||
#define DESCRIPTION Practice 60
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT Practice 65
 | 
			
		||||
#define DESCRIPTION Practice 65
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT Rekt1800
 | 
			
		||||
#define DESCRIPTION Rekt1800 Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 6
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT Satisfaction75
 | 
			
		||||
#define DESCRIPTION Satisfaction 75 Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 6
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT Savage65
 | 
			
		||||
#define DESCRIPTION Savage65 Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER CannonKeys
 | 
			
		||||
#define PRODUCT TMOv2
 | 
			
		||||
#define DESCRIPTION TMOv2 Keyboard
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 4
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue