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/3w6 | |
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/3w6')
-rw-r--r-- | keyboards/3w6/info.json | 5 | ||||
-rw-r--r-- | keyboards/3w6/rev1/config.h | 10 | ||||
-rw-r--r-- | keyboards/3w6/rev1/info.json | 5 | ||||
-rw-r--r-- | keyboards/3w6/rev2/config.h | 10 | ||||
-rw-r--r-- | keyboards/3w6/rev2/info.json | 5 |
5 files changed, 15 insertions, 20 deletions
diff --git a/keyboards/3w6/info.json b/keyboards/3w6/info.json index ab463bc60c..d76688bfc1 100644 --- a/keyboards/3w6/info.json +++ b/keyboards/3w6/info.json @@ -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": [ diff --git a/keyboards/3w6/rev1/config.h b/keyboards/3w6/rev1/config.h index 0c14dc72d3..c9b8f8b58e 100644 --- a/keyboards/3w6/rev1/config.h +++ b/keyboards/3w6/rev1/config.h @@ -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 @@ -44,11 +36,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #define MATRIX_ROW_PINS_L { B0, B1, B2, B4} #define MATRIX_COL_PINS_L { B3, E6, F7, B6, B5 } -#define UNUSED_PINS_L { B7, C6, C7, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6 } #define MATRIX_ROW_PINS_R { P10, P11, P12, P05 } #define MATRIX_COL_PINS_R { P06, P13, P14, P01, P00 } -#define UNUSED_PINS_R { P02, P03, P04, P07, P15, P16, P17 } /* COL2ROW, ROW2COL */ diff --git a/keyboards/3w6/rev1/info.json b/keyboards/3w6/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/3w6/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/3w6/rev2/config.h b/keyboards/3w6/rev2/config.h index 4101aa76cd..c9b8f8b58e 100644 --- a/keyboards/3w6/rev2/config.h +++ b/keyboards/3w6/rev2/config.h @@ -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 @@ -44,11 +36,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #define MATRIX_ROW_PINS_L { B0, B1, B2, B4} #define MATRIX_COL_PINS_L { B3, E6, F7, B6, B5 } -#define UNUSED_PINS_L { B7, C6, C7, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6 } #define MATRIX_ROW_PINS_R { P10, P11, P12, P05 } #define MATRIX_COL_PINS_R { P06, P13, P14, P01, P00 } -#define UNUSED_PINS_R { P02, P03, P04, P07, P15, P16, P17 } /* COL2ROW, ROW2COL */ diff --git a/keyboards/3w6/rev2/info.json b/keyboards/3w6/rev2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/3w6/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} |