forked from ecto/duino
-
Notifications
You must be signed in to change notification settings - Fork 30
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
Various changes from Upstream #3
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: lib/board.js
…e to text-based framing protocol (print and createChar)
… work due to text-based framing protocol (print and createChar)" This reverts commit d61ef40.
LCD support, misc. other fixes
Serial port manual configurable
board.js updated to allow Raspberry Pi 'Arduino board' serial ports to b...
decimal RC code support Fixed problem with single digit pins ni-c/heimcontrol.js#2
Conflicts: examples/rc.js index.js lib/board.js lib/rc.js package.json src/du.ino
Instead of having both `src/du.ino` (old, invalid path) and `src/duino/duino.ino` (new), make the former a symlink to the latter. (The Arduino IDE requires this folder format.)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges all commits from upstream (LCD support and lots of small things) with the improvements of this fork. Yes, this is ugly and includes all kinds of stuff, but splitting it up would be a lot of work.
Why should this be merged? Apart from the code improvements, I think
duino
should return to a common codebase before this diverges into a true fork. Ideally, I wish upstream would merge our PRs, so @ni-c/heimcontrol can actually depend on @ecto/duino, but until then, let’s keep the difference small.