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.

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

Add Collide39 keyboard #5486

Merged
merged 2 commits into from
Mar 27, 2019
Merged

Add Collide39 keyboard #5486

merged 2 commits into from
Mar 27, 2019

Conversation

nooges
Copy link
Member

@nooges nooges commented Mar 25, 2019

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

@mechmerlin
Copy link
Contributor

When did you buy out Maple Computing?

@nooges
Copy link
Member Author

nooges commented Mar 25, 2019

@mechmerlin Just taking over for a bit while he moves out to MechMerlinLand

keyboards/c39/config.h Outdated Show resolved Hide resolved
keyboards/c39/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/c39/keymaps/default/keymap.c Outdated Show resolved Hide resolved
@jsank
Copy link

jsank commented Mar 26, 2019

Bakingpy doing me a solid with this commit (Josh from SpaceCat Design here). If anything is needed, lmk.

keyboards/c39/rules.mk Show resolved Hide resolved
keyboards/c39/rules.mk Show resolved Hide resolved
Copy link
Contributor

@yanfali yanfali left a comment

Choose a reason for hiding this comment

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

lgtm

@drashna drashna merged commit 6f124b7 into qmk:master Mar 27, 2019
@nooges nooges deleted the collide39 branch March 27, 2019 16:28
chie4hao pushed a commit to chie4hao/qmk_firmware that referenced this pull request Mar 28, 2019
* Add Collide39 keyboard

* Remove unneeded lines
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Mar 28, 2019
* 'master' of https://github.com/qmk/qmk_firmware: (75 commits)
  [Keyboard] E6V2 Bootmapper Client QMK port (qmk#5495)
  [Keymap] Add kwer keymap and RGB mod description to cypher (qmk#5479)
  [Keymap] added user keymap (qmk#5499)
  build size-check enhancement (qmk#5485)
  [Keyboard] Add Collide39 keyboard (qmk#5486)
  [Docs] Add udev rule for Input Club bootloaders (qmk#5494)
  [Keymap] adding keymaps (qmk#3583)
  Add 3 speed mousekey movement option (qmk#2246)
  [Keymap] add redox/rev1:fculpo keymap (qmk#5491)
  [Keymap] Update iris default (qmk#5489)
  Refactor staryu to current standards and enable support for backlight keycodes (qmk#5487)
  Fixing Ergodox_EZ rgb_led initialization
  Added songs from Nier and Nier Automata
  Document an annoyance with Grave Escape and macOS Terminal (qmk#5483)
  Bugfix for recently integrated cypher keyboard (qmk#5481)
  add keyboards/mxss/rgblight.h from e661f15:quantum/rgblight.h (qmk#5461)
  [Keymap] Planck Keymap :: rjhiglefort (qmk#5059)
  Add support for RGB LEDs wired directly to each half's controller (qmk#5392)
  [Keyboard] added cypher keyboard support (qmk#5466)
  [Keymap] Add custom Planck Light keymap (qmk#5464)
  ...
danielo515 pushed a commit to danielo515/qmk_firmware that referenced this pull request May 15, 2019
* Add Collide39 keyboard

* Remove unneeded lines
Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
* Add Collide39 keyboard

* Remove unneeded lines
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Nov 26, 2019
* Add Collide39 keyboard

* Remove unneeded lines
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants