diff options
author | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
---|---|---|
committer | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
commit | 61689ae6096f55148fdc4d333c6a74a79486eba3 (patch) | |
tree | 1258cf3619698326cbbd4f28bd3ee502517821fb /keyboards/lfkeyboards | |
parent | eceed6c50bb2a6a85da992c206b95be8cf9d3d49 (diff) | |
parent | 201f1a8f47570c83569d1b0f4851b2fddf996fe7 (diff) |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/lfkeyboards')
-rw-r--r-- | keyboards/lfkeyboards/smk65/info.json | 7 | ||||
-rw-r--r-- | keyboards/lfkeyboards/smk65/revb/config.h | 7 | ||||
-rw-r--r-- | keyboards/lfkeyboards/smk65/revb/info.json | 5 | ||||
-rw-r--r-- | keyboards/lfkeyboards/smk65/revf/config.h | 7 | ||||
-rw-r--r-- | keyboards/lfkeyboards/smk65/revf/info.json | 5 |
5 files changed, 16 insertions, 15 deletions
diff --git a/keyboards/lfkeyboards/smk65/info.json b/keyboards/lfkeyboards/smk65/info.json index 038893c8f3..5522d1bbb7 100644 --- a/keyboards/lfkeyboards/smk65/info.json +++ b/keyboards/lfkeyboards/smk65/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "SMK65", + "keyboard_name": "SMK65v2", + "manufacturer": "LFKeyboards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4C46", + "device_version": "0.0.6" + }, "layouts": { "LAYOUT_65_ansi": { "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, "w":2}, {"x":15, "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":15, "y":1}, {"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":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "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}, {"x":15, "y":4}] diff --git a/keyboards/lfkeyboards/smk65/revb/config.h b/keyboards/lfkeyboards/smk65/revb/config.h index 26fcc540f4..13846be9a8 100644 --- a/keyboards/lfkeyboards/smk65/revb/config.h +++ b/keyboards/lfkeyboards/smk65/revb/config.h @@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4C46 // "LF" -#define PRODUCT_ID 0x565B // "s65b" -#define DEVICE_VER 0x0006 -#define MANUFACTURER LFKeyboards -#define PRODUCT SMK65v2 - // RevA // #define DIODE_DIRECTION COL2ROW // #define MATRIX_ROWS 5 diff --git a/keyboards/lfkeyboards/smk65/revb/info.json b/keyboards/lfkeyboards/smk65/revb/info.json new file mode 100644 index 0000000000..8790e7e33a --- /dev/null +++ b/keyboards/lfkeyboards/smk65/revb/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x565B" + } +} diff --git a/keyboards/lfkeyboards/smk65/revf/config.h b/keyboards/lfkeyboards/smk65/revf/config.h index 40d4e8cb79..6281324c5c 100644 --- a/keyboards/lfkeyboards/smk65/revf/config.h +++ b/keyboards/lfkeyboards/smk65/revf/config.h @@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4C46 // "LF" -#define PRODUCT_ID 0x565F // "s65f" -#define DEVICE_VER 0x0006 -#define MANUFACTURER LFKeyboards -#define PRODUCT SMK65v2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/lfkeyboards/smk65/revf/info.json b/keyboards/lfkeyboards/smk65/revf/info.json new file mode 100644 index 0000000000..071eab2f47 --- /dev/null +++ b/keyboards/lfkeyboards/smk65/revf/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x565F" + } +} |