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

GMMK 2 WBG7 MCU compatibility #16436

Merged
merged 49 commits into from
Jul 12, 2022
Merged

Conversation

GloriousThrall
Copy link

@GloriousThrall GloriousThrall commented Feb 22, 2022

Description

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 Feb 22, 2022
@GloriousThrall GloriousThrall changed the title Gmmk v2 keyboard GMMK V2 WBG7 MCU compatibility Feb 22, 2022
@drashna drashna changed the base branch from master to develop February 22, 2022 23:40
@GloriousThrall GloriousThrall changed the title GMMK V2 WBG7 MCU compatibility GMMK 2 WBG7 MCU compatibility Mar 1, 2022
@GloriousThrall GloriousThrall marked this pull request as ready for review March 3, 2022 23:27
keyboards/gmmk/gmmk2/config.h Outdated Show resolved Hide resolved
keyboards/gmmk/gmmk2/config.h Outdated Show resolved Hide resolved
keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/config.h Outdated Show resolved Hide resolved
@drashna drashna requested a review from a team March 13, 2022 07:40
keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/config.h Outdated Show resolved Hide resolved
keyboards/gmmk/gmmk2/p65/ansi/rules.mk Outdated Show resolved Hide resolved
keyboards/gmmk/gmmk2/p65/iso/rules.mk Outdated Show resolved Hide resolved
keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/gmmk/gmmk2/p96/ansi/rules.mk Outdated Show resolved Hide resolved
keyboards/gmmk/gmmk2/p96/iso/rules.mk Outdated Show resolved Hide resolved
@itarze
Copy link
Contributor

itarze commented Jul 6, 2022

@joshualex @KarlK90 Now you can clone the gmmk_V2_keyboard branch directly. I've solved the RAM overflow problem and merged the develop branch.

@submohanty
Copy link

submohanty commented Jul 11, 2022

Now that the issues have been sorted, will this be approved soon?

@tzarc tzarc merged commit bbd6ea9 into qmk:develop Jul 12, 2022
@guilleortas
Copy link

guilleortas commented Aug 29, 2022

@GloriousThrall What about merging GMMK 2 65% into master?
Thanks!

@itarze
Copy link
Contributor

itarze commented Aug 29, 2022

#18185 This PR. @guilleortas

@guilleortas
Copy link

guilleortas commented Aug 31, 2022

I was able to build and flash QMK with VIA support for my GMMK 2 65% ISO. However, it shows up as GMMK Pro in VIA, which has a different layout and nothing matches. This is not solved using a via.json design file, which it does for @itarze's PR for the GMMK 2 65%.

nolanseaton pushed a commit to nolanseaton/qmk_firmware that referenced this pull request Jan 23, 2023
* GMMK V2 QMK Compatibility

* fix problems

* Update keyboards/gmmk/gmmk2/config.h

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/gmmk/gmmk2/config.h

Co-authored-by: Drashna Jaelre <[email protected]>

* Fix a minor problem

* Optimize the code

* Update config.h

* Update

* Update config.h

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h

Co-authored-by: Drashna Jaelre <[email protected]>

* Update config.h

* Update keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h

Co-authored-by: Drashna Jaelre <[email protected]>

* Update config.h

* Update keyboards/gmmk/gmmk2/p65/ansi/rules.mk

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/gmmk/gmmk2/p96/iso/rules.mk

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/gmmk/gmmk2/p65/iso/rules.mk

Co-authored-by: Drashna Jaelre <[email protected]>

* Update config.h

* Update config.h

* Update config.h

* Modify device pid

* Add gmmk2_p96 keyboard.

* Add gmmk2_p96 keyboard.

* Update led matrix.

* Update led matrix.

* Delete eeprom_flash.c

* Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk

Co-authored-by: Nick Brassel <[email protected]>

* Update from qmk develop branch

* Increased compatibility with wear_leveling.

* Update config.h

Co-authored-by: Joy <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Nick Brassel <[email protected]>
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.

9 participants