Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						eceed6c50b
					
				
					 121 changed files with 309 additions and 293 deletions
				
			
		| 
						 | 
				
			
			@ -18,8 +18,6 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey Blackpill STM32F401
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { B0 }
 | 
			
		||||
#define MATRIX_ROW_PINS { A7 }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/blackpill_f401/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/blackpill_f401/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Blackpill STM32F401"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -18,8 +18,6 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey Blackpill STM32F411
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { B0 }
 | 
			
		||||
#define MATRIX_ROW_PINS { A7 }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/blackpill_f411/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/blackpill_f411/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Blackpill STM32F411"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -18,8 +18,6 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey Blackpill STM32F411 TinyUF2
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { B0 }
 | 
			
		||||
#define MATRIX_ROW_PINS { A7 }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -18,8 +18,6 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey Bluepill STM32F103
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { B0 }
 | 
			
		||||
#define MATRIX_ROW_PINS { A7 }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/bluepill/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/bluepill/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Bluepill STM32F103"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
/* USB Device descriptor parameter */
 | 
			
		||||
#define VENDOR_ID    0xFEED
 | 
			
		||||
#define PRODUCT_ID   0x6465
 | 
			
		||||
#define DEVICE_VER   0x0001
 | 
			
		||||
#define MANUFACTURER QMK
 | 
			
		||||
 | 
			
		||||
/* key matrix size */
 | 
			
		||||
#define MATRIX_ROWS 1
 | 
			
		||||
#define MATRIX_COLS 1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,8 +18,6 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey Elite-C
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { F4 }
 | 
			
		||||
#define MATRIX_ROW_PINS { F5 }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/elite_c/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/elite_c/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Elite-C"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -4,7 +4,5 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey WB32F3G71
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { B12 }
 | 
			
		||||
#define MATRIX_ROW_PINS { B13 }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/evb_wb32f3g71/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/evb_wb32f3g71/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey WB32F3G71 Eval"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -4,7 +4,5 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey WB32FQ95
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { B12 }
 | 
			
		||||
#define MATRIX_ROW_PINS { B13 }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/evb_wb32fq95/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/evb_wb32fq95/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey WB32FQ95 Eval"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -1,7 +1,12 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "onekey handwired",
 | 
			
		||||
    "manufacturer": "QMK",
 | 
			
		||||
    "url": "",
 | 
			
		||||
    "maintainer": "qmk",
 | 
			
		||||
    "usb": {
 | 
			
		||||
        "vid": "0xFEED",
 | 
			
		||||
        "pid": "0x6465",
 | 
			
		||||
        "device_version": "0.0.1"
 | 
			
		||||
    },
 | 
			
		||||
    "layouts": {
 | 
			
		||||
        "LAYOUT_ortho_1x1": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,8 +4,6 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey L432KC
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { A2 }
 | 
			
		||||
#define MATRIX_ROW_PINS { A1 }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/nucleo_l432kc/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/nucleo_l432kc/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Nucleo L432KC"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -18,8 +18,6 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey Pro Micro
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { F4 }
 | 
			
		||||
#define MATRIX_ROW_PINS { F5 }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/promicro/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/promicro/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Pro Micro"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -18,8 +18,6 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey Proton-C
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { A2 }
 | 
			
		||||
#define MATRIX_ROW_PINS { A1 }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/proton_c/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/proton_c/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Proton-C"
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/sipeed_longan_nano/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/sipeed_longan_nano/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Sipeed Longan Nano"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -18,8 +18,6 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey STM32F072 Discovery
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { B4 }
 | 
			
		||||
#define MATRIX_ROW_PINS { B5 }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/stm32f0_disco/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/stm32f0_disco/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey STM32F072 Discovery"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -18,7 +18,5 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey Adafruit Feather STM32F405
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { C2 }
 | 
			
		||||
#define MATRIX_ROW_PINS { C3 }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/stm32f405_feather/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/stm32f405_feather/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Adafruit Feather STM32F405"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -18,8 +18,6 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey Teensy 2.0
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { F4 }
 | 
			
		||||
#define MATRIX_ROW_PINS { F5 }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/teensy_2/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/teensy_2/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Teensy 2.0"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -18,8 +18,6 @@
 | 
			
		|||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey Teensy 2++
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { F4 }
 | 
			
		||||
#define MATRIX_ROW_PINS { F5 }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/teensy_2pp/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/teensy_2pp/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Teensy 2.0++"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -19,8 +19,6 @@
 | 
			
		|||
// TODO: including this causes "error: expected identifier before '(' token" errors
 | 
			
		||||
//#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey Teensy 3.2
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { D5 }
 | 
			
		||||
#define MATRIX_ROW_PINS { B2 }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/teensy_32/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/teensy_32/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Teensy 3.2"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -19,8 +19,6 @@
 | 
			
		|||
// TODO: including this causes "error: expected identifier before '(' token" errors
 | 
			
		||||
//#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define PRODUCT Onekey Teensy LC
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { D5 }
 | 
			
		||||
#define MATRIX_ROW_PINS { B2 }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								keyboards/handwired/onekey/teensy_lc/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/handwired/onekey/teensy_lc/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Onekey Teensy LC"
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue