Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						c202602938
					
				
					 170 changed files with 508 additions and 750 deletions
				
			
		| 
						 | 
				
			
			@ -18,13 +18,6 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
/* USB Device descriptor parameter */
 | 
			
		||||
#define DEVICE_VER 0x0001
 | 
			
		||||
#define VENDOR_ID 0x320F
 | 
			
		||||
#define PRODUCT_ID 0x5044
 | 
			
		||||
#define MANUFACTURER Glorious
 | 
			
		||||
#define PRODUCT GMMK Pro
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 11
 | 
			
		||||
#define MATRIX_COLS 8
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,13 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "GMMK Pro (ANSI)",
 | 
			
		||||
    "keyboard_name": "GMMK Pro ANSI",
 | 
			
		||||
    "manufacturer": "Glorious",
 | 
			
		||||
    "url": "https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black-reservation",
 | 
			
		||||
    "maintainer": "GloriousThrall",
 | 
			
		||||
    "usb": {
 | 
			
		||||
        "vid": "0x320F",
 | 
			
		||||
        "pid": "0x5044",
 | 
			
		||||
        "device_version": "0.0.1"
 | 
			
		||||
    },
 | 
			
		||||
    "layouts": {
 | 
			
		||||
        "LAYOUT": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,13 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "GMMK Pro (ISO)",
 | 
			
		||||
    "keyboard_name": "GMMK Pro ISO",
 | 
			
		||||
    "manufacturer": "Glorious",
 | 
			
		||||
    "url": "https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black-reservation",
 | 
			
		||||
    "maintainer": "GloriousThrall",
 | 
			
		||||
    "usb": {
 | 
			
		||||
        "vid": "0x320F",
 | 
			
		||||
        "pid": "0x5044",
 | 
			
		||||
        "device_version": "0.0.1"
 | 
			
		||||
    },
 | 
			
		||||
    "layouts": {
 | 
			
		||||
        "LAYOUT": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue