rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-20 14:54:31 +01:00
Code Issues Releases Activity

Merge pull request #1668 from Lauszus/ide-1.5.x-upstream2

Browse Source 
Can now detect devices with serial number in the port number on OSX
This commit is contained in:
Federico Fissore 2013-11-11 00:53:38 -08:00
commit 12bd098e14
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/processing/app/macosx/SystemProfilerParser.java
View File

@ -14,7 +14,8 @@ public class SystemProfilerParser {
private static final String VID = "vid"; private static final String VID = "vid";
private static final String PID = "pid"; private static final String PID = "pid";
private static final String SERIAL_NUMBER = "serial_number"; private static final String SERIAL_NUMBER = "serial_number";
private static final String DEV_TTY = "/dev/tty."; private static final String DEV_TTY_USBSERIAL = "/dev/tty.usbserial-";
private static final String DEV_CU_USBSERIAL = "/dev/cu.usbserial-";
private static final String DEV_TTY_USBMODEM = "/dev/tty.usbmodem"; private static final String DEV_TTY_USBMODEM = "/dev/tty.usbmodem";
private static final String DEV_CU_USBMODEM = "/dev/cu.usbmodem"; private static final String DEV_CU_USBMODEM = "/dev/cu.usbmodem";
@ -34,7 +35,11 @@ public class SystemProfilerParser {
BufferedReader reader = new BufferedReader(new StringReader(output)); BufferedReader reader = new BufferedReader(new StringReader(output));
String devicePrefix; String devicePrefix;
if (serial.startsWith(DEV_TTY)) { if (serial.startsWith(DEV_TTY_USBSERIAL)) {
devicePrefix = DEV_TTY_USBSERIAL;
} else if (serial.startsWith(DEV_CU_USBSERIAL)) {
devicePrefix = DEV_CU_USBSERIAL;
} else if (serial.startsWith(DEV_TTY_USBMODEM)) {
devicePrefix = DEV_TTY_USBMODEM; devicePrefix = DEV_TTY_USBMODEM;
} else { } else {
devicePrefix = DEV_CU_USBMODEM; devicePrefix = DEV_CU_USBMODEM;
@ -50,15 +55,24 @@ public class SystemProfilerParser {
if ((matcher = serialNumberRegex.matcher(line)).matches()) { if ((matcher = serialNumberRegex.matcher(line)).matches()) {
device.put(SERIAL_NUMBER, matcher.group(1)); device.put(SERIAL_NUMBER, matcher.group(1));
} else if ((matcher = locationRegex.matcher(line)).matches()) { if ((serial.startsWith(DEV_TTY_USBSERIAL) || serial.startsWith(DEV_CU_USBSERIAL))) {
String devicePath = devicePrefix; String devicePath = devicePrefix + matcher.group(1);
device.put(DEVICE_PATH, devicePath);
}
} else if ((serial.startsWith(DEV_TTY_USBMODEM) || serial.startsWith(DEV_CU_USBMODEM)) && (matcher = locationRegex.matcher(line)).matches()) {
String suffix = matcher.group(1).substring(2, 6).replaceAll("0", ""); String suffix = matcher.group(1).substring(2, 6).replaceAll("0", "");
devicePath = devicePath + suffix + "1"; String devicePath = devicePrefix + suffix + "1";
device.put(DEVICE_PATH, devicePath); device.put(DEVICE_PATH, devicePath);
} else if ((matcher = pidRegex.matcher(line)).matches()) { } else if ((matcher = pidRegex.matcher(line)).matches()) {
device.put(PID, matcher.group(1)); String pid = matcher.group(1);
if (pid.indexOf(" ") > 0)
pid = pid.substring(0, pid.indexOf(" ")); // Remove any text after the hex number
device.put(PID, pid);
} else if ((matcher = vidRegex.matcher(line)).matches()) { } else if ((matcher = vidRegex.matcher(line)).matches()) {
device.put(VID, matcher.group(1)); String vid = matcher.group(1);
if (vid.indexOf(" ") > 0)
vid = vid.substring(0, vid.indexOf(" ")); // Remove any text after the hex number
device.put(VID, vid);
} else if (line.equals("")) { } else if (line.equals("")) {
if (device.containsKey(DEVICE_PATH) && device.get(DEVICE_PATH).equals(serial)) { if (device.containsKey(DEVICE_PATH) && device.get(DEVICE_PATH).equals(serial)) {
return (device.get(VID) + "_" + device.get(PID)).toUpperCase(); return (device.get(VID) + "_" + device.get(PID)).toUpperCase();

2
app/test/processing/app/macosx/SystemProfilerParserTest.java
View File

@ -43,5 +43,7 @@ public class SystemProfilerParserTest {
assertEquals("0X2341_0X8036", new SystemProfilerParser().extractVIDAndPID(output, "/dev/cu.usbmodem24131")); assertEquals("0X2341_0X8036", new SystemProfilerParser().extractVIDAndPID(output, "/dev/cu.usbmodem24131"));
assertEquals("0X2341_0X8036", new SystemProfilerParser().extractVIDAndPID(output, "/dev/tty.usbmodem24131")); assertEquals("0X2341_0X8036", new SystemProfilerParser().extractVIDAndPID(output, "/dev/tty.usbmodem24131"));
assertEquals("0X0403_0X6015", new SystemProfilerParser().extractVIDAndPID(output, "/dev/cu.usbserial-DN0031EV"));
assertEquals("0X0403_0X6015", new SystemProfilerParser().extractVIDAndPID(output, "/dev/tty.usbserial-DN0031EV"));
} }
} }