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

Keychron q6 #18288

Merged
merged 40 commits into from
Nov 13, 2022
Merged

Keychron q6 #18288

merged 40 commits into from
Nov 13, 2022

Conversation

KeychronMacro
Copy link
Contributor

Add new keyboard q6 which contains four sub versions.

Description

  • Add keyboard rev_0160, ansi version of q6.
  • Add keyboard rev_0161, ansi version of q6 and enable encoder ec11.
  • Add keyboard rev_0162, iso version of q6.
  • Add keyboard rev_0163, iso version of q6 and enable encoder ec11.

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).

@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Sep 6, 2022
@DoppelKakao
Copy link

Hi, just bought a q6 and was wandering what the status of this pr is?

keyboards/keychron/q6/q6.c Outdated Show resolved Hide resolved
@drashna drashna requested a review from a team September 20, 2022 01:08
@eldorel
Copy link

eldorel commented Oct 6, 2022

Is there anything actually blocking this merge, or are we just waiting on someone to push the button at this point?

@tzarc
Copy link
Member

tzarc commented Oct 6, 2022

Is there anything actually blocking this merge, or are we just waiting on someone to push the button at this point?

We're in discussion to help simplify long-term maintenance of the Keychron submissions. Bear with us.

Copy link

@kroegerama kroegerama left a comment

Choose a reason for hiding this comment

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

Are you sure, these layouts (layout macro names) are correct? The Q6 is Fullsize (+F13) + 4 Buttons above the Numpad. Does not seem to be a standard layout you can find here: https://github.com/qmk/qmk_firmware/tree/master/layouts/default

Here is an image of the non-knob version (no F13): https://www.keychron.com/pages/keychron-q6-keycap-size

@eldorel
Copy link

eldorel commented Oct 13, 2022

Are you sure, these layouts (layout macro names) are correct? The Q6 is Fullsize (+F13) + 4 Buttons above the Numpad. Does not seem to be a standard layout you can find here: https://github.com/qmk/qmk_firmware/tree/master/layouts/default

Here is an image of the non-knob version (no F13): https://www.keychron.com/pages/keychron-q6-keycap-size

I can confirm that the Q6 is not a TKL layout. It has the layout shown in your link.
(and I'm typing this on one, so i'm pretty confident of that.)

It's basically fullsize_ISO/ansi with 4 additional keys above the numpad.

return false;
}
switch (keycode) {
# ifdef RGB_MATRIX_ENABLE

Choose a reason for hiding this comment

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

RGB_MATRIX_ENABLE is already checked in line 42

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed, thanks.

@kroegerama
Copy link

kroegerama commented Oct 21, 2022

I just flashed a build of this firmware (VIA version) on a Q6 ISO Knob. Now I am unable to remap the rotation of the encoder. Remapping of pressing the knob works, though.

Edit I was using this keymap: https://cdn.shopify.com/s/files/1/0059/0630/1017/files/Q6_UK_ISO_Knob_V1.2.json.zip

@kroegerama
Copy link

I was able to fix this by adding a proper definition of the encoder to the via json:
Q6_UK_ISO_Knob_V1.2-mod.zip

Result:
image

@adophoxia
Copy link
Contributor

adophoxia commented Oct 21, 2022

I was able to fix this by adding a proper definition of the encoder to the via json:
Q6_UK_ISO_Knob_V1.2-mod.zip

Result:
image

This was because they were using the action_exec hack that was used before encoder mapping to mimic encoder actions, which in this case, was probably why your knob wasn't working since the JSON used was for that hack, @kroegerama

KeychronMacro and others added 18 commits November 12, 2022 09:15
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@keychron-dev
Copy link

can this be merged now?

@drashna drashna merged commit 6c4e6a8 into qmk:master Nov 13, 2022
thystips pushed a commit to thystips/qmk_firmware that referenced this pull request Nov 24, 2022
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
ramonimbao pushed a commit to ramonimbao/qmk_firmware that referenced this pull request Nov 28, 2022
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
elpekenin pushed a commit to elpekenin/qmk_firmware that referenced this pull request Dec 7, 2022
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@KeychronMacro KeychronMacro deleted the keychron-q6 branch December 12, 2022 03:04
crembz pushed a commit to crembz/qmk_firmware that referenced this pull request Dec 18, 2022
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
nolanseaton pushed a commit to nolanseaton/qmk_firmware that referenced this pull request Jan 23, 2023
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
in progress keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.