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

Add Cerberus to QMK #24226

Merged
merged 14 commits into from
Dec 5, 2024
Merged

Add Cerberus to QMK #24226

merged 14 commits into from
Dec 5, 2024

Conversation

awkannan
Copy link
Contributor

@awkannan awkannan commented Aug 1, 2024 •
edited
Loading

Description

Add Cerberus PCBs to QMK

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 keymap via Adds via keymap and/or updates keyboard for via support labels Aug 1, 2024
zvecr
zvecr reviewed Aug 1, 2024
View reviewed changes
keyboards/cannonkeys/cerberus/readme.md Outdated

This is used for both the Solderable and Hotswap version of Cerberus

The hotswap PCB does not support per-key LEDs
Copy link
Member

Choose a reason for hiding this comment

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

Same as #24227 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did this as well

drashna
drashna requested changes Aug 30, 2024
View reviewed changes
Copy link
Member

@drashna drashna left a comment

Choose a reason for hiding this comment

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

As of August 26, 2024, qmk/qmk_firmware is no longer accepting VIA-enabled keymaps as these have now transitioned to a repository under the VIA team's control.

As you've submitted a PR containing via or VIA-enabled keymap(s), this is your notice that they should be removed from this PR. You should now submit a secondary PR to the VIA QMK Userspace repository with your associated via or VIA-enabled keymaps instead.

keyboards/cannonkeys/cerberus/hotswap/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/cannonkeys/cerberus/solderable/keymaps/default/keymap.c Outdated Show resolved Hide resolved
@awkannan @drashna
Apply suggestions from code review
209a46f 
Change some whitespace

Co-authored-by: Drashna Jaelre <[email protected]>
@awkannan
Copy link
Contributor Author

awkannan commented Oct 2, 2024

@drashna Ready on this one too

@drashna drashna requested a review from a team October 11, 2024 03:13
fauxpark
fauxpark requested changes Oct 11, 2024
View reviewed changes
keyboards/cannonkeys/cerberus/info.json
"knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"rgb_test": true,
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"rgb_test": true,

Copy link
Member

Choose a reason for hiding this comment

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

Still outstanding.

keyboards/cannonkeys/cerberus/solderable/keymaps/default/keymap.c Show resolved Hide resolved
keyboards/cannonkeys/cerberus/hotswap/keymaps/default/keymap.c Show resolved Hide resolved
@awkannan
Copy link
Contributor Author

awkannan commented Nov 1, 2024

@fauxpark this one had the opposite problem compared to the others haha

I've fixed it and added in the RGB control keycodes.

Thanks! Ready for further review.

@waffle87 waffle87 merged commit d76f7bf into qmk:master Dec 5, 2024
3 checks passed
pull bot pushed a commit to kruton/qmk_firmware that referenced this pull request Dec 5, 2024
@awkannan @waffle87
@drashna @pull
Add Cerberus to QMK (qmk#24226)
2d0ad04 
* Add Cerberus to QMK

* Update readme to add hotswap callouts

* Update readme formatting

* Use format json to update keyboard.json formatting

* Split Cerberus HS and Solderable into separate folders

* Update JSON formatting

* make solderable keymaps a bit more useful

* Backlight fix on solderable

* Update keyboards/cannonkeys/cerberus/hotswap/keyboard.json

Co-authored-by: jack <[email protected]>

* Remove cerberus VIA keymaps

* Apply suggestions from code review

Change some whitespace

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

* Add RGB control keycodes to cerberus keymap

* Add backlight controls to default keymap on solderable version

* Update keyboards/cannonkeys/cerberus/readme.md

---------

Co-authored-by: jack <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
DmNosachev pushed a commit to DmNosachev/qmk_firmware that referenced this pull request Dec 7, 2024
@awkannan @waffle87
@drashna @DmNosachev
Add Cerberus to QMK (qmk#24226)
7d2eb96 
* Add Cerberus to QMK

* Update readme to add hotswap callouts

* Update readme formatting

* Use format json to update keyboard.json formatting

* Split Cerberus HS and Solderable into separate folders

* Update JSON formatting

* make solderable keymaps a bit more useful

* Backlight fix on solderable

* Update keyboards/cannonkeys/cerberus/hotswap/keyboard.json

Co-authored-by: jack <[email protected]>

* Remove cerberus VIA keymaps

* Apply suggestions from code review

Change some whitespace

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

* Add RGB control keycodes to cerberus keymap

* Add backlight controls to default keymap on solderable version

* Update keyboards/cannonkeys/cerberus/readme.md

---------

Co-authored-by: jack <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
eliseomartelli pushed a commit to eliseomartelli/qmk_firmware that referenced this pull request Dec 9, 2024
@awkannan @waffle87
@drashna @eliseomartelli
Add Cerberus to QMK (qmk#24226)
3e8a3ce 
* Add Cerberus to QMK

* Update readme to add hotswap callouts

* Update readme formatting

* Use format json to update keyboard.json formatting

* Split Cerberus HS and Solderable into separate folders

* Update JSON formatting

* make solderable keymaps a bit more useful

* Backlight fix on solderable

* Update keyboards/cannonkeys/cerberus/hotswap/keyboard.json

Co-authored-by: jack <[email protected]>

* Remove cerberus VIA keymaps

* Apply suggestions from code review

Change some whitespace

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

* Add RGB control keycodes to cerberus keymap

* Add backlight controls to default keymap on solderable version

* Update keyboards/cannonkeys/cerberus/readme.md

---------

Co-authored-by: jack <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
waffle87 added a commit to waffle87/qmk_firmware that referenced this pull request Dec 10, 2024
@awkannan @waffle87 @drashna
Add Cerberus to QMK (qmk#24226)
300577f 
* Add Cerberus to QMK

* Update readme to add hotswap callouts

* Update readme formatting

* Use format json to update keyboard.json formatting

* Split Cerberus HS and Solderable into separate folders

* Update JSON formatting

* make solderable keymaps a bit more useful

* Backlight fix on solderable

* Update keyboards/cannonkeys/cerberus/hotswap/keyboard.json

Co-authored-by: jack <[email protected]>

* Remove cerberus VIA keymaps

* Apply suggestions from code review

Change some whitespace

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

* Add RGB control keycodes to cerberus keymap

* Add backlight controls to default keymap on solderable version

* Update keyboards/cannonkeys/cerberus/readme.md

---------

Co-authored-by: jack <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
SyrupSplashin pushed a commit to SyrupSplashin/qmk_firmware that referenced this pull request Dec 10, 2024
@awkannan @waffle87
@drashna @SyrupSplashin
Add Cerberus to QMK (qmk#24226)
3214836 
* Add Cerberus to QMK

* Update readme to add hotswap callouts

* Update readme formatting

* Use format json to update keyboard.json formatting

* Split Cerberus HS and Solderable into separate folders

* Update JSON formatting

* make solderable keymaps a bit more useful

* Backlight fix on solderable

* Update keyboards/cannonkeys/cerberus/hotswap/keyboard.json

Co-authored-by: jack <[email protected]>

* Remove cerberus VIA keymaps

* Apply suggestions from code review

Change some whitespace

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

* Add RGB control keycodes to cerberus keymap

* Add backlight controls to default keymap on solderable version

* Update keyboards/cannonkeys/cerberus/readme.md

---------

Co-authored-by: jack <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
kevinpanaro pushed a commit to kevinpanaro/qmk_firmware that referenced this pull request Dec 18, 2024
@awkannan @waffle87 @drashna
Add Cerberus to QMK (qmk#24226)
55c6b2c 
* Add Cerberus to QMK

* Update readme to add hotswap callouts

* Update readme formatting

* Use format json to update keyboard.json formatting

* Split Cerberus HS and Solderable into separate folders

* Update JSON formatting

* make solderable keymaps a bit more useful

* Backlight fix on solderable

* Update keyboards/cannonkeys/cerberus/hotswap/keyboard.json

Co-authored-by: jack <[email protected]>

* Remove cerberus VIA keymaps

* Apply suggestions from code review

Change some whitespace

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

* Add RGB control keycodes to cerberus keymap

* Add backlight controls to default keymap on solderable version

* Update keyboards/cannonkeys/cerberus/readme.md

---------

Co-authored-by: jack <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
ilham-agustiawan pushed a commit to ilham-agustiawan/qmk_firmware that referenced this pull request Dec 24, 2024
@awkannan @waffle87
@drashna @ilham-agustiawan
Add Cerberus to QMK (qmk#24226)
68667df 
* Add Cerberus to QMK

* Update readme to add hotswap callouts

* Update readme formatting

* Use format json to update keyboard.json formatting

* Split Cerberus HS and Solderable into separate folders

* Update JSON formatting

* make solderable keymaps a bit more useful

* Backlight fix on solderable

* Update keyboards/cannonkeys/cerberus/hotswap/keyboard.json

Co-authored-by: jack <[email protected]>

* Remove cerberus VIA keymaps

* Apply suggestions from code review

Change some whitespace

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

* Add RGB control keycodes to cerberus keymap

* Add backlight controls to default keymap on solderable version

* Update keyboards/cannonkeys/cerberus/readme.md

---------

Co-authored-by: jack <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zvecr zvecr zvecr left review comments

@fauxpark fauxpark fauxpark requested changes

@dunk2k dunk2k dunk2k requested changes

@waffle87 waffle87 waffle87 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.
6 participants
@awkannan @drashna @fauxpark @zvecr @waffle87 @dunk2k