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

Merging cub-uanic's ErgoDox fork in with tmk #329

Closed
squarefrog opened this issue Apr 14, 2016 · 1 comment
Closed

Merging cub-uanic's ErgoDox fork in with tmk #329

squarefrog opened this issue Apr 14, 2016 · 1 comment

Comments

@squarefrog
Copy link

I have been using the cub-uanic fork of tmk for a while with my ErgoDox. It works really well, but it's getting awkward to keep my fork of his fork in sync with tmk master!

I'm reaching out to see what would need to happen for us to get support for ErgoDox merged in? Is this something you would consider with a well-formed Pull Request?

@cub-uanic is busy with family and work commitments now so I've reached out to him too to ask if I can help the transition process.

@squarefrog
Copy link
Author

I have just found #173 and so it looks like we'll have to keep things seperate and someone will have to be responsible for keeping the fork updated.

xrigau pushed a commit to xrigau/tmk_keyboard that referenced this issue May 22, 2016
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* splits up process_action to allow independent processing of actions

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

No branches or pull requests

1 participant