Skip to content

Bug in SoftwareSerial when using inverse logic #1362

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

Closed
wants to merge 127 commits into from
Closed

Bug in SoftwareSerial when using inverse logic #1362

wants to merge 127 commits into from

Conversation

jenscski
Copy link
Contributor

Fix for reported bug #1361

@ffissore ffissore added New and removed New labels Feb 27, 2014
@matthijskooijman
Copy link
Collaborator

Looking at the code in the ide-1.5.x branch, this pullrequest still seems relevant. The commit looks correct to me.

Only comment I have is that the commit message is terse and doesn't really describe what the problem was or how the fix works. Perhaps that can be fixed (combined with a rebase to drop all the merge commits)?

@jenscski
Copy link
Contributor Author

Hello, a better explanation of the bug can be found here http://forum.arduino.cc/index.php?topic=159726

I have noticed I have added many new merge commits to the pull request, this due to my little knowledge of how pull request works... But I will look into the rebase thing to see if I find out how...

@matthijskooijman
Copy link
Collaborator

When you merge (or git pull, which does a merge), git creates a merge commit for you, merging your changes with the upstream changes (from the Arduino repo). If you do a git pull --rebase, or git fetch and then git rebase origin/master, it should instead "replay" your commits on top of the latest master, which makes only your commits appear here. Afterwords, you must use git push --force to overwrite the commits here.

@jenscski
Copy link
Contributor Author

I think I have done some major fail when merging, can I delete this pull request and make a new one?

@matthijskooijman
Copy link
Collaborator

You can, but if you just clean up thinks locally and use git push --force to overwrite the master branch in your repository, this pullrequest will automatically be updated as well. If you want to make a pullrequest for another branch, you'll have to close this one and open a new one, you can't edit the branch for an existing pullreq AFAIK (and you can't delete a pullreq, only close it).

miek and others added 21 commits May 12, 2014 19:30
This alters the debounce example code to toggle the LED rather than just use
the button state to set the LED state.

Fixes #293
…nt with the comment in the header and the tutorial.

Fixes #1396
… of private.

This allows better optimization on classes that extends Stream without losing
timeout capabilities.
Conflicts:
	app/src/processing/app/helpers/FileUtils.java
	app/test/processing/app/tools/ZipDeflaterTest.java
KonradIT and others added 28 commits May 12, 2014 19:32
Changed SS pin to 4 for consistency with other examples
…sketches

After merging #1859, old sketches that uses Robot_Control library must include
Wire.h and SPI.h to work properly.
Decapitalised secondary headings and linked the *Credits* section
Added Mouse.press to Esplora Joystick Mouse example
also make ToDo a link
The comments explaining the if..else part were mistaken.
Updated to reflect changes with how the IDE creates new blank sketches.
removed the variable “led” and added some additional descriptive text
@jenscski
Copy link
Contributor Author

I think I totaly wrecked my respository, so can you delete this, and look at this pull request instead?

#2090

@jenscski jenscski closed this May 23, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Core Related to the code for the standard Arduino API
Projects
None yet
Development

Successfully merging this pull request may close these issues.