cub-uanic / tmk_keyboard

keyboard controller firmware for Atmel AVR USB family
158 stars 157 forks source link

Merge upstream changes #24

Closed marknsikora closed 8 years ago

marknsikora commented 9 years ago

Merge changes from upstream and patch makefiles to work with new core library location. Fixes #22.

notmatt commented 9 years ago

Merged this diff & tested on my own fork, it's working well for me so far -- thanks @marknsikora

cub-uanic commented 8 years ago

@marknsikora please note that most fresh code in my repo is on cub_layout branch, NOT on master.

squarefrog commented 8 years ago

What needs to happen to push this forward? I'm willing to help out if I can, as it's getting hard to keep my fork updated with upstream. I think getting https://github.com/cub-uanic/tmk_keyboard/ in sync with https://github.com/tmk/tmk_keyboard/ would be very beneficial.

Hopefully this could be merged into the main repository, which would reduce the burden on @cub-uanic.

marknsikora commented 8 years ago

After I got access to the repo I updated my branch to track the newer upstream and wanted to test that the new changes had no negative side effect. I've been using this version as my daily driver for a few weeks now without issue.