Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
QMK Bot
commit
ca69c7ce3b
121 changed files with 309 additions and 293 deletions
|
|
@ -18,13 +18,6 @@
|
|||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0xFEED
|
||||
#define PRODUCT_ID 0xDAD3
|
||||
#define DEVICE_VER 0x0100
|
||||
#define MANUFACTURER GhostSeven
|
||||
#define PRODUCT Bento Macropad Rev. 1
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 2
|
||||
#define MATRIX_COLS 3
|
||||
|
|
|
|||
23
keyboards/handwired/bento/rev1/info.json
Normal file
23
keyboards/handwired/bento/rev1/info.json
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{
|
||||
"keyboard_name": "Bento Macropad Rev. 1",
|
||||
"manufacturer": "GhostSeven",
|
||||
"url": "https://www.thingiverse.com/thing:4416966",
|
||||
"maintainer": "Ghostseven",
|
||||
"usb": {
|
||||
"vid": "0xFEED",
|
||||
"pid": "0xDAD3",
|
||||
"device_version": "1.0.0"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"x":0, "y":0},
|
||||
{"x":1, "y":0},
|
||||
{"x":2, "y":0},
|
||||
{"x":0, "y":1},
|
||||
{"x":1, "y":1},
|
||||
{"x":2, "y":1}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,11 @@
|
|||
{
|
||||
"keyboard_name": "CO60",
|
||||
"manufacturer": "John M Daly",
|
||||
"url": "https://github.com/jmdaly/CO60",
|
||||
"maintainer": "qmk",
|
||||
"usb": {
|
||||
"vid": "0xFEED",
|
||||
"pid": "0x0000"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT_all": {
|
||||
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"LSpace", "x":3.75, "y":4, "w":2.25}, {"label":"Fn", "x":6, "y":4, "w":1.25}, {"label":"RSpace", "x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1}, {"label":"Win", "x":11, "y":4, "w":1}, {"label":"Menu", "x":12, "y":4, "w":1}, {"label":"Ctrl", "x":13, "y":4, "w":1}, {"label":"Fn", "x":14, "y":4, "w":1}]
|
||||
|
|
|
|||
|
|
@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0xFEED
|
||||
#define PRODUCT_ID 0x0000
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER John M Daly
|
||||
#define PRODUCT CO60
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 5
|
||||
#define MATRIX_COLS 15
|
||||
|
|
|
|||
6
keyboards/handwired/co60/rev1/info.json
Normal file
6
keyboards/handwired/co60/rev1/info.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"keyboard_name": "CO60 rev 1",
|
||||
"usb": {
|
||||
"device_version": "1.0.0"
|
||||
}
|
||||
}
|
||||
|
|
@ -18,13 +18,6 @@
|
|||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0xFEED
|
||||
#define PRODUCT_ID 0x0000
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER John M Daly
|
||||
#define PRODUCT CO60 rev6
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 5
|
||||
#define MATRIX_COLS 15
|
||||
|
|
|
|||
6
keyboards/handwired/co60/rev6/info.json
Normal file
6
keyboards/handwired/co60/rev6/info.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"keyboard_name": "CO60 rev 6",
|
||||
"usb": {
|
||||
"device_version": "6.0.0"
|
||||
}
|
||||
}
|
||||
|
|
@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0xFEED
|
||||
#define PRODUCT_ID 0x0000
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER John M Daly
|
||||
#define PRODUCT CO60 rev7
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 5
|
||||
#define MATRIX_COLS 15
|
||||
|
|
|
|||
6
keyboards/handwired/co60/rev7/info.json
Normal file
6
keyboards/handwired/co60/rev7/info.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"keyboard_name": "CO60 rev 7",
|
||||
"usb": {
|
||||
"device_version": "7.0.0"
|
||||
}
|
||||
}
|
||||
|
|
@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#include "config_common.h"
|
||||
|
||||
#define PRODUCT_ID 0x3536
|
||||
#define DEVICE_VER 0x0003
|
||||
#ifdef MANUFACTURER
|
||||
#undef MANUFACTURER
|
||||
#endif
|
||||
#define MANUFACTURER DLFord
|
||||
#define PRODUCT Dactyl Minidox (3x5+3)
|
||||
|
||||
// Communication
|
||||
// #define USE_I2C
|
||||
#define USE_SERIAL
|
||||
|
|
|
|||
|
|
@ -1,7 +1,13 @@
|
|||
{
|
||||
"keyboard_name": "Dactyl Manuform 3x5_3",
|
||||
"keyboard_name": "Dactyl Minidox (3x5+3)",
|
||||
"manufacturer": "DLFord",
|
||||
"url": "https://www.dlford.io/keyboard-build-guide-per-key-rgb-leds/",
|
||||
"maintainer": "dlford",
|
||||
"usb": {
|
||||
"vid": "0x444D",
|
||||
"pid": "0x3536",
|
||||
"device_version": "0.0.3"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT_split_3x5_3": {
|
||||
"layout": [
|
||||
|
|
|
|||
|
|
@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define PRODUCT_ID 0x3435
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER tshort
|
||||
|
||||
/* key matrix size */
|
||||
// Rows are doubled-up
|
||||
#define MATRIX_ROWS 10
|
||||
|
|
|
|||
|
|
@ -1,7 +1,13 @@
|
|||
{
|
||||
"keyboard_name": "Dactyl Manuform 4x5",
|
||||
"manufacturer": "tshort",
|
||||
"url": "",
|
||||
"maintainer": "qmk",
|
||||
"usb": {
|
||||
"vid": "0x444D",
|
||||
"pid": "0x3435",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
|
|
|||
|
|
@ -5,15 +5,6 @@
|
|||
|
||||
#include "config_common.h"
|
||||
|
||||
|
||||
/* USB Device descriptor parameters */
|
||||
#define PRODUCT_ID 0x3435
|
||||
#define DEVICE_VER 0x0001
|
||||
|
||||
#ifndef MANUFACTURER
|
||||
#define MANUFACTURER ssedrick
|
||||
#endif
|
||||
|
||||
#define MATRIX_ROWS 10
|
||||
#define MATRIX_COLUMNS 5
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,13 @@
|
|||
{
|
||||
"keyboard_name": "Dactyl Manuform 4x5 5 thumb keys",
|
||||
"manufacturer": "ssedrick",
|
||||
"url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/dactyl_manuform/4x5_5",
|
||||
"maintainer": "ssedrick",
|
||||
"usb": {
|
||||
"vid": "0x444D",
|
||||
"pid": "0x3435",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
|
|
|||
|
|
@ -20,10 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define PRODUCT_ID 0x3436
|
||||
#define DEVICE_VER 0x0001
|
||||
|
||||
/* key matrix size */
|
||||
// Rows are doubled-up
|
||||
#define MATRIX_ROWS 10
|
||||
|
|
|
|||
|
|
@ -1,7 +1,13 @@
|
|||
{
|
||||
"keyboard_name": "Dactyl Manuform 4x6",
|
||||
"manufacturer": "tshort",
|
||||
"url": "",
|
||||
"maintainer": "qmk",
|
||||
"usb": {
|
||||
"vid": "0x444D",
|
||||
"pid": "0x3436",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
|
|
|||
|
|
@ -20,10 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define PRODUCT_ID 0x3436
|
||||
#define DEVICE_VER 0x0001
|
||||
|
||||
/* key matrix size */
|
||||
// Rows are doubled-up
|
||||
#define MATRIX_ROWS 10
|
||||
|
|
|
|||
|
|
@ -1,7 +1,13 @@
|
|||
{
|
||||
"keyboard_name": "Dactyl Manuform 4x6 5 thumb keys",
|
||||
"manufacturer": "tshort",
|
||||
"url": "",
|
||||
"maintainer": "qmk",
|
||||
"usb": {
|
||||
"vid": "0x444D",
|
||||
"pid": "0x3436",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
|
|
|||
|
|
@ -20,10 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#include "config_common.h"
|
||||
|
||||
#define PRODUCT_ID 0x3536
|
||||
#define DEVICE_VER 0x0001
|
||||
#define PRODUCT Dactyl-Manuform (5x6)
|
||||
|
||||
/* key matrix size */
|
||||
// Rows are doubled-up
|
||||
#define MATRIX_ROWS 12
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue