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

S65-X refactor and Configurator support #3306

Merged
merged 5 commits into from
Jul 11, 2018
Merged

Conversation

noroadsleft
Copy link
Member

@noroadsleft noroadsleft commented Jul 4, 2018

Renamed the variable at the top of s65_x.h.

The note in the .h file about the extra two columns in the matrix (submitted by @geofflane in #1384) prompted me to try to figure out why they were there. My research led me to discover the Sentraq S65-Plus. I was able to find some information in Sentraq's documentation that gave the pinouts for the S65-X and the S65-Plus. The pinouts are identical outside of the two columns of function keys that are to the left on the Plus. I'm thinking perhaps the S65-X is simply an S65-Plus with the two left columns snapped off the PCB.

config.h already had the pins assigned for the two left columns, so to me this would seem to indicate both keyboards can run the same firmware. As such, I added duplicates of the existing matrices with the two columns added, as LAYOUT_plus_ansi and LAYOUT_plus_iso, as well as the s65plus keymap, which is the default keymap for the S65-Plus as published by Sentraq.

Configurator support is added with a new info.json file,

config.h also gets a minor change to the USB Device descriptor, and the readme.md file gets some white space changes for formatting purposes.


Tagging @mechmerlin who did some work on this board in #2708

@noroadsleft
Copy link
Member Author

Is this good or not? I don't understand what we're waiting on here.

@drashna
Copy link
Member

drashna commented Jul 11, 2018

Sorry, no, looks ready to go.

@drashna
Copy link
Member

drashna commented Jul 11, 2018

Thanks!

@drashna drashna merged commit b335a22 into qmk:master Jul 11, 2018
@noroadsleft noroadsleft deleted the c10r-s65x branch July 11, 2018 16:47
alexey-danilov pushed a commit to alexey-danilov/qmk_firmware that referenced this pull request Jul 27, 2018
* Matrix refactor: add S65-Plus matrices

* Fix description identifier

* Readme cleanup

* Configurator support

* Add s65plus default keymap
ChrissiQ pushed a commit to ChrissiQ/qmk_firmware that referenced this pull request Sep 25, 2018
* Matrix refactor: add S65-Plus matrices

* Fix description identifier

* Readme cleanup

* Configurator support

* Add s65plus default keymap
yamad pushed a commit to yamad/qmk_firmware that referenced this pull request Apr 10, 2019
* Matrix refactor: add S65-Plus matrices

* Fix description identifier

* Readme cleanup

* Configurator support

* Add s65plus default keymap
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.

2 participants