Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
fauxpark
2022-08-20 10:55:40 +10:00
550 changed files with 1689 additions and 1819 deletions

View File

@@ -16,24 +16,3 @@
#pragma once
#include "quantum.h"
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
L30, L31, L32, L33, L34, L35, L40, R40, R30, R31, R32, R33, R34, R35, \
L41, L42, L43, L44, L45, R41, R42, R43, R44, R45 \
) \
{ \
{ L00, L01, L02, L03, L04, L05 }, \
{ L10, L11, L12, L13, L14, L15 }, \
{ L20, L21, L22, L23, L24, L25 }, \
{ L30, L31, L32, L33, L34, L35 }, \
{ L41, L42, L43, L44, L45, L40 }, \
{ R05, R04, R03, R02, R01, R00 }, \
{ R15, R14, R13, R12, R11, R10 }, \
{ R25, R24, R23, R22, R21, R20 }, \
{ R35, R34, R33, R32, R31, R30 }, \
{ R45, R44, R43, R42, R41, R40 } \
}

View File

@@ -16,13 +16,6 @@
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0x7983
#define PRODUCT_ID 0x4B69 //Ki
#define DEVICE_VER 0x0001
#define MANUFACTURER Keycapsss
#define PRODUCT Kimiko
/* key matrix size */
// rows are doubled-up for split-keyboard
#define MATRIX_ROWS 10

View File

@@ -1,7 +1,13 @@
{
"keyboard_name": "Kimiko",
"manufacturer": "Keycapsss",
"url": "https://keycapsss.com",
"maintainer": "@ben_roe Keycapsss",
"usb": {
"vid": "0x7983",
"pid": "0x4B69",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

View File

@@ -18,11 +18,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x7983
#define PRODUCT_ID 0x5050 // "PP"
#define MANUFACTURER Keycapsss
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 4

View File

@@ -1,7 +1,11 @@
{
"keyboard_name": "Plaid-Pad",
"manufacturer": "Keycapsss",
"url": "https://keycapsss.com/diy-kits/104/plaid-pad-4x4-numpad",
"maintainer": "BenRoe",
"usb": {
"vid": "0x7983",
"pid": "0x5050"
},
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [

View File

@@ -16,10 +16,6 @@
#pragma once
#define PRODUCT Plaid-Pad Rev1
#define DEVICE_VER 0x0001
#define ENCODERS_PAD_A { D1, B2 }
#define ENCODERS_PAD_B { D0, B1 }

View File

@@ -0,0 +1,6 @@
{
"keyboard_name": "Plaid-Pad Rev1",
"usb": {
"device_version": "0.0.1"
}
}

View File

@@ -16,10 +16,6 @@
#pragma once
#define PRODUCT Plaid-Pad Rev2
#define DEVICE_VER 0x0002
#define ENCODERS_PAD_A { D1, B2, B4, D4 }
#define ENCODERS_PAD_B { D0, B1, B3, B5 }

View File

@@ -0,0 +1,6 @@
{
"keyboard_name": "Plaid-Pad Rev2",
"usb": {
"device_version": "0.0.2"
}
}

View File

@@ -16,9 +16,5 @@
#pragma once
#define PRODUCT Plaid-Pad Rev3
#define DEVICE_VER 0x0003
#define ENCODERS_PAD_A { D1, B2, B4, D4 }
#define ENCODERS_PAD_B { D0, B1, B3, B5 }

View File

@@ -0,0 +1,6 @@
{
"keyboard_name": "Plaid-Pad Rev3",
"usb": {
"device_version": "0.0.3"
}
}