Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						06fe4b16d2
					
				
					 327 changed files with 1044 additions and 1192 deletions
				
			
		| 
						 | 
				
			
			@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
/* USB Device descriptor parameter */
 | 
			
		||||
#define VENDOR_ID       0xFEDE //0xFEED
 | 
			
		||||
#define PRODUCT_ID      0x6942 //0x6465
 | 
			
		||||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    xSteins
 | 
			
		||||
#define PRODUCT         ERGOCHEAP
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 5
 | 
			
		||||
#define MATRIX_COLS 15
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,13 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Ergocheap",
 | 
			
		||||
    "manufacturer": "xSteins",
 | 
			
		||||
    "url": "",
 | 
			
		||||
    "maintainer": "xSteins",
 | 
			
		||||
    "usb": {
 | 
			
		||||
        "vid": "0xFEDE",
 | 
			
		||||
        "pid": "0x6942",
 | 
			
		||||
        "device_version": "0.0.1"
 | 
			
		||||
    },
 | 
			
		||||
    "layouts": {
 | 
			
		||||
        "LAYOUT": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue