Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding jabberwocky v2 keyboard #1647

Merged
merged 2 commits into from
Jan 18, 2023
Merged

Conversation

lukeski14
Copy link
Contributor

@lukeski14 lukeski14 commented Jan 16, 2023

Description

Adding jabberwocky v2 .json
Reorganizing /jabberwocky/ directory, since v1 already is ported to via

QMK Pull Request

qmk/qmk_firmware#19014

Update to productId PR open here: qmk/qmk_firmware#19611

Checklist

  • The VIA support for this keyboard is in QMK master already (MANDATORY)
  • The VIA definition follows the guide here: https://caniusevia.com/docs/layouts
  • I have tested this keyboard definition using VIA's "Design" tab.
  • I have tested this keyboard definition with firmware on a device.
  • I have assigned alpha keys and modifier keys with the correct colors.
  • The Vendor ID is not 0xFEED

@lukeski14
Copy link
Contributor Author

Should probably change product ids. Going to address this

@lukeski14
Copy link
Contributor Author

Updated productId QMK PR here: qmk/qmk_firmware#19611

@yiancar
Copy link
Collaborator

yiancar commented Jan 16, 2023

please ping once the merge of qmk has been done.

@yiancar yiancar closed this Jan 16, 2023
@lukeski14
Copy link
Contributor Author

@yiancar QMK PR merged

@yiancar yiancar reopened this Jan 18, 2023
@yiancar
Copy link
Collaborator

yiancar commented Jan 18, 2023

Hello you have added V1 and V2 here. they both have the same PID/VID, this is not allowed. I presume there is a different firmware in V1 and V2?
Also if the JSON are the same you can just add one...

@lukeski14
Copy link
Contributor Author

The firmware for v1 and v2 is different. I explicitly changed the pid for v2 so now each version has a unique pid. This is the change merged in the most recent QMK PR.

@yiancar
Copy link
Collaborator

yiancar commented Jan 18, 2023

Ok I see, however in the V1 and V2 JSONS on this PR, both have

"vendorId": "0x4E50",
 "productId": "0x4A58",

@lukeski14
Copy link
Contributor Author

In this PR, I added v1 and v2 folders.

These are the productIds for each version as seen in this PR:
v1 productId: "0x4A57"
v2 productId: "0x4A58"

From what I can see, the v1 and v2 productIds are correct. The v1 json already existed so the only change in this PR is a file path change for v1. v2 has the new productId, different from v1.

@yiancar
Copy link
Collaborator

yiancar commented Jan 18, 2023

sorry I am blind.... I couldnt see the right diff....

cheers and thanks for clarifying

@yiancar yiancar merged commit a0ce5da into the-via:master Jan 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants