diff options
| author | lokher <lokher@gmail.com> | 2022-09-13 11:13:00 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2022-09-13 11:13:00 +0800 |
| commit | fe13cedf8c09fa34d5cec4e4c624738095176625 (patch) | |
| tree | 818436626d49c7f22f325632b2053edba10d4358 /keyboards/z12 | |
| parent | fa207545a9759c50b9f230eb608d86a9085801d4 (diff) | |
| parent | f46379f308783994b8178f95adc686f4b4c3ebd8 (diff) | |
merge upstream master
Diffstat (limited to 'keyboards/z12')
| -rw-r--r-- | keyboards/z12/config.h | 8 | ||||
| -rw-r--r-- | keyboards/z12/info.json | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/keyboards/z12/config.h b/keyboards/z12/config.h index 68aff7acf7..57b31e7c8b 100644 --- a/keyboards/z12/config.h +++ b/keyboards/z12/config.h @@ -18,13 +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 0x7A74 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER zigotica -#define PRODUCT z12 - #define ENCODERS_PAD_A { B5, B6 } #define ENCODERS_PAD_B { B4, B2 } @@ -41,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. { F6, F5, F4, NO_PIN } \ } -#define UNUSED_PINS /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 diff --git a/keyboards/z12/info.json b/keyboards/z12/info.json index 2395401e47..7aa53d9a5c 100644 --- a/keyboards/z12/info.json +++ b/keyboards/z12/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "z12", + "manufacturer": "zigotica", "url": "https://github.com/zigotica/mechanical-keyboards/tree/main/z12", "maintainer": "@zigotica", + "usb": { + "vid": "0x7A74", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ |