lunny/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090)

Browse Source
This commit is contained in:
Ryan
2022-08-20 10:45:28 +10:00
committed by GitHub
parent 201a914beb
commit f4dcce7e59
146 changed files with 418 additions and 452 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keyboards/maple_computing/christmas_tree/V2017/config.h
View File

@ -1,5 +0,0 @@
#pragma once
#include "config_common.h"
#define DEVICE_VER 0x2017

5
keyboards/maple_computing/christmas_tree/V2017/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "20.1.7"
}
}

6
keyboards/maple_computing/christmas_tree/config.h
View File

@ -19,12 +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 0x3070
#define MANUFACTURER Maple Computing
#define PRODUCT Christmas Tree
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 1

5
keyboards/maple_computing/christmas_tree/info.json
View File

@ -1,7 +1,12 @@
{
"keyboard_name": "Christmas Tree",
"manufacturer": "Maple Computing",
"url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/",
"maintainer": "That-Canadian",
"usb": {
"vid": "0xFEED",
"pid": "0x3070"
},
"layouts": {
"LAYOUT": {
"layout": [{"x":1, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}]

6
keyboards/maple_computing/ivy/config.h
View File

@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x1337
#define PRODUCT_ID 0x6012
#define MANUFACTURER Maple Computing
#define PRODUCT Ivy
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 3

2
keyboards/maple_computing/ivy/rev1/config.h
View File

@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0001
/* Let's Macro V2 pin-out */
#define MATRIX_ROW_PINS { F1, B2, D3 }
#define MATRIX_COL_PINS { F5, B3, D5 }

8
keyboards/maple_computing/ivy/rev1/info.json
View File

@ -1,7 +1,13 @@
{
"keyboard_name": "IVY",
"keyboard_name": "Ivy",
"manufacturer": "Maple Computing",
"url": "",
"maintainer": "That-Canadian",
"usb": {
"vid": "0x1337",
"pid": "0x6012",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

6
keyboards/maple_computing/launchpad/config.h
View File

@ -19,12 +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 0x1337
#define PRODUCT_ID 0x6007
#define MANUFACTURER Maple Computing
#define PRODUCT Launch Pad
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 2

2
keyboards/maple_computing/launchpad/rev1/config.h
View File

@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../config.h"
#define DEVICE_VER 0x0001
/* Let's Macro V2 pin-out */
#define MATRIX_ROW_PINS { C6, B1, B3, D7 }
#define MATRIX_COL_PINS { D2, F7 }

8
keyboards/maple_computing/launchpad/rev1/info.json
View File

@ -1,7 +1,13 @@
{
"keyboard_name": "Launch Pad rev1",
"keyboard_name": "Launch Pad",
"manufacturer": "Maple Computing",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x1337",
"pid": "0x6007",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/maple_computing/lets_split_eh/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 0xE401
#define DEVICE_VER 0x0100
#define MANUFACTURER That-Canadian
#define PRODUCT Lets Split Eh?
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 8

8
keyboards/maple_computing/lets_split_eh/eh/info.json
View File

@ -1,7 +1,13 @@
{
"keyboard_name": "Let's Split",
"keyboard_name": "Lets Split Eh?",
"manufacturer": "That-Canadian",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0xFEED",
"pid": "0xE401",
"device_version": "1.0.0"
},
"layouts": {
"LAYOUT": {
"layout": [

6
keyboards/maple_computing/minidox/config.h
View File

@ -19,12 +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 MANUFACTURER That-Canadian
#define PRODUCT MiniDox
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 8

2
keyboards/maple_computing/minidox/rev1/config.h
View File

@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0001
// wiring of each half
#define MATRIX_ROW_PINS { B2, B6, B4, B5 }
#define MATRIX_COL_PINS { F4, D3, D2, D1, D4 }

6
keyboards/maple_computing/minidox/rev1/info.json
View File

@ -1,7 +1,13 @@
{
"keyboard_name": "MiniDox",
"manufacturer": "That-Canadian",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0xFEED",
"pid": "0x3060",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [{"x":0, "y":0.375}, {"x":1, "y":0.125}, {"x":2, "y":0}, {"x":3, "y":0.125}, {"x":4, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.125}, {"x":9, "y":0}, {"x":10, "y":0.125}, {"x":11, "y":0.375}, {"x":0, "y":1.375}, {"x":1, "y":1.125}, {"x":2, "y":1}, {"x":3, "y":1.125}, {"x":4, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.125}, {"x":9, "y":1}, {"x":10, "y":1.125}, {"x":11, "y":1.375}, {"x":0, "y":2.375}, {"x":1, "y":2.125}, {"x":2, "y":2}, {"x":3, "y":2.125}, {"x":4, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.125}, {"x":9, "y":2}, {"x":10, "y":2.125}, {"x":11, "y":2.375}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":3.75, "h":2}, {"x":6.5, "y":3.75, "h":2}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}]

7
keyboards/marksard/rhymestone/rev1/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 0xDFA1
#define DEVICE_VER 0x0020
#define MANUFACTURER marksard
#define PRODUCT Rhymestone
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 5

6
keyboards/marksard/rhymestone/info.json → keyboards/marksard/rhymestone/rev1/info.json
View File

@ -1,7 +1,13 @@
{
"keyboard_name": "Rhymestone",
"manufacturer": "marksard",
"url": "https://github.com/marksard/Keyboards",
"maintainer": "marksard",
"usb": {
"vid": "0xFEED",
"pid": "0xDFA1",
"device_version": "0.2.0"
},
"layouts": {
"LAYOUT_ortho_4x10": {
"layout": [

6
keyboards/marksard/treadstone32/info.json
View File

@ -1,7 +1,11 @@
{
"keyboard_name": "Treadstone32",
"manufacturer": "marksard",
"url": "https://github.com/marksard/Keyboards",
"maintainer": "marksard",
"usb": {
"vid": "0xFEED",
"pid": "0xDFA5"
},
"layouts": {
"LAYOUT": {
"layout": [

7
keyboards/marksard/treadstone32/lite/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 0xDFA5
#define DEVICE_VER 0x0015
#define MANUFACTURER marksard
#define PRODUCT treadstone32 lite
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 5

6
keyboards/marksard/treadstone32/lite/info.json Normal file
View File

@ -0,0 +1,6 @@
{
"keyboard_name": "treadstone32 lite",
"usb": {
"device_version": "0.1.5"
}
}

7
keyboards/marksard/treadstone32/rev1/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 0xDFA5
#define DEVICE_VER 0x0010
#define MANUFACTURER marksard
#define PRODUCT treadstone32
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 5

6
keyboards/marksard/treadstone32/rev1/info.json Normal file
View File

@ -0,0 +1,6 @@
{
"keyboard_name": "treadstone32",
"usb": {
"device_version": "0.1.0"
}
}

7
keyboards/masterworks/classy_tkl/rev_a/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 0x4D57 // "MW" = Masterworks
#define PRODUCT_ID 0x0001
#define DEVICE_VER 0x0001
#define MANUFACTURER Masterworks
#define PRODUCT Classy TKL
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17

6
keyboards/masterworks/classy_tkl/info.json → keyboards/masterworks/classy_tkl/rev_a/info.json
View File

@ -1,7 +1,13 @@
{
"keyboard_name": "Classy TKL",
"manufacturer": "Masterworks",
"url": "https://geekhack.org/index.php?topic=105933",
"maintainer": "qmk",
"usb": {
"vid": "0x4D57",
"pid": "0x0001",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [

5
keyboards/mechllama/g35/config.h
View File

@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define VENDOR_ID 0xCEEB
#define PRODUCT_ID 0x0035
#define MANUFACTURER kaylynb
#define PRODUCT MechLlama G35
#define MATRIX_ROWS 5
#define MATRIX_COLS 7

7
keyboards/mechllama/g35/info.json
View File

@ -1,7 +1,12 @@
{
"keyboard_name": "G35",
"keyboard_name": "MechLlama G35",
"manufacturer": "kaylynb",
"url": "https://github.com/kaylynb/MechLlama-G35",
"maintainer": "kaylynb",
"usb": {
"vid": "0xCEEB",
"pid": "0x0035"
},
"layouts": {
"LAYOUT": {
"layout": [{"label":"F1", "x":0, "y":0.5}, {"label":"Esc", "x":1, "y":0.5}, {"label":"1", "x":2, "y":0}, {"label":"2", "x":3, "y":0.15}, {"label":"3", "x":4, "y":0}, {"label":"4", "x":5, "y":0}, {"label":"5", "x":6, "y":0}, {"label":"F2", "x":0, "y":1.5}, {"label":"Tab", "x":1, "y":1.5}, {"label":"Q", "x":2, "y":1}, {"label":"W", "x":3, "y":1.15}, {"label":"E", "x":4, "y":1}, {"label":"R", "x":5, "y":1}, {"label":"T", "x":6, "y":1}, {"label":"F3", "x":0, "y":2.5}, {"label":"Shift", "x":1, "y":2.5}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2.15}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"F4", "x":0, "y":3.5}, {"label":"Ctrl", "x":1, "y":3.5}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3.15}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"F5", "x":0, "y":4.5}, {"label":"Super", "x":1, "y":4.5}, {"label":"Alt", "x":2, "y":4, "h":1.5}, {"label":"Bksp", "x":3, "y":4.25, "h":1.25}, {"label":"Enter", "x":4, "y":4, "h":1.5}, {"label":"Space", "x":5, "y":4, "h":1.75}, {"label":"Fn", "x":6, "y":4, "h":1.75}]

2
keyboards/mechllama/g35/v1/config.h
View File

@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0001
#define MATRIX_ROW_PINS { F5, F6, F4, F1, D4 }
#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F0, D5 }

5
keyboards/mechllama/g35/v1/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.1"
}
}

2
keyboards/mechllama/g35/v2/config.h
View File

@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0002
#define MATRIX_ROW_PINS { F5, F4, F1, F0, D4 }
#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, D5 }

5
keyboards/mechllama/g35/v2/info.json Normal file
View File

@ -0,0 +1,5 @@
{
"usb": {
"device_version": "0.0.2"
}
}

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