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,7 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#pragma once
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
#define VENDOR_ID 0x9906
|
||||
#define PRODUCT_ID 0x0013
|
||||
#define MANUFACTURER dELIKEEb
|
||||
|
|
|
@ -1,7 +1,11 @@
|
|||
{
|
||||
"keyboard_name": "vanana",
|
||||
"manufacturer": "dELIKEEb",
|
||||
"url": "",
|
||||
"maintainer": "noclew",
|
||||
"usb": {
|
||||
"vid": "0x9906",
|
||||
"pid": "0x0013"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.5}, {"x":8.25, "y":4, "w":1.5}, {"x":9.75, "y":4, "w":1.25}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
|
||||
|
|
|
@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#pragma once
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define DEVICE_VER 0x0001
|
||||
#define PRODUCT Vanana rev1
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 5
|
||||
#define MATRIX_COLS 12
|
||||
|
|
6
keyboards/delikeeb/vanana/rev1/info.json
Normal file
6
keyboards/delikeeb/vanana/rev1/info.json
Normal file
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"keyboard_name": "Vanana rev1",
|
||||
"usb": {
|
||||
"device_version": "0.0.1"
|
||||
}
|
||||
}
|
|
@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#pragma once
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define DEVICE_VER 0x0002
|
||||
#define PRODUCT Vanana rev2
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 6
|
||||
#define MATRIX_COLS 10
|
||||
|
|
6
keyboards/delikeeb/vanana/rev2/info.json
Normal file
6
keyboards/delikeeb/vanana/rev2/info.json
Normal file
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"keyboard_name": "Vanana rev2",
|
||||
"usb": {
|
||||
"device_version": "0.0.2"
|
||||
}
|
||||
}
|
|
@ -18,7 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#pragma once
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
#define VENDOR_ID 0x9906
|
||||
#define PRODUCT_ID 0x0012
|
||||
#define MANUFACTURER dELIKEEb
|
||||
|
|
|
@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#pragma once
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define DEVICE_VER 0x0003
|
||||
#define PRODUCT Waaffle_rev3
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 8
|
||||
#define MATRIX_COLS 10
|
||||
|
|
|
@ -1,7 +1,13 @@
|
|||
{
|
||||
"keyboard_name": "waaffle",
|
||||
"keyboard_name": "Waaffle rev3",
|
||||
"manufacturer": "dELIKEEb",
|
||||
"url": "",
|
||||
"maintainer": "noclew",
|
||||
"usb": {
|
||||
"vid": "0x9906",
|
||||
"pid": "0x0012",
|
||||
"device_version": "0.0.3"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT_ortho_5x16": {
|
||||
"layout":
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue