Added SERIAL metadata in variant files. #1669
Merged
Conversation
This file contains hidden or 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
…eedback with complex uploads
Conflicts: app/src/cc/arduino/packages/uploaders/SerialUploader.java app/src/processing/app/Editor.java app/src/processing/app/Sketch.java app/src/processing/app/debug/Uploader.java
…tgus/Arduino into projectgus-ide-1.5.x-thirdpartyboardprofiles Conflicts: app/src/processing/app/debug/BasicUploader.java
…rty in platform.txt
…flicting with files in IDE install location
… see: arduino#223 It now also parses PID and VID values with text afterwards properly
Can now detect devices with serial number in the port number on OSX
Added VID and PID for older Arduino Unos
…PrePreprocess.strip. Fixes arduino#817
…nt result. Updating test
Conflicts: libraries/Ethernet/examples/XivelyClient/XivelyClient.ino libraries/Ethernet/examples/XivelyClientString/XivelyClientString.ino libraries/GSM/examples/GSMXivelyClient/GSMXivelyClient.ino libraries/GSM/examples/GSMXivelyClientString/GSMXivelyClientString.ino libraries/Servo/examples/Knob/Knob.ino libraries/Servo/examples/Sweep/Sweep.ino libraries/WiFi/examples/WiFiXivelyClient/WiFiXivelyClient.ino libraries/WiFi/examples/WiFiXivelyClientString/WiFiXivelyClientString.ino
|
This pullrequest contains multiple commits that look related an partially identical even. The commit messages don't provide any hints as to how they are different. Perhaps you should use rebase to turn this into one single commit and drop the merge commit from this request? |
|
Right, I've changed the latest commit to remove the LED_BUILTIN (I'll do it in another upstream commit) The two "similar" commits are made this way so I can also update the master branch with a single pull request:
once merged I can fast forward master to the first commit. |
| // SERIAL_PORT_HARDWARE_OPEN Hardware serial ports which are open for use. Their RX & TX | ||
| // pins are NOT connected to anything by default. | ||
| #define SERIAL_PORT_HARDWARE Serial | ||
| #define SERIAL_PORT_HARDWARE_OPEN Serial1 |
There was a problem hiding this comment.
Shouldn't this be just Serial?
|
Ah, that explains the separation. Once merged I guess the structure would become more clear. Thanks for explaining. |
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.
As discussed on the developers list.
Still missing the "Arduino Due (Native port)" case, I should figure out a good way to detect it.