Skip to content

Commit 391994f

Browse files
cmagliecmaglie
committed
Merge remote-tracking branch 'arduino/master'
2 parents 06938ac + 64fcc71 commit 391994f

File tree

5 files changed

+150
-17
lines changed

5 files changed

+150
-17
lines changed

‎app/src/processing/app/Editor.java

+12
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
@SuppressWarnings("serial")
7171
public class Editor extends JFrame implements RunnerListener {
7272

73+
public static final int MAX_TIME_AWAITING_FOR_RESUMING_SERIAL_MONITOR = 5000;
74+
7375
private final Platform platform;
7476
private JMenu recentSketchesMenu;
7577

@@ -2411,6 +2413,16 @@ private void resumeOrCloseSerialMonitor() {
24112413
// Return the serial monitor window to its initial state
24122414
if (serialMonitor != null) {
24132415
BoardPort boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
2416+
long sleptFor = 0;
2417+
while (boardPort == null && sleptFor < MAX_TIME_AWAITING_FOR_RESUMING_SERIAL_MONITOR) {
2418+
try {
2419+
Thread.sleep(100);
2420+
sleptFor += 100;
2421+
boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
2422+
} catch (InterruptedException e) {
2423+
// noop
2424+
}
2425+
}
24142426
try {
24152427
if (boardPort == null) {
24162428
serialMonitor.close();

‎app/test/processing/app/macosx/SystemProfilerParserTest.java

+4
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,9 @@ public void shouldCorrectlyParse() throws Exception {
7474
assertEquals("0X2341_0X8036", new SystemProfilerParser().extractVIDAndPID(output, "/dev/tty.usbmodem24131"));
7575
assertEquals("0X0403_0X6015", new SystemProfilerParser().extractVIDAndPID(output, "/dev/cu.usbserial-DN0031EV"));
7676
assertEquals("0X0403_0X6015", new SystemProfilerParser().extractVIDAndPID(output, "/dev/tty.usbserial-DN0031EV"));
77+
78+
output = TestHelper.inputStreamToString(SystemProfilerParserTest.class.getResourceAsStream("system_profiler_output8.txt"));
79+
80+
assertEquals("0X03EB_0X2157", new SystemProfilerParser().extractVIDAndPID(output, "/dev/tty.usbmodemfd132"));
7781
}
7882
}

‎app/test/processing/app/macosx/system_profiler_output8.txt

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
USB:
2+
3+
USB Hi-Speed Bus:
4+
5+
Host Controller Location: Built-in USB
6+
Host Controller Driver: AppleUSBEHCI
7+
PCI Device ID: 0x1c2d
8+
PCI Revision ID: 0x0005
9+
PCI Vendor ID: 0x8086
10+
Bus Number: 0xfa
11+
12+
Hub:
13+
14+
Product ID: 0x2513
15+
Vendor ID: 0x0424 (SMSC)
16+
Version: b.b3
17+
Speed: Up to 480 Mb/sec
18+
Location ID: 0xfa100000 / 2
19+
Current Available (mA): 500
20+
Current Required (mA): 2
21+
22+
Arduino Leonardo:
23+
24+
Product ID: 0x8036
25+
Vendor ID: 0x2341
26+
Version: 1.00
27+
Speed: Up to 12 Mb/sec
28+
Manufacturer: Arduino LLC
29+
Location ID: 0xfa120000 / 5
30+
Current Available (mA): 500
31+
Current Required (mA): 500
32+
33+
BRCM20702 Hub:
34+
35+
Product ID: 0x4500
36+
Vendor ID: 0x0a5c (Broadcom Corp.)
37+
Version: 1.00
38+
Speed: Up to 12 Mb/sec
39+
Manufacturer: Apple Inc.
40+
Location ID: 0xfa110000 / 3
41+
Current Available (mA): 500
42+
Current Required (mA): 94
43+
44+
Bluetooth USB Host Controller:
45+
46+
Product ID: 0x8281
47+
Vendor ID: 0x05ac (Apple Inc.)
48+
Version: 1.25
49+
Speed: Up to 12 Mb/sec
50+
Manufacturer: Apple Inc.
51+
Location ID: 0xfa113000 / 4
52+
Current Available (mA): 500
53+
Current Required (mA): 0
54+
55+
USB Hi-Speed Bus:
56+
57+
Host Controller Location: Built-in USB
58+
Host Controller Driver: AppleUSBEHCI
59+
PCI Device ID: 0x1c26
60+
PCI Revision ID: 0x0005
61+
PCI Vendor ID: 0x8086
62+
Bus Number: 0xfd
63+
64+
Hub:
65+
66+
Product ID: 0x2513
67+
Vendor ID: 0x0424 (SMSC)
68+
Version: b.b3
69+
Speed: Up to 480 Mb/sec
70+
Location ID: 0xfd100000 / 2
71+
Current Available (mA): 500
72+
Current Required (mA): 2
73+
74+
EDBG CMSIS-DAP:
75+
76+
Product ID: 0x2157
77+
Vendor ID: 0x03eb (Atmel Corporation)
78+
Version: 1.01
79+
Serial Number: 00000000AZE000000310
80+
Speed: Up to 480 Mb/sec
81+
Manufacturer: Atmel Corp.
82+
Location ID: 0xfd130000 / 4
83+
Current Available (mA): 500
84+
Current Required (mA): 500
85+
86+
IR Receiver:
87+
88+
Product ID: 0x8242
89+
Vendor ID: 0x05ac (Apple Inc.)
90+
Version: 0.16
91+
Speed: Up to 1.5 Mb/sec
92+
Manufacturer: Apple Computer, Inc.
93+
Location ID: 0xfd110000 / 3
94+
Current Available (mA): 500
95+
Current Required (mA): 100
96+

‎arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java

+26-12
Original file line numberDiff line numberDiff line change
@@ -106,36 +106,40 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
106106
t = prefs.get("upload.wait_for_upload_port");
107107
boolean waitForUploadPort = (t != null) && t.equals("true");
108108

109-
String uploadPort = prefs.getOrExcept("serial.port");
109+
String userSelectedUploadPort = prefs.getOrExcept("serial.port");
110+
String actualUploadPort = null;
110111

111112
if (doTouch) {
112113
try {
113114
// Toggle 1200 bps on selected serial port to force board reset.
114115
List<String> before = Serial.list();
115-
if (before.contains(uploadPort)) {
116+
if (before.contains(userSelectedUploadPort)) {
116117
if (verbose)
117118
System.out.println(
118-
I18n.format(_("Forcing reset using 1200bps open/close on port {0}"), uploadPort));
119-
Serial.touchForCDCReset(uploadPort);
119+
I18n.format(_("Forcing reset using 1200bps open/close on port {0}"), userSelectedUploadPort));
120+
Serial.touchForCDCReset(userSelectedUploadPort);
120121
}
121122
Thread.sleep(400);
122123
if (waitForUploadPort) {
123124
// Scanning for available ports seems to open the port or
124125
// otherwise assert DTR, which would cancel the WDT reset if
125126
// it happened within 250 ms. So we wait until the reset should
126127
// have already occured before we start scanning.
127-
uploadPort = waitForUploadPort(uploadPort, before);
128+
actualUploadPort = waitForUploadPort(userSelectedUploadPort, before);
128129
}
129130
} catch (SerialException e) {
130131
throw new RunnerException(e);
131132
} catch (InterruptedException e) {
132133
throw new RunnerException(e.getMessage());
133134
}
134-
prefs.put("serial.port", uploadPort);
135-
if (uploadPort.startsWith("/dev/")) {
136-
prefs.put("serial.port.file", uploadPort.substring(5));
135+
if (actualUploadPort == null) {
136+
actualUploadPort = userSelectedUploadPort;
137+
}
138+
prefs.put("serial.port", actualUploadPort);
139+
if (actualUploadPort.startsWith("/dev/")) {
140+
prefs.put("serial.port.file", actualUploadPort.substring(5));
137141
} else {
138-
prefs.put("serial.port.file", uploadPort);
142+
prefs.put("serial.port.file", actualUploadPort);
139143
}
140144
}
141145

@@ -158,9 +162,9 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
158162
throw new RunnerException(e);
159163
}
160164

165+
String finalUploadPort = null;
161166
if (uploadResult && doTouch) {
162167
try {
163-
String previousUploadPort = PreferencesData.get("serial.port");
164168
if (waitForUploadPort) {
165169
// For Due/Leonardo wait until the bootloader serial port disconnects and the
166170
// sketch serial port reconnects (or timeout after a few seconds if the
@@ -170,7 +174,11 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
170174
long started = System.currentTimeMillis();
171175
while (System.currentTimeMillis() - started < 2000) {
172176
List<String> portList = Serial.list();
173-
if (portList.contains(previousUploadPort)) {
177+
if (portList.contains(actualUploadPort)) {
178+
finalUploadPort = actualUploadPort;
179+
break;
180+
} else if (portList.contains(userSelectedUploadPort)) {
181+
finalUploadPort = userSelectedUploadPort;
174182
break;
175183
}
176184
Thread.sleep(250);
@@ -181,7 +189,13 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
181189
}
182190
}
183191

184-
BaseNoGui.selectSerialPort(uploadPort);
192+
if (finalUploadPort == null) {
193+
finalUploadPort = actualUploadPort;
194+
}
195+
if (finalUploadPort == null) {
196+
finalUploadPort = userSelectedUploadPort;
197+
}
198+
BaseNoGui.selectSerialPort(finalUploadPort);
185199
return uploadResult;
186200
}
187201

‎arduino-core/src/processing/app/macosx/SystemProfilerParser.java

+12-5
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public String extractVIDAndPID(String output, String serial) throws IOException
5555

5656
if ((matcher = serialNumberRegex.matcher(line)).matches()) {
5757
device.put(SERIAL_NUMBER, matcher.group(1));
58-
if ((serial.startsWith(DEV_TTY_USBSERIAL) || serial.startsWith(DEV_CU_USBSERIAL))) {
58+
if (serial.startsWith(DEV_TTY_USBSERIAL) || serial.startsWith(DEV_CU_USBSERIAL)) {
5959
String devicePath = devicePrefix + matcher.group(1);
6060
device.put(DEVICE_PATH, devicePath);
6161
}
@@ -65,17 +65,24 @@ public String extractVIDAndPID(String output, String serial) throws IOException
6565
device.put(DEVICE_PATH, devicePath);
6666
} else if ((matcher = pidRegex.matcher(line)).matches()) {
6767
String pid = matcher.group(1);
68-
if (pid.indexOf(" ") > 0)
68+
if (pid.indexOf(" ") > 0) {
6969
pid = pid.substring(0, pid.indexOf(" ")); // Remove any text after the hex number
70+
}
7071
device.put(PID, pid);
7172
} else if ((matcher = vidRegex.matcher(line)).matches()) {
7273
String vid = matcher.group(1);
73-
if (vid.indexOf(" ") > 0)
74+
if (vid.indexOf(" ") > 0) {
7475
vid = vid.substring(0, vid.indexOf(" ")); // Remove any text after the hex number
76+
}
7577
device.put(VID, vid);
7678
} else if (line.equals("")) {
77-
if (device.containsKey(DEVICE_PATH) && device.get(DEVICE_PATH).equals(serial)) {
78-
return (device.get(VID) + "_" + device.get(PID)).toUpperCase();
79+
if (device.containsKey(DEVICE_PATH)) {
80+
String computedDevicePath = device.get(DEVICE_PATH);
81+
String computedDevicePathMinusChar = computedDevicePath.substring(0, computedDevicePath.length() - 1);
82+
String serialMinusChar = serial.substring(0, serial.length() - 1);
83+
if (computedDevicePath.equals(serial) || computedDevicePathMinusChar.equals(serialMinusChar)) {
84+
return (device.get(VID) + "_" + device.get(PID)).toUpperCase();
85+
}
7986
}
8087
device = new HashMap<String, String>();
8188
}

0 commit comments

Comments
 (0)