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

Various changes from Upstream #3

Merged
merged 27 commits into from
Oct 13, 2014
Merged

Various changes from Upstream #3

merged 27 commits into from
Oct 13, 2014

Conversation

tjanson
Copy link

@tjanson tjanson commented Oct 9, 2014

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.

setola and others added 26 commits September 3, 2012 00:44
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.)
ni-c added a commit that referenced this pull request Oct 13, 2014
Various changes from Upstream
@ni-c ni-c merged commit 096ef13 into ni-c:master Oct 13, 2014
@tjanson tjanson deleted the upstream-merge branch October 13, 2014 13:08
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

Successfully merging this pull request may close these issues.

6 participants