Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move keyboard USB IDs and strings to data driven, pass 2: P-R #18091

Merged
merged 1 commit into from
Aug 20, 2022
Merged

Move keyboard USB IDs and strings to data driven, pass 2: P-R #18091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion keyboards/pabile/p20/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"keyboard_name": "P20",
"manufacturer": "Pabile",
"url": "",
"maintainer": "pabile",
"usb": {
"vid": "0x6666",
"pid": "0x6667"
},
"layouts": {
"LAYOUT_ortho_5x4": {
"layout": [
Expand Down
7 changes: 0 additions & 7 deletions keyboards/pabile/p20/ver1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 0x6667
#define DEVICE_VER 0x0001
#define MANUFACTURER Pabile
#define PRODUCT P20 ver1

/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 4
Expand Down
6 changes: 6 additions & 0 deletions keyboards/pabile/p20/ver1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"keyboard_name": "P20 ver1",
"usb": {
"device_version": "0.0.1"
}
}
7 changes: 0 additions & 7 deletions keyboards/pabile/p20/ver2/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 0x6667
#define DEVICE_VER 0x0002
#define MANUFACTURER Pabile
#define PRODUCT P20 ver2

/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 4
Expand Down
6 changes: 6 additions & 0 deletions keyboards/pabile/p20/ver2/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"keyboard_name": "P20 ver2",
"usb": {
"device_version": "0.0.2"
}
}
5 changes: 0 additions & 5 deletions keyboards/planck/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +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 0x03A8
#define MANUFACTURER OLKB
#define PRODUCT Planck

/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12
Expand Down
6 changes: 6 additions & 0 deletions keyboards/planck/ez/base/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"keyboard_name": "Planck EZ",
"usb": {
"pid": "0xC6CE"
}
}
Empty file added keyboards/planck/ez/base/rules.mk
View file
Open in desktop
Empty file.
11 changes: 0 additions & 11 deletions keyboards/planck/ez/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,6 @@

#pragma once

#undef VENDOR_ID
#define VENDOR_ID 0x3297
#undef PRODUCT_ID
#define PRODUCT_ID 0xC6CE
#undef MANUFACTURER
#define MANUFACTURER ZSA Technology Labs
#undef PRODUCT
#define PRODUCT Planck EZ
/* USB Device descriptor parameter */
#define DEVICE_VER 0x0000

#undef MATRIX_ROWS
#undef MATRIX_COLS
/* key matrix size */
Expand Down
25 changes: 0 additions & 25 deletions keyboards/planck/ez/glow/config.h
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions keyboards/planck/ez/glow/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"keyboard_name": "Planck EZ Glow",
"usb": {
"pid": "0xC6CF"
}
}
6 changes: 5 additions & 1 deletion keyboards/planck/ez/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"keyboard_name": "Planck EZ",
"manufacturer": "ZSA Technology Labs",
"url": "https://ergodox-ez.com/pages/planck",
"maintainer": "jackhumbert",
"usb": {
"vid": "0x3297",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_planck_1x2uC": {
"layout": [
Expand Down
2 changes: 2 additions & 0 deletions keyboards/planck/ez/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ RGBLIGHT_SUPPORTED = no
BAKCLIGHT_SUPPORTED = no

MOUSE_SHARED_EP = no

DEFAULT_FOLDER = planck/ez/base
1 change: 0 additions & 1 deletion keyboards/planck/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"keyboard_name": "Planck",
"url": "https://olkb.com/planck",
"maintainer": "jackhumbert",
"layouts": {
Expand Down
5 changes: 0 additions & 5 deletions keyboards/planck/light/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

#include "config_common.h"

#undef PRODUCT
#define PRODUCT Planck Light
#define PRODUCT_ID 0xBEA2
#define DEVICE_VER 0x0001

#undef MATRIX_ROW_PINS
#undef MATRIX_COL_PINS

Expand Down
6 changes: 6 additions & 0 deletions keyboards/planck/light/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "Planck Light",
"manufacturer": "OLKB",
"url": "https://olkb.com/planck",
"maintainer": "jackhumbert",
"usb": {
"vid": "0x03A8",
"pid": "0xBEA2",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_planck_1x2uC": {
"layout": [
Expand Down
4 changes: 0 additions & 4 deletions keyboards/planck/rev1/config.h
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion keyboards/planck/rev1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "Planck rev 1",
"keyboard_name": "Planck",
"manufacturer": "OLKB",
"url": "https://olkb.com/planck",
"maintainer": "jackhumbert",
"usb": {
"vid": "0x03A8",
"pid": "0xAE01",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_planck_1x2uC": {
"layout": [
Expand Down
4 changes: 0 additions & 4 deletions keyboards/planck/rev2/config.h
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion keyboards/planck/rev2/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "Planck rev 2",
"keyboard_name": "Planck",
"manufacturer": "OLKB",
"url": "https://olkb.com/planck",
"maintainer": "jackhumbert",
"usb": {
"vid": "0x03A8",
"pid": "0xAE01",
"device_version": "0.0.2"
},
"layouts": {
"LAYOUT_planck_1x2uC": {
"layout": [
Expand Down
4 changes: 0 additions & 4 deletions keyboards/planck/rev3/config.h
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion keyboards/planck/rev3/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "Planck rev 3",
"keyboard_name": "Planck",
"manufacturer": "OLKB",
"url": "https://olkb.com/planck",
"maintainer": "jackhumbert",
"usb": {
"vid": "0x03A8",
"pid": "0xAE01",
"device_version": "0.0.3"
},
"layouts": {
"LAYOUT_planck_1x2uC": {
"layout": [
Expand Down
4 changes: 0 additions & 4 deletions keyboards/planck/rev4/config.h
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion keyboards/planck/rev4/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "Planck rev 4",
"keyboard_name": "Planck",
"manufacturer": "OLKB",
"url": "https://olkb.com/planck",
"maintainer": "jackhumbert",
"usb": {
"vid": "0x03A8",
"pid": "0xAE01",
"device_version": "0.0.4"
},
"layouts": {
"LAYOUT_planck_1x2uC": {
"layout": [
Expand Down
4 changes: 0 additions & 4 deletions keyboards/planck/rev5/config.h
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion keyboards/planck/rev5/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "Planck rev 5",
"keyboard_name": "Planck",
"manufacturer": "OLKB",
"url": "https://olkb.com/planck",
"maintainer": "jackhumbert",
"usb": {
"vid": "0x03A8",
"pid": "0xAE01",
"device_version": "0.0.5"
},
"layouts": {
"LAYOUT_planck_1x2uC": {
"layout": [
Expand Down
4 changes: 0 additions & 4 deletions keyboards/planck/rev6/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@

#pragma once

/* USB Device descriptor parameter */
#define PRODUCT_ID 0xA4F9
#define DEVICE_VER 0x0006

#undef MATRIX_ROWS
#undef MATRIX_COLS
/* key matrix size */
Expand Down
8 changes: 7 additions & 1 deletion keyboards/planck/rev6/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "Planck rev 6",
"keyboard_name": "Planck",
"manufacturer": "OLKB",
"url": "https://olkb.com/planck",
"maintainer": "jackhumbert",
"usb": {
"vid": "0x03A8",
"pid": "0xA4F9",
"device_version": "0.0.6"
},
"layouts": {
"LAYOUT_ortho_4x12": {
"layout": [
Expand Down
6 changes: 0 additions & 6 deletions keyboards/planck/rev6_drop/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@

#pragma once

/* USB Device descriptor parameter */
#define PRODUCT_ID 0xA4F9
#define DEVICE_VER 0x0006
#undef MANUFACTURER
#define MANUFACTURER Drop

#undef MATRIX_ROWS
#undef MATRIX_COLS
/* key matrix size */
Expand Down
8 changes: 7 additions & 1 deletion keyboards/planck/rev6_drop/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "Planck rev 6",
"keyboard_name": "Planck",
"manufacturer": "Drop",
"url": "https://olkb.com/planck",
"maintainer": "jackhumbert",
"usb": {
"vid": "0x03A8",
"pid": "0xA4F9",
"device_version": "0.0.6"
},
"layouts": {
"LAYOUT_ortho_4x12": {
"layout": [
Expand Down
4 changes: 0 additions & 4 deletions keyboards/planck/thk/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once

#include "config_common.h"
#define DEVICE_VER 0x0000
#undef PRODUCT
#define PRODUCT Planck THK
#define PRODUCT_ID 0x25A7

// THK has a different pin-out
#undef MATRIX_ROW_PINS
Expand Down
6 changes: 6 additions & 0 deletions keyboards/planck/thk/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "Planck THK",
"manufacturer": "OLKB",
"maintainer": "Erovia",
"url": "https://olkb.com/planck",
"usb": {
"vid": "0x03A8",
"pid": "0x25A7",
"device_version": "0.0.1"
},
"layout_aliases": {
"LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
"LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
Expand Down
6 changes: 6 additions & 0 deletions keyboards/polilla/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "Polilla",
"manufacturer": "elagil",
"url": "",
"maintainer": "elagil",
"usb": {
"vid": "0x6166",
"pid": "0x0010",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
7 changes: 0 additions & 7 deletions keyboards/polilla/rev1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE

/* USB Device descriptor parameter */
#define VENDOR_ID 0x6166 // af
#define PRODUCT_ID 0x0010
#define DEVICE_VER 0x0001
#define MANUFACTURER elagil
#define PRODUCT Polilla

/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 12
Expand Down
5 changes: 0 additions & 5 deletions keyboards/preonic/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +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 0x03A8
#define MANUFACTURER OLKB
#define PRODUCT Preonic

/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 12
Expand Down
Loading