Rocketeer support and updates to Drop/Massdrop keyboards #6568

just-another-jxliu · 2019-08-19T03:57:56Z

Description

New keyboards:

Rocketeer support
1800-layout SHIFT prototype support, will need to change in the future to support the layout change to compact 1800.

For CTRL, ALT, Rocketeer, SHIFT:

LED matrix: new toggle to only enable every other edge LED and new dedicated edge brightness controls.
LED matrix: new pattern directions up/down and circular.
Debounce behavior change.
Increase soft boot minimum hold time from 0.5 seconds to 2 seconds
Remove U_T_AUTO/usb_extra_manual
Modified power management
Under-the-hood changes to accommodate hardware differences between CTRL, ALT, Rocketeer, and SHIFT.

Keymap issues:

massdrop/ctrl:responsive_pattern compiles, but LEDs are not functional because the keymap uses outdated LED functions. Same issue on master. Will fix in a future PR.

Types of Changes

Issues Fixed or Closed by This PR

Closes Add support for Massdrop x Zslane Mercury Rocketeer #6288

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

* CTRL (arm_atsam) support user-defined LED instructions * ok, layer matching works now * Bitwise LED ID to reduce number of instructions (performance) * Use 32-bit ints to be more compatible with generation in JS * TYpo

Updates to get the package compiling and working for the most part Bug with reactive lighting for QMK code and keeping caps/num lock lit when on

…tled (#5)

- In config.h of each, added '#define BOOTKEY_HOLD_MS 2000' to define hold time required to active Boot key (was 500ms hardcode) - Updated all active keymap.c files to use this define - Added line in quantum.c in MAGIC_TOGGLE_NKRO case to clear_keyboard() before toggling nkro state to fix stuck key issues when switching NKRO.

* Clean-up for merge to main QMK repo * Update info.json/readme.md * More fixes, clean-up * Spacing for readme.md

…iu/rocketeer-support-and-updates

pschmuckal · 2020-01-16T01:54:34Z

What do you need from us (Drop) to get this PR closed?

We realize it is not ideal due to # of mods, but these changes were done almost a yr ago by a contractor no longer involved and are needed to support our shipping products.

Also heads up - there are a number of additional changes coming down the pipe to support other new products coming very soon.

drashna · 2020-01-18T06:56:19Z

@pschmuckal more time. It's a large change, touching a BUNCH of files.

What would help in the future is smaller, more incremental changes, as they're easier to review and get merged in, in a timely manner.
Also, ideally, splitting up the PRs so that core changes aren't included with keyboard changes, helps us out a lot.
https://docs.qmk.fm/#/contributing?id=general-guidelines

keyboards/massdrop/rocketeer/config.h

keyboards/massdrop/ctrl/matrix.c

keyboards/massdrop/rocketeer/config.h

pschmuckal · 2020-01-22T21:38:38Z

@drashna Understood, and apologize once again about the excessive number of mods here. Note that our HW design has changed significantly for newer products which is one reason why so many files were touched, as well as adding additional 'config' files into the keyboards dirs. Not sure I could split up this PR easily and still be buildable.

stale · 2020-03-07T22:27:32Z

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

drashna · 2020-03-24T05:37:03Z

Some merge conflicts here

drashna · 2020-09-15T05:46:09Z

@just-another-jxliu @pschmuckal was there any plans to update this and resolve the merge conflicts here?

tzarc · 2020-11-10T04:58:34Z

This PR hasn't seen progress in quite some time. As such, I'm removing the labels that prevent stalebot from auto-closing this PR. You're free to add commits or comments to keep it alive, but for now there's no reason to keep it open if it's going to sit here inactive.

The requirements for PRs have changed since it was raised, so if you'd like to continue the process of getting this into QMK, please refer to the PR Checklist and make the required changes in your next batch of commits. Feel free to reach out to any of the collaborators if you're unsure of things, or even better, ping one of the collaborators on Discord and we can take it from there. Thanks!

tzarc · 2020-12-20T00:49:31Z

Apparently the breaking change label is preventing stalebot from closing this PR.
Please refer to #11119. Closing.

…mk#6568.

just-another-jxliu and others added 26 commits September 14, 2018 14:23

CTRL (arm_atsam) support user-defined LED instructions (#2)

5fb9b45

* CTRL (arm_atsam) support user-defined LED instructions * ok, layer matching works now * Bitwise LED ID to reduce number of instructions (performance) * Use 32-bit ints to be more compatible with generation in JS * TYpo

Use highest active layer only for LEDs

d8936f3

CTRL: LED loop perf improvement from patrickmt

ca618bc

Change back to LED IDs starting at 1

151feb4

Merge remote-tracking branch 'upstream/master'

02d6be3

Add LED instructions to ALT default/mac, CTRL mac

e0e5711

Merge remote-tracking branch 'upstream/master'

a0fac84

ctrl alt working but not fully tested

0500497

Merge remote-tracking branch 'upstream/master' into md_1800_qmk

082c835

190528 updates to get it compiling

413a893

Updates to get the package compiling and working for the most part Bug with reactive lighting for QMK code and keeping caps/num lock lit when on

Upstream merge up to 02d44be

441b212

Merge commit '5fcd744ddba591829a129560992b2e43fb615d4d'

9352fbe

Merge commit 'd0fb7005d51be7c876e63e87778d080c8a733a13'

4c6b0f0

Merge remote-tracking branch 'origin/md_1800_qmk'

c529972

Merge remote-tracking branch 'upstream/master'

9075995

Misc including Rocketeer config_led.c

9fdfae8

Rocketeer: LED positions for bottom LEDs, update mac_md keymap

9b80cec

Change debounce methodology to shift debounce window until row is set…

3cb242b

…tled (#5)

Update SHIFT and Rocketeer config_led.c (#7)

8b5e495

Merge remote-tracking branch 'upstream/master'

5e6878b

Fixes/clean-up for PR to main qmk repo (#9)

5f6d9dc

* Clean-up for merge to main QMK repo * Update info.json/readme.md * More fixes, clean-up * Spacing for readme.md

Undo NRKO change so that it can be PR'ed separately

54b875b

Fix massdrop/alt:reywood LED effects

4d647a7

Fix compilation of massdrop/ctrl:matthewrobo

00426c2

Rocketeer info.json

18a87e6

noroadsleft added core enhancement keyboard keymap labels Aug 19, 2019

pschmuckal added 3 commits December 18, 2019 15:37

Updates to resolve merge conflicts

d06acc1

Yet more merge fixes

5ee5091

Merge branch 'master' of https://github.com/qmk/qmk_firmware into jxl…

36ca40f

…iu/rocketeer-support-and-updates

drashna requested a review from a team January 18, 2020 06:53

drashna reviewed Jan 18, 2020

View reviewed changes

keyboards/massdrop/rocketeer/config.h Show resolved Hide resolved

keyboards/massdrop/ctrl/matrix.c Show resolved Hide resolved

drashna reviewed Jan 18, 2020

View reviewed changes

keyboards/massdrop/rocketeer/config.h Show resolved Hide resolved

drashna requested a review from a team January 19, 2020 21:15

stale bot added the awaiting changes label Mar 7, 2020

tzarc added the in progress label Mar 8, 2020

stale bot removed the awaiting changes label Mar 8, 2020

drashna added the breaking_change Changes that need to wait for a version increment label Mar 10, 2020

fauxpark mentioned this pull request Apr 19, 2020

Clean up ATSAM ifdefs #8808

Merged

13 tasks

tzarc added on hold and removed in progress labels Jul 16, 2020

drashna self-requested a review September 15, 2020 05:42

cmerrill mentioned this pull request Nov 1, 2020

QMK Configurator causes Drop (formerly Massdrop) ALT keyboard USB Hub issue #10786

Closed

tzarc removed the on hold label Nov 10, 2020

tzarc closed this Dec 20, 2020

xwu added a commit to xwu/qmk_firmware that referenced this pull request Jul 27, 2021

[Keyboard] Manually incorporate selected changes for Drop Ctrl from q…

50051d8

…mk#6568.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rocketeer support and updates to Drop/Massdrop keyboards #6568

Rocketeer support and updates to Drop/Massdrop keyboards #6568

just-another-jxliu commented Aug 19, 2019 •

edited by drashna

Loading

pschmuckal commented Jan 16, 2020

drashna commented Jan 18, 2020 •

edited

Loading

pschmuckal commented Jan 22, 2020 •

edited

Loading

stale bot commented Mar 7, 2020

drashna commented Mar 24, 2020

drashna commented Sep 15, 2020

tzarc commented Nov 10, 2020

tzarc commented Dec 20, 2020

Rocketeer support and updates to Drop/Massdrop keyboards #6568

Rocketeer support and updates to Drop/Massdrop keyboards #6568

Conversation

just-another-jxliu commented Aug 19, 2019 • edited by drashna Loading

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

pschmuckal commented Jan 16, 2020

drashna commented Jan 18, 2020 • edited Loading

pschmuckal commented Jan 22, 2020 • edited Loading

stale bot commented Mar 7, 2020

drashna commented Mar 24, 2020

drashna commented Sep 15, 2020

tzarc commented Nov 10, 2020

tzarc commented Dec 20, 2020

just-another-jxliu commented Aug 19, 2019 •

edited by drashna

Loading

drashna commented Jan 18, 2020 •

edited

Loading

pschmuckal commented Jan 22, 2020 •

edited

Loading