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

Adding SX60 work by amnobis and configurator settings #3122

Merged
merged 8 commits into from
Jun 5, 2018

Conversation

amnesia0287
Copy link
Contributor

The actual SX60 work was done by @amnobis who made the sx60. I just cleaned it up and added support for the configurator (at least I'm pretty sure).

@@ -0,0 +1,92 @@
#include "sx60.h"
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you change this to be #include QMK_KEYBOARD_H

@@ -0,0 +1,25 @@
#include "sx60.h"
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you change this to be #include QMK_KEYBOARD_H

@amnesia0287
Copy link
Contributor Author

Requested changes completed.

@@ -12,6 +12,7 @@
"*.c": "c",
"*.cpp": "cpp",
"*.hpp": "cpp",
"xstddef": "c"
"xstddef": "c",
"iosfwd": "c"
Copy link
Member

Choose a reason for hiding this comment

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

Could you revert the changes here?

Remove config change that was added automatically by vscode.

![SX60](https://i.imgur.com/hZZHrRr.jpg)

Keyboard Maintainer: [amnobis](https://github.com/amnobis)
Copy link
Member

Choose a reason for hiding this comment

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

Could you make sure that these three lines have double spaces at the end of the lines, so that they are parsed correctly?

Otherwise, they'll end up on one line.

fix readme formatting
@drashna
Copy link
Member

drashna commented Jun 5, 2018

Awesome! Looks good!

@drashna drashna merged commit 96546c7 into qmk:master Jun 5, 2018
@amnesia0287 amnesia0287 deleted the amnesiaisbetterthanquantrik branch June 6, 2018 00:20
yamad pushed a commit to yamad/qmk_firmware that referenced this pull request Apr 10, 2019
* Add SX60

* Add config maps and layouts as well as readmes.

* cleanup and fixes

* correct readme

* add missing closing commenty tag

* Changing includes to QMK_KEYBOARD_H

* Update settings.json

Remove config change that was added automatically by vscode.

* Update readme.md

fix readme formatting
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.

4 participants