arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

MacOSX: SystemProfilerParser nows claims to have found the device even if the name is not exactly the same

Browse Source
This commit is contained in:
Federico Fissore
2015-06-12 13:54:46 +02:00
parent 54971e451f
commit 64fcc716c9
3 changed files with 112 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arduino-core/src/processing/app/macosx/SystemProfilerParser.java
View File

@ -55,7 +55,7 @@ public class SystemProfilerParser {
if ((matcher = serialNumberRegex.matcher(line)).matches()) {
device.put(SERIAL_NUMBER, matcher.group(1));
if ((serial.startsWith(DEV_TTY_USBSERIAL) || serial.startsWith(DEV_CU_USBSERIAL))) {
if (serial.startsWith(DEV_TTY_USBSERIAL) || serial.startsWith(DEV_CU_USBSERIAL)) {
String devicePath = devicePrefix + matcher.group(1);
device.put(DEVICE_PATH, devicePath);
}
@ -65,17 +65,24 @@ public class SystemProfilerParser {
device.put(DEVICE_PATH, devicePath);
} else if ((matcher = pidRegex.matcher(line)).matches()) {
String pid = matcher.group(1);
if (pid.indexOf(" ") > 0)
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()) {
String vid = matcher.group(1);
if (vid.indexOf(" ") > 0)
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("")) {
if (device.containsKey(DEVICE_PATH) && device.get(DEVICE_PATH).equals(serial)) {
return (device.get(VID) + "_" + device.get(PID)).toUpperCase();
if (device.containsKey(DEVICE_PATH)) {
String computedDevicePath = device.get(DEVICE_PATH);
String computedDevicePathMinusChar = computedDevicePath.substring(0, computedDevicePath.length() - 1);
String serialMinusChar = serial.substring(0, serial.length() - 1);
if (computedDevicePath.equals(serial) || computedDevicePathMinusChar.equals(serialMinusChar)) {
return (device.get(VID) + "_" + device.get(PID)).toUpperCase();
}
}
device = new HashMap<String, String>();
}