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 keypad Satxri6key #13423

Merged
merged 10 commits into from
Jul 22, 2021
Merged

Add keypad Satxri6key #13423

merged 10 commits into from
Jul 22, 2021

Conversation

MaiTheSan
Copy link
Contributor

@MaiTheSan MaiTheSan commented Jul 3, 2021 •
edited
Loading

Adds support for Satxri6key PCB

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

@MaiTheSan
Add keypad Satxri6key
db9d117 
Adds support for Satxri6key PCB
@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Jul 3, 2021
MaiTheSan and others added 4 commits July 3, 2021 17:16
@MaiTheSan
Rule Fix
900964b 
* add a GPL2+ compatible license header to config.h
* RGB matrix map move to keyboad.c
* Move #define RGBLED_NUM 6 to main config.h
* Change keymap
@MaiTheSan
move #define DRIVER_LED_TOTAL 6 to main config.h
704ca51
@MaiTheSan
Rule Fix
68001e6 
* Move #define DRIVER_LED_TOTAL 6 to main config.h
@MaiTheSan
Merge branch 'SanprojectsBranch' of https://github.com/MaiTheSan/qmk_…
6056822 
…firmware into SanprojectsBranch
@MaiTheSan MaiTheSan requested a review from drashna July 3, 2021 10:44
@MaiTheSan MaiTheSan closed this Jul 3, 2021
@MaiTheSan MaiTheSan reopened this Jul 3, 2021
@MaiTheSan
Rule fix
a79d46a 
* remove config.h in all keymap
@MaiTheSan MaiTheSan requested a review from drashna July 3, 2021 19:25
@MaiTheSan
Bug Fix
833983d 
* Change name in info.json
* Matrix RGB Physical Positon fix
@MaiTheSan MaiTheSan requested a review from drashna July 6, 2021 17:12
@drashna drashna requested a review from a team July 6, 2021 23:19
@MaiTheSan
rule fix
062caa1 
delete # Enable keyboard RGB underglow
@MaiTheSan MaiTheSan requested a review from drashna July 9, 2021 02:40
@drashna drashna requested a review from a team July 11, 2021 05:35
@drashna
Copy link
Member

drashna commented Jul 22, 2021

Thanks!

@drashna drashna merged commit 92cca84 into qmk:master Jul 22, 2021
@MaiTheSan
Copy link
Contributor Author

Thanks~ love you all

@MaiTheSan MaiTheSan mentioned this pull request Jul 22, 2021
Merged
6 tasks
cadusk pushed a commit to cadusk/qmk_firmware that referenced this pull request Jul 22, 2021
Merge remote-tracking branch 'qmk/develop' into develop
412e2ae 
* qmk/develop: (141 commits)
  Implement GPIO abstraction for atsam (qmk#13567)
  [Keyboard][Bug] Add timer_avr to includes for broken builds (qmk#13641)
  [Keyboard] adds new revision: dztech/dz60rgb/v2_1 (qmk#13636)
  [Keyboard] Fixing info.json for h0oni/hotduck (qmk#13640)
  [Keyboard] Ymd40v2new layouts and fixed per-switch backlight (qmk#13622)
  [Bug] Develop - DC01 left (qmk#13597)
  [Keyboard] Fix clawsome/hatchback and reviung5 compile issues (qmk#13607)
  [Keyboard] add ogurec (qmk#13242)
  [Keyboard] Add Durgod Taurus K310 keyboard (qmk#12314)
  [Keyboard] Updated keyboard & keymaps (qmk#12667)
  [Keyboard] add SPRH keyboard (qmk#12999)
  Retain brightness with lighting layers (qmk#13025)
  [Keyboard] Add keypad Satxri6key (qmk#13423)
  [Keyboard] Initial Tron Guy Labs keyboard implementation. (qmk#13438)
  [Keyboard] Add Ristretto Keyboard (qmk#13479)
  [Keyboard] New Keyboard - OBE (qmk#13545)
  [Keyboard] Add personal planck keymap (qmk#13635)
  [Keymap] narze/xd004 (qmk#13634)
  [Keyboard] Add h0oni hotduck keyboard (qmk#13609)
  Fix API generation failure caused by GRS-70EC (qmk#13631)
  ...
nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
@MaiTheSan @fauxpark @nhongooi
[Keyboard] Add keypad Satxri6key (qmk#13423)
a5b7cf2 
Co-authored-by: Ryan <fauxpark@gmail.com>
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

@fauxpark fauxpark Awaiting requested review from fauxpark

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.
3 participants
@MaiTheSan @drashna @fauxpark