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

Split GMMK Pro PCBs into separate revisions, fix RGB mapping on ISO #13570

Merged
merged 8 commits into from
Jul 20, 2021

Conversation

Gigahawk
Copy link

@Gigahawk Gigahawk commented Jul 16, 2021

Description

RGB mapping is unique between ISO and ANSI GMMK Pro PCBs, split each version into a separate revision for proper support.

@Hatbuster @Giesd @tipok I don't actually have an ISO model to test, on so if you could please confirm this actually works.

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

@Gigahawk Gigahawk changed the title Split GMMK Pro PCBs into separate revisions, support RGB mapping Split GMMK Pro PCBs into separate revisions, fix RGB mapping on ISO Jul 16, 2021
@Gigahawk
Copy link
Author

☒ Missing keyboards/gmmk/pro/ansi/readme.md
☒ Lint check failed!
linting gmmk/pro/iso
☒ Missing keyboards/gmmk/pro/iso/readme.md
☒ Lint check failed!

Are individual readmes actually needed for each folder?

@zvecr
Copy link
Member

zvecr commented Jul 16, 2021

You will want to sort out the keymaps and info.json, as the "common" folder approach wont work as the layout macros are not common. It should look something like....

keyboards/gmmk/pro/ansi/info.json
keyboards/gmmk/pro/ansi/keymaps/default/keymap.c
keyboards/gmmk/pro/iso/info.json
keyboards/gmmk/pro/iso/keymaps/default/keymap.c

@Hatbuster
Copy link

@Gigahawk I have pulled your branch onto my local repository (god, I'm bad at git) and switched my keyboard to gmmk/pro/iso instead of gmmk/pro. Built it and flashed it.

On my end the LEDs light up now. Seem to be at least roughly in the right position, too, from what I can tell.
Great stuff, thanks for putting this together!

Can't wait for it to be merged into develop after some cleanup :)

@github-actions github-actions bot added keymap via Adds via keymap and/or updates keyboard for via support labels Jul 16, 2021
@zvecr zvecr requested a review from a team July 17, 2021 18:14
Co-authored-by: Drashna Jaelre <drashna@live.com>
@drashna drashna merged commit b994921 into qmk:develop Jul 20, 2021
@ForsakenRei
Copy link
Contributor

ForsakenRei commented Jul 22, 2021

Just updated to the latest commit. It seems the sideglow LED number changed?
Used my previous ANSI keymap.c and my sideglow color goes to some other keys...

@Gigahawk
Copy link
Author

Just updated to the latest commit. It seems the sideglow LED number changed?
Used my previous ANSI keymap.c and my sideglow color goes to some other keys...

Taken from https://github.com/qmk/qmk_firmware/blob/521e24a1b99857ccf8c82782c6b40cb3599aef0f/keyboards/gmmk/pro/pro.c and https://github.com/qmk/qmk_firmware/blob/7a7fe4c16cb3220a724d7ca25409826025ec88ab/keyboards/gmmk/pro/ansi/ansi.c

 $ diff -w ansi.c pro.c
 1c1
 < /* Copyright 2021 Gigahawk
 ---
 > /* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
 16,17c16
 <
 < #include "ansi.h"
 ---
 > #include "pro.h"
 20d18
 < // clang-format off
 240d237
 < // clang-format on

@ForsakenRei
Copy link
Contributor

Just updated to the latest commit. It seems the sideglow LED number changed?
Used my previous ANSI keymap.c and my sideglow color goes to some other keys...

Taken from https://github.com/qmk/qmk_firmware/blob/521e24a1b99857ccf8c82782c6b40cb3599aef0f/keyboards/gmmk/pro/pro.c and https://github.com/qmk/qmk_firmware/blob/7a7fe4c16cb3220a724d7ca25409826025ec88ab/keyboards/gmmk/pro/ansi/ansi.c

 $ diff -w ansi.c pro.c
 1c1
 < /* Copyright 2021 Gigahawk
 ---
 > /* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
 16,17c16
 <
 < #include "ansi.h"
 ---
 > #include "pro.h"
 20d18
 < // clang-format off
 240d237
 < // clang-format on

Thanks. I found the under glow LED nubmers are now from 66-92 with some keycode mixed in it instead of purely 82-97. I will make some changes to my own keymap.

@Gigahawk
Copy link
Author

You must have been using the Glorious mapping, which was ordered by the keyswitch matrix and then the underglow LEDs slapped on at the end.

The merged mapping on develop follows the order of the actual RGB matrix as defined in this comment with column major axis, following the memory layout of the actual RGB driver chips.

@ForsakenRei
Copy link
Contributor

Ah make sense. It's not that hard to change those numbers in keymap either.
Thanks for the help!

nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
Co-authored-by: Drashna Jaelre <drashna@live.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants