Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2022-08-02 00:03:44 +00:00
commit 570745cfe6
104 changed files with 346 additions and 370 deletions

View file

@ -17,13 +17,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xABBE
#define PRODUCT_ID 0x4C4D
#define DEVICE_VER 0x0001
#define MANUFACTURER Labbe
#define PRODUCT Labbe Mini V1
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 3

View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Labbe Mini V1",
"manufacturer": "Labbe",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0xABBE",
"pid": "0x4C4D",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_wasd": {
"layout": [{"x":1, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}]

View file

@ -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 0x4F53
#define PRODUCT_ID 0x464B
#define DEVICE_VER 0x0001
#define MANUFACTURER Livi
#define PRODUCT labyrinth75
/* key matrix size */
#define MATRIX_ROWS 9
#define MATRIX_COLS 9

View file

@ -1,7 +1,13 @@
{
"keyboard_name": "labyrinth75",
"manufacturer": "Livi",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x4F53",
"pid": "0x464B",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":5.75, "y":0}, {"label":"F6", "x":6.75, "y":0}, {"label":"F7", "x":7.75, "y":0}, {"label":"F8", "x":8.75, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"PrtSc", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Delete", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Page Up", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Page Down", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"\u2191", "x":14, "y":4.25}, {"label":"End", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25}, {"label":"\u2190", "x":13, "y":5.25}, {"label":"\u2193", "x":14, "y":5.25}, {"label":"\u2192", "x":15, "y":5.25}]

View file

@ -18,11 +18,6 @@
/* USB Device descriptor parameter */
#include "config_common.h"
#define VENDOR_ID 0x7C88 // "hw" = haierwangwei2005
#define PRODUCT_ID 0x7C97 // "lp" = latin17RGB
#define DEVICE_VER 0x0001
#define MANUFACTURER 18438880
#define PRODUCT Latin17RGB
/* key matrix size */
#define MATRIX_ROWS 5

View file

@ -1,7 +1,13 @@
{
"keyboard_name": "latin17rgb",
"keyboard_name": "Latin17RGB",
"manufacturer": "18438880",
"url": "",
"maintainer": "18438880",
"usb": {
"vid": "0x7C88",
"pid": "0x7C97",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [

View file

@ -18,13 +18,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x6C63 // "lc" = latincompass
#define PRODUCT_ID 0x6C62 // "lb" = latin47BLE
#define DEVICE_VER 0x0001
#define MANUFACTURER latincompass
#define PRODUCT Latin47BLE
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12

View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Latin47ble",
"keyboard_name": "Latin47BLE",
"manufacturer": "latincompass",
"url": "",
"maintainer": "latincompass",
"usb": {
"vid": "0x6C63",
"pid": "0x6C62",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_planck_mit": {
"layout": [

View file

@ -17,11 +17,6 @@
/* USB Device descriptor parameter */
#include "config_common.h"
#define VENDOR_ID 0x6C63 // "lc" = latincompass
#define PRODUCT_ID 0x6C69 // "lp" = latin60RGB
#define DEVICE_VER 0x0001
#define MANUFACTURER latincompass
#define PRODUCT Latin60RGB
/* key matrix size */
#define MATRIX_ROWS 5

View file

@ -1,7 +1,13 @@
{
"keyboard_name": "latin60rgb",
"keyboard_name": "Latin60RGB",
"manufacturer": "latincompass",
"url": "",
"maintainer": "latincompass",
"usb": {
"vid": "0x6C63",
"pid": "0x6C69",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_60_latin_hhkb": {
"layout": [

View file

@ -16,11 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
#pragma once
#include "config_common.h"
#define VENDOR_ID 0x6C63 // "lc" = latincompass
#define PRODUCT_ID 0x6C71 // "lp" = latin64BLE
#define DEVICE_VER 0x0001
#define MANUFACTURER latincompass
#define PRODUCT Latin64BLE
/* key matrix size */
#define MATRIX_ROWS 8

View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Latin64ble",
"keyboard_name": "Latin64BLE",
"manufacturer": "latincompass",
"url": "",
"maintainer": "latincompass",
"usb": {
"vid": "0x6C63",
"pid": "0x6C71",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -19,11 +19,6 @@
/* USB Device descriptor parameter */
#include "config_common.h"
#define VENDOR_ID 0x7C88 // "hw" = haierwangwei
#define PRODUCT_ID 0x7C96 // "lp" = latin6RGB
#define DEVICE_VER 0x0001
#define MANUFACTURER 18438880
#define PRODUCT Latin6rgb
/* key matrix size */
#define MATRIX_ROWS 2

View file

@ -1,7 +1,13 @@
{
"keyboard_name": "latin6rgb",
"keyboard_name": "Latin6rgb",
"manufacturer": "18438880",
"url": "",
"maintainer": "18438880",
"usb": {
"vid": "0x7C88",
"pid": "0x7C96",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_numpad_2x3": {
"layout": [

View file

@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
#pragma once
#include "config_common.h"
#define VENDOR_ID 0x6C63 // "lc" = latincompass
#define PRODUCT_ID 0x6C70 // "lp" = latinpad
#define DEVICE_VER 0x0001
#define MANUFACTURER latincompass
#define PRODUCT latinpad
/* key matrix size */
#define MATRIX_ROWS 5

View file

@ -1,7 +1,13 @@
{
"keyboard_name": "latinpad",
"manufacturer": "latincompass",
"url": "https://github.com/latincompass/2-RotaryEncoder-pad",
"maintainer": "latincompass",
"usb": {
"vid": "0x6C63",
"pid": "0x6C70",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {

View file

@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
#pragma once
#include "config_common.h"
#define VENDOR_ID 0x7C88 // "hw" = haierwangwei2005
#define PRODUCT_ID 0x7C98 // "lp" = latinpadble
#define DEVICE_VER 0x0001
#define MANUFACTURER haierwangwei2005
#define PRODUCT latinpadble
// #define NO_ACTION_LAYER
// #define NO_ACTION_TAPPING

View file

@ -1,7 +1,13 @@
{
"keyboard_name": "latinpadble",
"manufacturer": "haierwangwei2005",
"url": "https://github.com/latincompass/2-RotaryEncoder-pad",
"maintainer": "haierwangwei2005",
"usb": {
"vid": "0x7C88",
"pid": "0x7C98",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_pad": {
"layout": [

View file

@ -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 0x4C44 // "LD"
#define PRODUCT_ID 0x0041
#define DEVICE_VER 0x0001
#define MANUFACTURER LAZYDESIGNERS
#define PRODUCT Bolt
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12

View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Bolt",
"manufacturer": "LAZYDESIGNERS",
"url": "http://lazydesigners.cn",
"maintainer": "LAZYDESIGNERS",
"usb": {
"vid": "0x4C44",
"pid": "0x0041",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

Some files were not shown because too many files have changed in this diff Show more