search

chrisstaite / TeensyDmx

DMX Transmit and Receive for Teensy with RDM support.
MIT License
51 stars 10 forks source link

Make DMX Rx work on Teensy 3.2 #12

Closed peternewman closed 7 years ago

peternewman commented 7 years ago

Only tested on Serial1 so far

peternewman commented 7 years ago

Tx on Serial1 still works too!

This was guesswork/debugging, so I may have added some stuff that's unnecessary, but I don't think so.

peternewman commented 7 years ago

While DMX in currently works, RDM doesn't...

peternewman commented 7 years ago

If you're happy with this, you may prefer to just merge #13 which includes this and the RDM responder fixes and shouldn't need a squash.

peternewman commented 7 years ago

Bump @chrisstaite . Have you got any time to review this and/or #13 ? I've got a few more improvements regards RDM Rx packet validation to follow too.

chrisstaite commented 7 years ago

This pull request looks great, but has conflicts with the head so I can't simply re-base and merge. I'm happy to squash and merge if you like, or you can re-base on the current master and I'll merge as-is. I'll leave it to you. Thanks for your work with this, I've been far too busy to crack out my Teensy's on the test bench this summer!

peternewman commented 7 years ago

I think I've fixed the issue now, but I'm not certain. If it's not working, the best bet may be to just squash!

chrisstaite commented 7 years ago

Still getting "This branch cannot be rebased due to conflicts".

Happy to squash, but I'd like to credit the commits to your authorship. Do you need any help with your git use, or is that not the problem? Happy to help if you need it.

peternewman commented 7 years ago

I can't see anything the other way now on GitHub: https://github.com/peternewman/TeensyDmx/compare/master...chrisstaite:master?expand=1

TBH this is my first time using rebase, so it may well be an issue my end, I normally just do "git pull upstream master", or even use the "Out of Date" buttons within GitHub (not sure if that's a permissions thing, or just a setting on the repo).

I think GitHub shows the authorship of a squash anyway. Alternatively you could try this cherry-pick: https://github.com/chrisstaite/TeensyDmx/pull/14

peternewman commented 7 years ago

Actually, the bottom of the PR says the same thing, "This branch has no conflicts with the base branch", so I'm rather confused if you're seeing conflicts.

chrisstaite commented 7 years ago

Pulled as #14