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 RGB support in via to launchpad #8621

Merged
merged 1 commit into from
Apr 9, 2020
Merged

Add RGB support in via to launchpad #8621

merged 1 commit into from
Apr 9, 2020

Conversation

joshuarubin
Copy link
Contributor

@joshuarubin joshuarubin commented Mar 30, 2020 •
edited
Loading

Description

This adds RGB support to launchpad in via

Types of Changes

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

Checklist

  • My code follows the code style of this project.
  • 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).

@drashna
Copy link
Member

drashna commented Apr 2, 2020

There are some merge conflicts here.

@joshuarubin joshuarubin force-pushed the launchpad_via_support branch from 0b578bc to 47a136f Compare April 2, 2020 19:37
@joshuarubin
Copy link
Contributor Author

Rebased with the now merged launchpad via support. Now adds RGB to via and also changes the vendor/product ids so that they are unique within the project.

@joshuarubin joshuarubin changed the title Add via support to launchpad Add RGB support in via to launchpad Apr 2, 2020
@drashna drashna requested a review from a team April 5, 2020 08:10
@wilba
Copy link
Contributor

wilba commented Apr 5, 2020

There is no need to change the vendor/product IDs. After this is merged, I can update VIA's definition and add RGB support.

@joshuarubin joshuarubin force-pushed the launchpad_via_support branch from 47a136f to 4f28ea0 Compare April 6, 2020 16:18
@joshuarubin
Copy link
Contributor Author

Removed the changes to the vendor and product ids. Also @Wilba6582 I do have a working via config as well.

zvecr
zvecr requested changes Apr 6, 2020
View reviewed changes
keyboards/launchpad/keymaps/via/config.h Outdated Show resolved Hide resolved
@joshuarubin
Copy link
Contributor Author

Updated with requested change

@joshuarubin joshuarubin force-pushed the launchpad_via_support branch from a3847e9 to c596066 Compare April 7, 2020 18:34
@joshuarubin joshuarubin force-pushed the launchpad_via_support branch from c596066 to 0358789 Compare April 7, 2020 18:37
@joshuarubin
Copy link
Contributor Author

all outstanding issues resolved. anything else?

Erovia
Erovia approved these changes Apr 8, 2020
View reviewed changes
Copy link
Member

@Erovia Erovia left a comment

Choose a reason for hiding this comment

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

The code looks ready to merge. Would you like to fix the ASCII-art layout drawings in keymap.c to represent the new keycodes or we should merge it as is?

@joshuarubin
add rgb support to launchpad in via
71658e2 
Signed-off-by: Joshua Rubin <me@jawa.dev>
@joshuarubin joshuarubin force-pushed the launchpad_via_support branch from 0358789 to 71658e2 Compare April 8, 2020 21:02
@joshuarubin
Copy link
Contributor Author

Updated the ASCII art @Erovia, thanks for noticing that!

Erovia
Erovia approved these changes Apr 9, 2020
View reviewed changes
Copy link
Member

@Erovia Erovia left a comment

Choose a reason for hiding this comment

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

LGTM

@Erovia Erovia merged commit b5aa5e4 into qmk:master Apr 9, 2020
@Erovia
Copy link
Member

Erovia commented Apr 9, 2020

Thank you for your contribution.

loadedsith added a commit to loadedsith/qmk_firmware that referenced this pull request Apr 9, 2020
@loadedsith
Merge branch 'master' into grahampheath
dfdbdca 
* master: (3035 commits)
  [Keymap] Update personal userspace and keymaps (qmk#8747)
  Add PS2_MOUSE_ROTATE to compensate for device orientation (qmk#8650)
  Add RGB support in via to launchpad (qmk#8621)
  VIA support for the KBDFans KBD6x (qmk#8680)
  Set the correct RGB LED count on YD60MQ (qmk#8629)
  [Keymap] Updates to personal keymaps (qmk#8665)
  Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (qmk#8663)
  [Keymap] Userspace update Rgb layers code (qmk#8659)
  Add Choconum (qmk#8709)
  Add Via keymap for BM16-A (qmk#8681)
  Fix edge-case with config
  Don't hide for devs...
  Apply @skullydazed's suggestions, move 'import milc'
  Make dedicated sections for user/dev commands in docs
  Rebase on master, hide some other subcommands
  Use milc for config check, requirements fixes
  CLI: Add development mode support
  Update info.json (qmk#8723)
  format code according to conventions [skip ci]
  spi_master for AVR (qmk#8299)
  ...

# Conflicts:
#	layouts/community/ortho_4x12/grahampheath/keymap.c
#	lib/lufa
loadedsith added a commit to loadedsith/qmk_firmware that referenced this pull request Apr 9, 2020
@loadedsith
Merge branch 'master' into grahampheath-iris
c625827 
* master: (208 commits)
  [Keymap] Update personal userspace and keymaps (qmk#8747)
  Add PS2_MOUSE_ROTATE to compensate for device orientation (qmk#8650)
  Add RGB support in via to launchpad (qmk#8621)
  VIA support for the KBDFans KBD6x (qmk#8680)
  Set the correct RGB LED count on YD60MQ (qmk#8629)
  [Keymap] Updates to personal keymaps (qmk#8665)
  Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (qmk#8663)
  [Keymap] Userspace update Rgb layers code (qmk#8659)
  Add Choconum (qmk#8709)
  Add Via keymap for BM16-A (qmk#8681)
  Fix edge-case with config
  Don't hide for devs...
  Apply @skullydazed's suggestions, move 'import milc'
  Make dedicated sections for user/dev commands in docs
  Rebase on master, hide some other subcommands
  Use milc for config check, requirements fixes
  CLI: Add development mode support
  Update info.json (qmk#8723)
  format code according to conventions [skip ci]
  spi_master for AVR (qmk#8299)
  ...
loadedsith added a commit to loadedsith/qmk_firmware that referenced this pull request Apr 9, 2020
@loadedsith
Merge branch 'master' into mygithub/launchpad
497cef9 
* master: (208 commits)
  [Keymap] Update personal userspace and keymaps (qmk#8747)
  Add PS2_MOUSE_ROTATE to compensate for device orientation (qmk#8650)
  Add RGB support in via to launchpad (qmk#8621)
  VIA support for the KBDFans KBD6x (qmk#8680)
  Set the correct RGB LED count on YD60MQ (qmk#8629)
  [Keymap] Updates to personal keymaps (qmk#8665)
  Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (qmk#8663)
  [Keymap] Userspace update Rgb layers code (qmk#8659)
  Add Choconum (qmk#8709)
  Add Via keymap for BM16-A (qmk#8681)
  Fix edge-case with config
  Don't hide for devs...
  Apply @skullydazed's suggestions, move 'import milc'
  Make dedicated sections for user/dev commands in docs
  Rebase on master, hide some other subcommands
  Use milc for config check, requirements fixes
  CLI: Add development mode support
  Update info.json (qmk#8723)
  format code according to conventions [skip ci]
  spi_master for AVR (qmk#8299)
  ...
violet-fish pushed a commit to violet-fish/qmk_firmware that referenced this pull request Apr 12, 2020
@joshuarubin @violet-fish
Add RGB support in via to launchpad (qmk#8621)
191e3c3 
Signed-off-by: Joshua Rubin <me@jawa.dev>
Quarren42 pushed a commit to Quarren42/qmk_firmware that referenced this pull request Apr 15, 2020
@joshuarubin @Quarren42
Add RGB support in via to launchpad (qmk#8621)
402c89b 
Signed-off-by: Joshua Rubin <me@jawa.dev>
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@joshuarubin @kujawakk
Add RGB support in via to launchpad (qmk#8621)
6804fdc 
Signed-off-by: Joshua Rubin <me@jawa.dev>
@joshuarubin joshuarubin deleted the launchpad_via_support branch April 30, 2020 22:12
bitherder pushed a commit to bitherder/qmk_firmware that referenced this pull request May 15, 2020
@joshuarubin @lorenzoernesto
Add RGB support in via to launchpad (qmk#8621)
9c33696 
Signed-off-by: Joshua Rubin <me@jawa.dev>
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request May 24, 2020
@joshuarubin @sowbug
Add RGB support in via to launchpad (qmk#8621)
7833cf8 
Signed-off-by: Joshua Rubin <me@jawa.dev>
turky pushed a commit to turky/qmk_firmware that referenced this pull request Jun 13, 2020
@joshuarubin @turky
Add RGB support in via to launchpad (qmk#8621)
4188d93 
Signed-off-by: Joshua Rubin <me@jawa.dev>
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
@joshuarubin @jakobaa
Add RGB support in via to launchpad (qmk#8621)
d9c9105 
Signed-off-by: Joshua Rubin <me@jawa.dev>
thorstenweber83 pushed a commit to thorstenweber83/qmk_firmware that referenced this pull request Sep 2, 2020
@joshuarubin @thorstenweber83
Add RGB support in via to launchpad (qmk#8621)
3871fb5 
Signed-off-by: Joshua Rubin <me@jawa.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wilba wilba wilba left review comments

@fauxpark fauxpark fauxpark approved these changes

@nooges nooges nooges left review comments

@zvecr zvecr zvecr requested changes

@Erovia Erovia Erovia approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@joshuarubin @drashna @wilba @Erovia @nooges @fauxpark @zvecr