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.

Sign up for GitHub

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

Jump to bottom

Update Keychron Q0, Q1v1 and Q2 #1484

Closed
wants to merge 8 commits into from
Closed

Update Keychron Q0, Q1v1 and Q2 #1484

wants to merge 8 commits into from

Conversation

adophoxia
Copy link
Contributor

@adophoxia adophoxia commented Oct 13, 2022 •
edited
Loading

Description

Q0

  • Correct cycle names to proper spelling for Q boards

Q1v1 and Q2

  • Add encoder ID (e0) as the center label for encoder keys to support encoder mapping
  • Correct cycle effect names to proper spelling for Q boards

QMK Pull Request

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

KeychronMacro
KeychronMacro suggested changes Oct 13, 2022
View reviewed changes
Copy link
Contributor

@KeychronMacro KeychronMacro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have increased lighting effects to 22 and simplified the shortName of custom keycodes.

src/keychron/q3/jis_encoder.json Outdated Show resolved Hide resolved
src/keychron/q3/jis_encoder.json Outdated Show resolved Hide resolved
src/keychron/q3/jis_encoder.json Outdated Show resolved Hide resolved
src/keychron/q3/jis_encoder.json Outdated Show resolved Hide resolved
src/keychron/q3/jis_encoder.json Outdated Show resolved Hide resolved
src/keychron/q3/ansi_encoder.json Outdated Show resolved Hide resolved
src/keychron/q3/ansi_encoder.json Outdated Show resolved Hide resolved
src/keychron/q3/ansi.json Outdated Show resolved Hide resolved
src/keychron/q3/ansi.json Outdated Show resolved Hide resolved
src/keychron/q3/ansi.json Outdated Show resolved Hide resolved
@adophoxia
Fixup Keychron Q3 JSONs
810f8ea 
Q3
- Add new lighting effects (from 14 to 22 effects)
- Reformat how the custom keycodes are laid out.
  (Knob Versions)
  - Shifted the navigation and arrow keys area 0.25 to the left
@adophoxia
Copy link
Contributor Author

@lalalademaxiya1, since the Q3 will have new effects added, will the Q1 and Q2 also have new effects or does this change only apply to the Q3?

@KeychronMacro
Copy link
Contributor

KeychronMacro commented Oct 14, 2022 •
edited
Loading

@adophoxia Sure, we will submit a new PR to correct Q1 and Q2 in QMK. The Q1 and Q2 JSONS will be modified accordingly to keep pace with Q3

@sharpenedblade
Copy link

@adophoxia Sure, we will submit a new PR to correct Q1 and Q2 in QMK. The Q1 and Q2 JSONS will be modified accordingly to keep pace with Q3

Could all the effects be enabled, technical speaking, because qmk supports all the effects the Q keyboards, and they work properly if you #define them.

@adophoxia
Copy link
Contributor Author

adophoxia commented Oct 15, 2022 •
edited
Loading

@adophoxia Sure, we will submit a new PR to correct Q1 and Q2 in QMK. The Q1 and Q2 JSONS will be modified accordingly to keep pace with Q3

Could all the effects be enabled, technical speaking, because qmk supports all the effects the Q keyboards, and they work properly if you #define them.

They can, but considering the current JSONs for the Q1v1 and Q2 still have 14 effects listed, that may need to be bumped up from 14 to 22.

Speaking of which, that may be the case.

cTn-dev
cTn-dev reviewed Oct 19, 2022
View reviewed changes
src/keychron/q3/ansi.json Outdated Show resolved Hide resolved
@adophoxia adophoxia changed the title Add Keychron Q3 and Update Keychron Q1v1 and Q2 Add Keychron Q3 and Update Keychron Q0, Q1v1 and Q2 Oct 20, 2022
@Xelus22 Xelus22 added the pending QMK merge Waiting for merge into QMK master label Oct 28, 2022
@adophoxia
Copy link
Contributor Author

adophoxia commented Nov 14, 2022 •
edited
Loading

Decided that lumping these changes into one PR makes things out of place and incoherent. Plan on moving the changes to add support for the Keychron Q3 to a separate PR while keeping the rest in this current PR some time in the next few days.

@KeychronMacro
Copy link
Contributor

@adophoxia Yes indeed. I will hand in a new PR for adding VIA support for Q3. Could you please kindly delete JSONs of Q3 from your PR. Hopefully it will help to expedite the process! Many thanks!

@adophoxia
Copy link
Contributor Author

@lalalademaxiya1, I'll do that when I have some time today.

@adophoxia adophoxia changed the title Add Keychron Q3 and Update Keychron Q0, Q1v1 and Q2 Update Keychron Q0, Q1v1 and Q2 Nov 14, 2022
@adophoxia adophoxia closed this Nov 14, 2022
@adophoxia adophoxia deleted the keychron-q-update-addition branch November 14, 2022 05:08
@adophoxia
Copy link
Contributor Author

@lalalademaxiya1, closing this PR to make a separate one for the non-Q3 changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cTn-dev cTn-dev cTn-dev left review comments

@KeychronMacro KeychronMacro KeychronMacro approved these changes

Assignees
No one assigned
Labels
pending QMK merge Waiting for merge into QMK master
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@adophoxia @KeychronMacro @sharpenedblade @cTn-dev @Xelus22