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: D-E #17956

Merged
merged 1 commit into from
Aug 15, 2022
Merged

Move keyboard USB IDs and strings to data driven, pass 2: D-E #17956

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
7 changes: 0 additions & 7 deletions keyboards/dailycraft/bat43/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 0x5946 // YF
#define PRODUCT_ID 0x0002
#define DEVICE_VER 0x0001
#define MANUFACTURER yfuku
#define PRODUCT bat43

/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 6
Expand Down
6 changes: 6 additions & 0 deletions keyboards/dailycraft/bat43/rev2/info.json → keyboards/dailycraft/bat43/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "bat43",
"manufacturer": "yfuku",
"url": "",
"maintainer": "yfuku",
"usb": {
"vid": "0x5946",
"pid": "0x0002",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
69 changes: 0 additions & 69 deletions keyboards/dailycraft/bat43/rev1/info.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions keyboards/dailycraft/claw44/rev1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

/* USB Device descriptor parameter */
#define VENDOR_ID 0x5946 // YF
#define PRODUCT_ID 0x0001
#define DEVICE_VER 0x0001
#define MANUFACTURER yfuku
#define PRODUCT claw44

/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 6
Expand Down
8 changes: 7 additions & 1 deletion keyboards/dailycraft/claw44/rev1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "Claw44 rev1",
"keyboard_name": "claw44",
"manufacturer": "yfuku",
"url": "",
"maintainer": "yfuku",
"usb": {
"vid": "0x5946",
"pid": "0x0001",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
7 changes: 0 additions & 7 deletions keyboards/dailycraft/sandbox/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 0x5946 // YF
#define PRODUCT_ID 0x0009
#define DEVICE_VER 0x0001
#define MANUFACTURER yfuku
#define PRODUCT sandbox

/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 5
Expand Down
6 changes: 6 additions & 0 deletions keyboards/dailycraft/sandbox/rev1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "sandbox rev1",
"manufacturer": "yfuku",
"url": "",
"maintainer": "yfuku",
"usb": {
"vid": "0x5946",
"pid": "0x0009",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
7 changes: 0 additions & 7 deletions keyboards/dailycraft/sandbox/rev2/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 0x5946 // YF
#define PRODUCT_ID 0x0011
#define DEVICE_VER 0x0001
#define MANUFACTURER yfuku
#define PRODUCT sandbox rev2

/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 5
Expand Down
6 changes: 6 additions & 0 deletions keyboards/dailycraft/sandbox/rev2/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "sandbox rev2",
"manufacturer": "yfuku",
"url": "",
"maintainer": "yfuku",
"usb": {
"vid": "0x5946",
"pid": "0x0011",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
7 changes: 0 additions & 7 deletions keyboards/dailycraft/stickey4/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 0x5946 // YF
#define PRODUCT_ID 0x0010
#define DEVICE_VER 0x0001
#define MANUFACTURER yfuku
#define PRODUCT stickey4

/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 8
Expand Down
11 changes: 11 additions & 0 deletions keyboards/dailycraft/stickey4/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"keyboard_name": "stickey4",
"manufacturer": "yfuku",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x5946",
"pid": "0x0010",
"device_version": "0.0.1"
}
}
7 changes: 0 additions & 7 deletions keyboards/dailycraft/wings42/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 0x5946 // YF
#define PRODUCT_ID 0x0003
#define DEVICE_VER 0x0001
#define MANUFACTURER yfuku
#define PRODUCT wings42

/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 6
Expand Down
6 changes: 6 additions & 0 deletions keyboards/dailycraft/wings42/rev1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "wings42 rev1",
"manufacturer": "yfuku",
"url": "",
"maintainer": "yfuku",
"usb": {
"vid": "0x5946",
"pid": "0x0003",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_split_3x6_3": {
"layout": [
Expand Down
7 changes: 0 additions & 7 deletions keyboards/dailycraft/wings42/rev1_extkeys/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 0x5946 // YF
#define PRODUCT_ID 0x0004
#define DEVICE_VER 0x0001
#define MANUFACTURER yfuku
#define PRODUCT wings42 extkeys

/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 8
Expand Down
6 changes: 6 additions & 0 deletions keyboards/dailycraft/wings42/rev1_extkeys/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "wings42 rev1_extkeys",
"manufacturer": "yfuku",
"url": "",
"maintainer": "yfuku",
"usb": {
"vid": "0x5946",
"pid": "0x0004",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
7 changes: 0 additions & 7 deletions keyboards/dailycraft/wings42/rev2/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 0x5946 // YF
#define PRODUCT_ID 0x0005
#define DEVICE_VER 0x0001
#define MANUFACTURER yfuku
#define PRODUCT wings42 rev2

/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 6
Expand Down
6 changes: 6 additions & 0 deletions keyboards/dailycraft/wings42/rev2/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "wings42 rev2",
"manufacturer": "yfuku",
"url": "",
"maintainer": "yfuku",
"usb": {
"vid": "0x5946",
"pid": "0x0005",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_split_3x6_3_2": {
"layout": [
Expand Down
4 changes: 0 additions & 4 deletions keyboards/delikeeb/vanana/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once

#include "config_common.h"

#define VENDOR_ID 0x9906
#define PRODUCT_ID 0x0013
#define MANUFACTURER dELIKEEb
6 changes: 5 additions & 1 deletion keyboards/delikeeb/vanana/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"keyboard_name": "vanana",
"manufacturer": "dELIKEEb",
"url": "",
"maintainer": "noclew",
"usb": {
"vid": "0x9906",
"pid": "0x0013"
},
"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":7, "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":7, "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":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.5}, {"x":8.25, "y":4, "w":1.5}, {"x":9.75, "y":4, "w":1.25}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
Expand Down
4 changes: 0 additions & 4 deletions keyboards/delikeeb/vanana/rev1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

/* USB Device descriptor parameter */
#define DEVICE_VER 0x0001
#define PRODUCT Vanana rev1

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

#pragma once

/* USB Device descriptor parameter */
#define DEVICE_VER 0x0002
#define PRODUCT Vanana rev2

/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 10
Expand Down
6 changes: 6 additions & 0 deletions keyboards/delikeeb/vanana/rev2/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"keyboard_name": "Vanana rev2",
"usb": {
"device_version": "0.0.2"
}
}
4 changes: 0 additions & 4 deletions keyboards/delikeeb/waaffle/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once

#include "config_common.h"

#define VENDOR_ID 0x9906
#define PRODUCT_ID 0x0012
#define MANUFACTURER dELIKEEb
4 changes: 0 additions & 4 deletions keyboards/delikeeb/waaffle/rev3/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

/* USB Device descriptor parameter */
#define DEVICE_VER 0x0003
#define PRODUCT Waaffle_rev3

/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 10
Expand Down
8 changes: 7 additions & 1 deletion keyboards/delikeeb/waaffle/rev3/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"keyboard_name": "waaffle",
"keyboard_name": "Waaffle rev3",
"manufacturer": "dELIKEEb",
"url": "",
"maintainer": "noclew",
"usb": {
"vid": "0x9906",
"pid": "0x0012",
"device_version": "0.0.3"
},
"layouts": {
"LAYOUT_ortho_5x16": {
"layout":
Expand Down
7 changes: 0 additions & 7 deletions keyboards/deltasplit75/v2/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 0xFEED
#define PRODUCT_ID 0x3060
#define DEVICE_VER 0x0001
#define MANUFACTURER xyxjj
#define PRODUCT DeltaSplit75

/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 14
Expand Down
Loading