User Serial Port Name

[CallumA]

Fixes a bug where the user's serial port may not be the same as hardcoded value, allows the serial port to be set as a variable on project creation and defaults to cu.usbmodem*

Sorry to spam up your pull requests!

[jawher]

Sorry to spam up your pull requests!

No worries. Thanks for your contributions !

Sorry to insist, but there are still 2 commits in the pull rquest where only one is needed.

It is really easy to fix: just follow any tutorial on interactive rebasing and you'll also have aquired a valuable skill.

[jawher]

Any news on this ? I think this is a great fix and would very much like to get it merged !

I could do the squash in your stead if you prefer !

[CallumA]

Whoops, sorry! I'm on my way home now so I'll get right on it as soon as I'm back.

[CallumA]

Um, well, I've managed to merge the commits however the old ones are still there and pushing the branch from my machine seems to have caused yet another commit... Not quite sure how to sort that

[jawher]

Make sure your are on the correct branch.

git rebase -i HEAD~4

You'll be presented with an editor with this content:

pick 621a45f Use the absolute path as returned by 'which' for every used command. Fixes #2
pick 7d545ad Fix bug compiling with spaces in project path
pick a54ab39 Allow entry of serial port name, more likely default
pick 64871f8 Update Makefile.tpl
pick ab61c31 Sets the variable used in Makefile for serial port

# Rebase d1c6579..771d3ae onto d1c6579

Delete the first 2 line and the last 2 lines, to only keep this one:

pick a54ab39 Allow entry of serial port name, more likely default

# Rebase d1c6579..771d3ae onto d1c6579

Save and exit the editor. You just got rid of 4 unneeded commits.

You then need to push (using the -f flag) to your repo which should update this PR.

Good luck !

[CallumA]

Hooray! That seems to have done it! The pull request is now saying "This pull request contains merge conflicts that must be resolved." so I'm not entirely sure what's happened there but I assume that's fixed from your end?

[jawher]

@CallumA Nice, we're almost there !

What you'll need to do next is rebase your work on top of this repo's master.

What's the output of running git remote in your clone ?

[CallumA]

$ git remote origin

[jawher]

Ensure you are on the CallumA-SerialPortName branch:

git remote add upstream git://github.com/jawher/xavr.git
git pull --rebase upstream master

If you get conflicts, fix them and re-push your branch, which should then update this pull request

[CallumA]

Ah ha, that looks better now

[jawher]

@CallumA Thank you again for your contributions !