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 scorpio_rev2 to QMK #22906

Merged
merged 7 commits into from
Mar 30, 2024
Merged

Add scorpio_rev2 to QMK #22906

merged 7 commits into from
Mar 30, 2024

Conversation

khchen2004
Copy link
Contributor

@khchen2004 khchen2004 commented Jan 15, 2024 •
edited
Loading

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 Jan 15, 2024
@khchen2004 khchen2004 closed this Jan 15, 2024
@khchen2004 khchen2004 reopened this Jan 21, 2024
@waffle87 waffle87 requested a review from a team January 21, 2024 18:52
zvecr
zvecr requested changes Jan 22, 2024
View reviewed changes
keyboards/kwstudio/scorpio_rev2/mcuconf.h Outdated Show resolved Hide resolved
keyboards/kwstudio/scorpio_rev2/info.json Outdated Show resolved Hide resolved
fauxpark
fauxpark requested changes Jan 22, 2024
View reviewed changes
keyboards/kwstudio/scorpio_rev2/config.h Outdated

#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
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
#define WS2812_PWM_COMPLEMENTARY_OUTPUT

Copy link
Member

Choose a reason for hiding this comment

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

Datasheet indicates that B15 only supports TIM1_CH3N, so this would require the WS2812_PWM_COMPLEMENTARY_OUTPUT define to properly function. Master still requires the pwm advnaced config (as I targeted develop for that patch).

Since I suspect that this won't work at all, without this config, the PR should probably target develop, and have this define re-added.

@github-actions GitHub Actions
Copy link

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 bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Mar 18, 2024
@drashna drashna merged commit 93737ec into qmk:master Mar 30, 2024
3 checks passed
xiodine32 pushed a commit to xiodine32/qmk_firmware that referenced this pull request Mar 31, 2024
@khchen2004 @xiodine32
[Keyboard] Add scorpio rev2 (qmk#22906)
b536190
mzyt pushed a commit to mzyt/qmk_firmware that referenced this pull request May 6, 2024
@khchen2004
[Keyboard] Add scorpio rev2 (qmk#22906)
22b50bf
girtsf pushed a commit to girtsf/qmk_firmware that referenced this pull request Jun 5, 2024
@khchen2004 @girtsf
[Keyboard] Add scorpio rev2 (qmk#22906)
1ac7b3e
whoisjordangarcia pushed a commit to whoisjordangarcia/qmk_firmware that referenced this pull request Jun 8, 2024
@khchen2004 @whoisjordangarcia
[Keyboard] Add scorpio rev2 (qmk#22906)
389b897
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@waffle87 waffle87 waffle87 approved these changes

@fauxpark fauxpark Awaiting requested review from fauxpark

@zvecr zvecr Awaiting requested review from zvecr

Assignees
No one assigned
Labels
keyboard keymap stale Issues or pull requests that have become inactive without resolution. 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.

None yet
5 participants
@khchen2004 @drashna @fauxpark @zvecr @waffle87