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 CX60 Pcb #13402

Merged
merged 34 commits into from
Jul 4, 2021
Merged

Add CX60 Pcb #13402

merged 34 commits into from
Jul 4, 2021

Conversation

yon85
Copy link

@yon85 yon85 commented Jul 1, 2021 •
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 Jul 1, 2021
drashna
drashna requested changes Jul 1, 2021
View reviewed changes
keyboards/cx60/rules.mk Outdated Show resolved Hide resolved
keyboards/cx60/rules.mk Outdated Show resolved Hide resolved
keyboards/cx60/rules.mk Outdated Show resolved Hide resolved
drashna
drashna requested changes Jul 3, 2021
View reviewed changes
keyboards/cx60/cx60.c Outdated Show resolved Hide resolved
keyboards/cx60/cx60.h Outdated Show resolved Hide resolved
keyboards/cx60/config.h Show resolved Hide resolved
@drashna drashna requested a review from a team July 3, 2021 16:08
fauxpark
fauxpark requested changes Jul 3, 2021
View reviewed changes
keyboards/cx60/rules.mk Outdated Show resolved Hide resolved
keyboards/cx60/config.h Outdated Show resolved Hide resolved
fauxpark
fauxpark requested changes Jul 4, 2021
View reviewed changes
keyboards/cx60/rules.mk Show resolved Hide resolved
fauxpark
fauxpark requested changes Jul 4, 2021
View reviewed changes
keyboards/cx60/rules.mk Outdated Show resolved Hide resolved
@drashna
Copy link
Member

drashna commented Jul 4, 2021

Thanks!

@drashna drashna merged commit 4d4cac2 into qmk:master Jul 4, 2021
@yon85
Copy link
Author

yon85 commented Jul 4, 2021

Thank you for all reviewers for helping us.. U all are awesome guys.. Thanks

cadusk pushed a commit to cadusk/qmk_firmware that referenced this pull request Jul 4, 2021
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into de…
0e12685 
…velop

* 'develop' of https://github.com/qmk/qmk_firmware: (37 commits)
  [Keyboard] Add CX60 (qmk#13402)
  Specskeys Configurator Bugfix and Refactor (qmk#13439)
  [Keyboard] IDOBAO ID67 (qmk#13378)
  [Keyboard] ortho boards from the technik gb (qmk#13382)
  [Keyboard] Add soldered variant of Titan 65 keyboard.  (qmk#13270)
  Pisces: correct layout macro reference in info.json (qmk#13410)
  [Keymap] Update Miryoku (qmk#13307)
  [Keyboard] Add wings42 keyboard (qmk#12734)
  [Keyboard] Added LAYOUT_60_iso_split_rshift to ok60 (qmk#12902)
  [Keymap] Jonavin merc additional encoder functionality (qmk#13039)
  [Bug] Pachi RGB - fix rgb placement (qmk#13428)
  AW20216 use register increment for framebuffer flushes (qmk#13430)
  Improve 'show_build_options' target (qmk#13425)
  [Keymap] gmmk pro keymap with numpad, enhanced encoder functionality and Win key lock (qmk#13406)
  [Keymap] Jonavin quefrency keymap add encoder functionality + 2tap Shift CAPSLOCK (qmk#13376)
  [Docs] RGB Matrix Caps Lock and Layer indicator example (qmk#13367)
  [Keymap] Add stanrc85 community layout (qmk#13338)
  [Keymap] 2Moons-JP Keymap Update (qmk#13279)
  [Keyboard] Added pistachio rev2 (qmk#13248)
  [Keymap] niclake - Keymap updates - Boardwalk updates & DZ60 create (qmk#13245)
  ...
jakeprime pushed a commit to jakeprime/qmk_firmware that referenced this pull request Jul 10, 2021
@yon85 @drashna
@fauxpark @jakeprime
[Keyboard] Add CX60 (qmk#13402)
4284a04 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Jul 11, 2021
@yon85 @drashna
@fauxpark @HokieGeek
[Keyboard] Add CX60 (qmk#13402)
14ef535 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
@yon85 yon85 mentioned this pull request Jul 12, 2021
Merged
6 tasks
wox pushed a commit to wox/qmk_firmware that referenced this pull request Aug 14, 2021
@yon85 @drashna
@fauxpark @wox
[Keyboard] Add CX60 (qmk#13402)
7b781a2 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
@yon85 @drashna
@fauxpark @nhongooi
[Keyboard] Add CX60 (qmk#13402)
9f47951 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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