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: 0-9, A #17941

Merged
merged 2 commits into from
Aug 14, 2022
Merged

Move keyboard USB IDs and strings to data driven, pass 2: 0-9, A #17941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d981a07
Move keyboard USB IDs and strings to data driven, pass 2: 0-9, A
fauxpark Aug 7, 2022
927252c
Merge branch 'master' into keyboards-usb-data-driven-2-0-9-a
fauxpark Aug 11, 2022
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
9 changes: 9 additions & 0 deletions keyboards/0_sixty/base/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"keyboard_name": "0-Sixty",
"usb": {
"pid": "0x0060"
},
"indicators": {
"caps_lock": "B6"
}
}
Empty file added keyboards/0_sixty/base/rules.mk
View file
Open in desktop
Empty file.
12 changes: 0 additions & 12 deletions keyboards/0_sixty/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,6 @@

#include "config_common.h"

/* USB Device descriptor parameter */

#define VENDOR_ID 0x7654
#define PRODUCT_ID 0x0060
#define DEVICE_VER 0x0001

#define MANUFACTURER ven0mtr0n
#define PRODUCT 0-Sixty

/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 5
Expand All @@ -41,9 +32,6 @@
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5

/* indicator leds */
#define LED_CAPS_LOCK_PIN B6

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
Expand Down
6 changes: 5 additions & 1 deletion keyboards/0_sixty/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"keyboard_name": "0-Sixty",
"manufacturer": "ven0mtr0n",
"url": "",
"maintainer": "vinamarora8",
"usb": {
"vid": "0x7654",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_1x2uC": {
"layout": [
Expand Down
2 changes: 2 additions & 0 deletions keyboards/0_sixty/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output

LTO_ENABLE = yes # Link-time opt

DEFAULT_FOLDER = 0_sixty/base
9 changes: 0 additions & 9 deletions keyboards/0_sixty/underglow/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,6 @@

#include "config_common.h"

/* USB Device descriptor parameter */
#undef PRODUCT_ID
#define PRODUCT_ID 0x0061
#undef PRODUCT
#define PRODUCT 0-Sixty-underglow

/* no caps lock with underglow */
#undef LED_CAPS_LOCK_PIN

/* underglow */
#define RGB_DI_PIN B6
#define RGBLED_NUM 24
Expand Down
9 changes: 9 additions & 0 deletions keyboards/0_sixty/underglow/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"keyboard_name": "0-Sixty-underglow",
"usb": {
"pid": "0x0061"
},
"features": {
"rgblight": true
}
}
1 change: 0 additions & 1 deletion keyboards/0_sixty/underglow/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
19 changes: 0 additions & 19 deletions keyboards/0_sixty/underglow/underglow.h
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions keyboards/1upkeyboards/sweet16/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"

/* USB Device descriptor parameter */
#define VENDOR_ID 0x6F75 // OU
#define MANUFACTURER 1up Keyboards
#define PRODUCT Sweet16

/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 4
Expand Down
6 changes: 5 additions & 1 deletion keyboards/1upkeyboards/sweet16/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"keyboard_name": "Sweet 16",
"keyboard_name": "Sweet16",
"manufacturer": "1up Keyboards",
"url": "",
"maintainer": "skullydazed",
"usb": {
"vid": "0x6F75"
},
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
Expand Down
4 changes: 0 additions & 4 deletions keyboards/1upkeyboards/sweet16/v1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

#include "config_common.h"

/* USB Device descriptor parameter */
#define PRODUCT_ID 0x0161
#define DEVICE_VER 0x0001

/* key matrix pins */
#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
#define MATRIX_COL_PINS { D1, D0, D4, C6 }
Expand Down
6 changes: 6 additions & 0 deletions keyboards/1upkeyboards/sweet16/v1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"usb": {
"pid": "0x0161",
"device_version": "0.0.1"
}
}
4 changes: 0 additions & 4 deletions keyboards/1upkeyboards/sweet16/v2/promicro/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

#include "config_common.h"

/* USB Device descriptor parameter */
#define PRODUCT_ID 0x0162
#define DEVICE_VER 0x0001

/* key matrix pins */
#define MATRIX_ROW_PINS { D4, D1, E6, B5 }
#define MATRIX_COL_PINS { F7, F6, D2, D3 }
Expand Down
6 changes: 6 additions & 0 deletions keyboards/1upkeyboards/sweet16/v2/promicro/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"usb": {
"pid": "0x0162",
"device_version": "0.0.1"
}
}
4 changes: 0 additions & 4 deletions keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

#include "config_common.h"

/* USB Device descriptor parameter */
#define PRODUCT_ID 0x0162
#define DEVICE_VER 0x0001

/* key matrix pins */
#define MATRIX_ROW_PINS { B5, B7, B2, B0 }
#define MATRIX_COL_PINS { B8, A0, A10, A9 }
Expand Down
6 changes: 6 additions & 0 deletions keyboards/1upkeyboards/sweet16/v2/proton_c/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"usb": {
"pid": "0x0162",
"device_version": "0.0.1"
}
}
7 changes: 6 additions & 1 deletion keyboards/25keys/aleth42/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"keyboard_name": "aleth42",
"keyboard_name": "ALETH42",
"manufacturer": "25KEYS",
"url": "http://www.sho-k.co.uk/tech/aleth42",
"maintainer": "monksoffunk",
"usb": {
"vid": "0x04D8",
"pid": "0xEAC8"
},
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
7 changes: 0 additions & 7 deletions keyboards/25keys/aleth42/rev0/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 0x04D8
#define PRODUCT_ID 0xEAC8
#define DEVICE_VER 0x0000
#define MANUFACTURER 25KEYS
#define PRODUCT ALETH42

/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 11
Expand Down
5 changes: 5 additions & 0 deletions keyboards/25keys/aleth42/rev0/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.0"
}
}
7 changes: 0 additions & 7 deletions keyboards/25keys/aleth42/rev1/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 0x04D8
#define PRODUCT_ID 0xEAC8
#define DEVICE_VER 0x0001
#define MANUFACTURER 25KEYS
#define PRODUCT ALETH42

/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 11
Expand Down
5 changes: 5 additions & 0 deletions keyboards/25keys/aleth42/rev1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.1"
}
}
11 changes: 8 additions & 3 deletions keyboards/25keys/zinc/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
{
"keyboard_name": "Zinc",
"url": "https://github.com/monksoffunk/",
"manufacturer": "25KEYS",
"url": "https://github.com/monksoffunk/zinc",
"maintainer": "monksoffunk",
"layouts": {
"usb": {
"vid": "0x04D8",
"pid": "0xEA3B",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"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":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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"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":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]
}
Expand Down
7 changes: 0 additions & 7 deletions keyboards/25keys/zinc/rev1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

/* USB Device descriptor parameter */
#define VENDOR_ID 0x04D8
#define PRODUCT_ID 0xEA3B
#define DEVICE_VER 0x0001
#define MANUFACTURER 25KEYS
#define PRODUCT zinc rev.1

#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 100

Expand Down
9 changes: 1 addition & 8 deletions keyboards/25keys/zinc/rev1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
{
"keyboard_name": "Zinc rev.1",
"url": "https://github.com/monksoffunk/zinc",
"maintainer": "monksoffunk",
"layouts": {
"LAYOUT": {
"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":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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"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":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]
}
}
"keyboard_name": "Zinc rev.1"
}
7 changes: 0 additions & 7 deletions keyboards/25keys/zinc/reva/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

/* USB Device descriptor parameter */
#define VENDOR_ID 0x04D8
#define PRODUCT_ID 0xEA3B
#define DEVICE_VER 0x0001
#define MANUFACTURER 25KEYS
#define PRODUCT zinc rev.A

#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 100

Expand Down
9 changes: 1 addition & 8 deletions keyboards/25keys/zinc/reva/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
{
"keyboard_name": "Zinc rev.A",
"url": "https://github.com/monksoffunk/zinc",
"maintainer": "monksoffunk",
"layouts": {
"LAYOUT": {
"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":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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"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":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]
}
}
"keyboard_name": "Zinc rev.A"
}
5 changes: 5 additions & 0 deletions keyboards/3w6/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"keyboard_name": "3w6",
"manufacturer": "weteor",
"url": "https://github.com/weteor/3W6/",
"maintainer": "weteor",
"usb": {
"vid": "0xFEED",
"pid": "0x4658"
},
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
8 changes: 0 additions & 8 deletions keyboards/3w6/rev1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once


/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x4658
#define DEVICE_VER 0x0001
#define MANUFACTURER weteor
#define PRODUCT 3w6

/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 10
Expand Down
5 changes: 5 additions & 0 deletions keyboards/3w6/rev1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.1"
}
}
8 changes: 0 additions & 8 deletions keyboards/3w6/rev2/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once


/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x4658
#define DEVICE_VER 0x0002
#define MANUFACTURER weteor
#define PRODUCT 3w6

/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 10
Expand Down
5 changes: 5 additions & 0 deletions keyboards/3w6/rev2/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.2"
}
}
7 changes: 0 additions & 7 deletions keyboards/4pplet/aekiso60/rev_a/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@

#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID 0x4444
#define PRODUCT_ID 0x0001
#define DEVICE_VER 0x0001
#define MANUFACTURER 4pplet
#define PRODUCT AEKISO60 Rev A

/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
Expand Down
6 changes: 6 additions & 0 deletions keyboards/4pplet/aekiso60/rev_a/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "AEKISO60 Rev A",
"manufacturer": "4pplet",
"url": "",
"maintainer": "4pplet",
"usb": {
"vid": "0x4444",
"pid": "0x0001",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [
Expand Down
Loading