diff options
author | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
---|---|---|
committer | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
commit | 6afdd9d74da250e47ac64d6690bd19d037045e99 (patch) | |
tree | 661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/aplyard/aplx6 | |
parent | 93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff) | |
parent | 1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff) | |
download | qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip |
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/aplyard/aplx6')
-rw-r--r-- | keyboards/aplyard/aplx6/info.json | 4 | ||||
-rw-r--r-- | keyboards/aplyard/aplx6/rev1/config.h | 8 | ||||
-rw-r--r-- | keyboards/aplyard/aplx6/rev1/info.json | 6 | ||||
-rw-r--r-- | keyboards/aplyard/aplx6/rev2/config.h | 8 | ||||
-rw-r--r-- | keyboards/aplyard/aplx6/rev2/info.json | 6 |
5 files changed, 16 insertions, 16 deletions
diff --git a/keyboards/aplyard/aplx6/info.json b/keyboards/aplyard/aplx6/info.json index 2df8d9fb3a..0bd317c1a4 100644 --- a/keyboards/aplyard/aplx6/info.json +++ b/keyboards/aplyard/aplx6/info.json @@ -1,7 +1,11 @@ { "keyboard_name": "Aplx6", + "manufacturer": "Aplyard", "url": "", "maintainer": "Aplyard", + "usb": { + "vid": "0xE0E0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/aplyard/aplx6/rev1/config.h b/keyboards/aplyard/aplx6/rev1/config.h index 98a7381cc7..6aadc3efb2 100644 --- a/keyboards/aplyard/aplx6/rev1/config.h +++ b/keyboards/aplyard/aplx6/rev1/config.h @@ -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 0xE0E0 -#define PRODUCT_ID 0x0030 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Aplyard -#define PRODUCT Aplx6 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 @@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* pin-out */ #define MATRIX_ROW_PINS { E6, B3 } #define MATRIX_COL_PINS { F7, B6, F4 } -#define UNUSED_PINS /* ws2812 RGB LED */ diff --git a/keyboards/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/info.json new file mode 100644 index 0000000000..3eb12dda15 --- /dev/null +++ b/keyboards/aplyard/aplx6/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x0030", + "device_version": "0.0.1" + } +} diff --git a/keyboards/aplyard/aplx6/rev2/config.h b/keyboards/aplyard/aplx6/rev2/config.h index 2b30e67e09..922ab5f44a 100644 --- a/keyboards/aplyard/aplx6/rev2/config.h +++ b/keyboards/aplyard/aplx6/rev2/config.h @@ -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 0xE0E0 -#define PRODUCT_ID 0x0040 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Aplyard -#define PRODUCT Aplx6 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 @@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* 9Key PCB default pin-out */ #define MATRIX_ROW_PINS { B4, B5 } #define MATRIX_COL_PINS { C6, D7, E6 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json new file mode 100644 index 0000000000..06fc50187a --- /dev/null +++ b/keyboards/aplyard/aplx6/rev2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x0040", + "device_version": "0.0.2" + } +} |