mkbd65/qmk-firmware
Watch
1
0
Fork
You've already forked qmk-firmware
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2022-08-03 07:24:30 +00:00
commit 663c4c7848
184 changed files with 581 additions and 680 deletions
Download patch file Download diff file Expand all files Collapse all files

6
keyboards/p3d/glitch/config.h
View file

@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define VENDOR_ID 0x7033
#define PRODUCT_ID 0x3568
#define DEVICE_VER 0x0001
#define MANUFACTURER P3D Store
#define PRODUCT Glitch
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 8

6
keyboards/p3d/glitch/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Glitch",
"manufacturer": "P3D Store",
"url": "https://p3dstore.com/products/p3d-glitch-group-buy",
"maintainer": "matthewdias",
"usb": {
"vid": "0x7033",
"pid": "0x3568",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [{

7
keyboards/pabile/p18/config.h
View file

@ -20,13 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x6666
#define PRODUCT_ID 0x6668
#define DEVICE_VER 0x0001
#define MANUFACTURER Pabile
#define PRODUCT P18 Macro Pad
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 5

8
keyboards/pabile/p18/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Pabile 18",
"keyboard_name": "P18 Macro Pad",
"manufacturer": "Pabile",
"url": "https://pabileonline.blogspot.com/",
"maintainer": "Pabile",
"usb": {
"vid": "0x6666",
"pid": "0x6668",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/pabile/p40/config.h
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 0x6666
#define PRODUCT_ID 0x6666
#define DEVICE_VER 0x0001
#define MANUFACTURER Pabile
#define PRODUCT P40 Keyboard
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 10

8
keyboards/pabile/p40/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Pabile 40",
"keyboard_name": "P40",
"manufacturer": "Pabile",
"url": "https://pabileonline.blogspot.com/",
"maintainer": "Pabile",
"usb": {
"vid": "0x6666",
"pid": "0x6666",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_ortho_4x10": {
"layout": [

7
keyboards/pabile/p40_ortho/config.h
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 0x6666
#define PRODUCT_ID 0x6669
#define DEVICE_VER 0x0001
#define MANUFACTURER Pabile
#define PRODUCT P40 Ortho Keyboard
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 10

7
keyboards/pabile/p40_ortho/info.json
View file

@ -1,5 +1,12 @@
{
"keyboard_name": "P40 Ortho",
"manufacturer": "Pabile",
"maintainer": "qmk",
"usb": {
"vid": "0x6666",
"pid": "0x6669",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_ortho_4x10": {
"layout": [

7
keyboards/pabile/p42/config.h
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 0x6666
#define PRODUCT_ID 0x6670
#define DEVICE_VER 0x0001
#define MANUFACTURER Pabile
#define PRODUCT P42 Keyboard
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 11

6
keyboards/pabile/p42/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "P42",
"manufacturer": "Pabile",
"url": "https://pabileonline.blogspot.com/",
"maintainer": "Pabile",
"usb": {
"vid": "0x6666",
"pid": "0x6670",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/palette1202/config.h
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 0xFEED
#define PRODUCT_ID 0x1202
#define DEVICE_VER 0x0001
#define MANUFACTURER niltea
#define PRODUCT Palette1202
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 5

6
keyboards/palette1202/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Palette1202",
"manufacturer": "niltea",
"url": "https://github.com/niltea/Palette1202",
"maintainer": "niltea",
"usb": {
"vid": "0xFEED",
"pid": "0x1202",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/panc40/config.h
View file

@ -2,13 +2,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6060
#define DEVICE_VER 0x0001
#define MANUFACTURER Panc Interactive
#define PRODUCT Panc40
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12

6
keyboards/panc40/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Panc40",
"manufacturer": "Panc Interactive",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0xFEED",
"pid": "0x6060",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [

6
keyboards/panc60/config.h
View file

@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define VENDOR_ID 0x20A0
#define PRODUCT_ID 0x422D
#define DEVICE_VER 0x0200
#define MANUFACTURER Panc Interactive
#define PRODUCT Panc60
#define RGBLED_NUM 12
#define MATRIX_ROWS 5

8
keyboards/panc60/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "panc60",
"keyboard_name": "Panc60",
"manufacturer": "Panc Interactive",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x20A0",
"pid": "0x422D",
"device_version": "2.0.0"
},
"layouts": {
"LAYOUT_all": {
"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":6, "y":0}, {"x":7, "y":0}, {"x":8, "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, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"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":6, "y":3}, {"x":7, "y":3}, {"x":8, "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":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]

7
keyboards/papercranekeyboards/gerald65/config.h
View file

@ -5,13 +5,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x5012 //
#define PRODUCT_ID 0x1501 // '21 keyboard 1
#define DEVICE_VER 0x0001
#define MANUFACTURER PaperCraneKeyboards
#define PRODUCT gerald65
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15

6
keyboards/papercranekeyboards/gerald65/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "gerald65",
"manufacturer": "PaperCraneKeyboards",
"url": "",
"maintainer": "PaperCraneKeyboards",
"usb": {
"vid": "0x5012",
"pid": "0x1501",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/paprikman/albacore/config.h
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 0x736D
#define PRODUCT_ID 0x000A
#define DEVICE_VER 0x0001
#define MANUFACTURER paprikman
#define PRODUCT Albacore
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 4

6
keyboards/paprikman/albacore/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Albacore",
"manufacturer": "paprikman",
"url": "https://github.com/paprikman/qmk_firmware/tree/master/keyboards/paprikman/albacore",
"maintainer": "paprikman",
"usb": {
"vid": "0x736D",
"pid": "0x000A",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

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