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 Q1 and Q2 for keychron #18713

Merged
merged 7 commits into from
Dec 8, 2022
Merged

Update Q1 and Q2 for keychron #18713

merged 7 commits into from
Dec 8, 2022

Conversation

KeychronMacro
Copy link
Contributor

@KeychronMacro KeychronMacro commented Oct 14, 2022 •
edited
Loading

  • Update keychron_common.h.
  • Rearrange Q1 and Q2 accordingly to keep pace with Q3.

Description

  • Update keychron_common.h.
    The custom keycode should start from USER00 when we enable VIA.
  • Rearrange Q1 and Q2.
    Moved matrix definitons into info.json.
    Adjust some lighting effects.
    Rename all boards with ansi, iso and so on instead of PID.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@KeychronMacro
Cleanup of Q1 and Q2
466a4c2 
- Update keychron_common.h.
- Rearrange Q1 and Q2 accordingly to keep pace with Q3.
@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Oct 14, 2022
@adophoxia adophoxia mentioned this pull request Oct 15, 2022
Closed
6 tasks
@drashna drashna requested a review from a team October 21, 2022 00:40
Jpe230
Jpe230 suggested changes Oct 21, 2022
View reviewed changes
Copy link
Contributor

@Jpe230 Jpe230 left a comment

Choose a reason for hiding this comment

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

Just a couple of comments after testing this PR with my Q2.

I wrote them in the encoder ansi variant, but the same comments apply to the "normal" ansi

keyboards/keychron/q2/ansi_encoder/info.json Outdated Show resolved Hide resolved
keyboards/keychron/q2/ansi_encoder/rules.mk Outdated Show resolved Hide resolved
keyboards/keychron/q2/ansi_encoder/rules.mk Show resolved Hide resolved
KeychronMacro and others added 3 commits October 22, 2022 09:43
@KeychronMacro @drashna
Update keyboards/keychron/common/keychron_common.h
64354b7 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@KeychronMacro @Jpe230
Update keyboards/keychron/q2/ansi_encoder/info.json
9ac2c5d 
Co-authored-by: jpe230 <pablin.123.ra@gmail.com>
@KeychronMacro
Delete "LTO_ENABLE = yes"
78afda6
@adophoxia adophoxia mentioned this pull request Oct 24, 2022
Merged
14 tasks
@KeychronMacro KeychronMacro requested review from Jpe230 and drashna and removed request for Jpe230 November 2, 2022 04:27
@KeychronMacro KeychronMacro requested review from Jpe230 and removed request for drashna November 9, 2022 01:32
@adophoxia adophoxia mentioned this pull request Nov 14, 2022
Closed
6 tasks
@KeychronMacro KeychronMacro requested review from drashna and removed request for Jpe230 November 15, 2022 01:34
@drashna drashna requested a review from a team November 15, 2022 18:06
@KeychronMacro KeychronMacro requested a review from Jpe230 November 21, 2022 01:59
@keychron-dev
Copy link

@Jpe230 any news on this? a lot of people are waiting for this. thanks

@Jpe230
Copy link
Contributor

Jpe230 commented Dec 7, 2022

@Jpe230 any news on this? a lot of people are waiting for this. thanks

Sadly I'm just a user/contributor, so I don't have any input as to when this PR can be merged or if anything else needs to be addressed. In any case, I'm totally sorry for the late reply.

@tzarc tzarc merged commit 1215fc2 into qmk:master Dec 8, 2022
@KeychronMacro KeychronMacro deleted the keychron-q1-q2-fix branch December 12, 2022 03:04
crembz pushed a commit to crembz/qmk_firmware that referenced this pull request Dec 18, 2022
@KeychronMacro @drashna
@Jpe230 @crembz
Update Q1 and Q2 for keychron (qmk#18713)
a694875 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jpe230 <pablin.123.ra@gmail.com>
sbhal pushed a commit to sbhal/qmk_firmware that referenced this pull request Dec 30, 2022
@KeychronMacro @drashna @Jpe230
Update Q1 and Q2 for keychron (qmk#18713)
7248d04 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jpe230 <pablin.123.ra@gmail.com>
@KeychronMacro KeychronMacro mentioned this pull request Jan 7, 2023
Merged
6 tasks
ideas32 pushed a commit to ideas32/qmk_firmware that referenced this pull request Jan 25, 2023
@KeychronMacro @drashna
@Jpe230 @ideas32
Update Q1 and Q2 for keychron (qmk#18713)
1dfdc49 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jpe230 <pablin.123.ra@gmail.com>
@adophoxia adophoxia mentioned this pull request Apr 1, 2023
Closed
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jpe230 Jpe230 Jpe230 approved these changes

@fauxpark fauxpark fauxpark approved these changes

@tzarc tzarc tzarc approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@KeychronMacro @keychron-dev @Jpe230 @drashna @tzarc @fauxpark @galican