rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-13 10:29:35 +01:00
Code Issues Releases Activity

Windows: ListComPortsParser was reporting the same VID/PID for both COM12 and COM1. Fixes #3333

Browse Source
This commit is contained in:
Federico Fissore 2015-06-18 09:23:29 +02:00
parent b282e2abfe
commit 8c60054af0
2 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/test/processing/app/windows/ListComPortsParserTest.java
View File

@ -32,6 +32,7 @@ package processing.app.windows;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
public class ListComPortsParserTest {
@ -46,12 +47,22 @@ public class ListComPortsParserTest {
@Test
public void shouldFindVIDPID2() throws Exception {
String listComPortsOutput = "COM1 - (Standard port types) - ACPI\\PNP0501\\1\n" +
"COM3 - IVT Corporation - {F12D3CF8-B11D-457E-8641-BE2AF2D6D204}\\IVTCOMM\\1&27902E60&2&0001\n" +
"COM4 - IVT Corporation - {F12D3CF8-B11D-457E-8641-BE2AF2D6D204}\\IVTCOMM\\1&27902E60&2&0002\n" +
"COM18 - FTDI - FTDIBUS\\VID_0403+PID_0000+A9EPHBR7A\\0000";
"COM3 - IVT Corporation - {F12D3CF8-B11D-457E-8641-BE2AF2D6D204}\\IVTCOMM\\1&27902E60&2&0001\n" +
"COM4 - IVT Corporation - {F12D3CF8-B11D-457E-8641-BE2AF2D6D204}\\IVTCOMM\\1&27902E60&2&0002\n" +
"COM18 - FTDI - FTDIBUS\\VID_0403+PID_0000+A9EPHBR7A\\0000";
assertEquals("0X0403_0X0000", new ListComPortsParser().extractVIDAndPID(listComPortsOutput, "COM18"));
}
@Test
public void shouldNotBeFooledByCOMPortsWithSimilarNames() throws Exception {
String listComPortsOutput = "COM1 - (Standard port types) - ACPI\\PNP0501\\1\n" +
"COM2 - (Standard port types) - ACPI\\PNP0501\\2\n" +
"COM12 - Arduino LLC (www.arduino.cc) - USB\\VID_2341&PID_8041&MI_00\\8&AB76839&0&0000\n" +
"COM3 - FTDI - FTDIBUS\\VID_0403+PID_6015+DA00WSEWA\\0000";
assertEquals("0X2341_0X8041", new ListComPortsParser().extractVIDAndPID(listComPortsOutput, "COM12"));
assertNull(new ListComPortsParser().extractVIDAndPID(listComPortsOutput, "COM1"));
}
}

39
arduino-core/src/processing/app/windows/ListComPortsParser.java
View File

@ -1,3 +1,32 @@
/*
* This file is part of Arduino.
*
* Copyright 2015 Arduino LLC (http://www.arduino.cc/)
*
* Arduino is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* As a special exception, you may use this file as part of a free software
* library without restriction. Specifically, if other files instantiate
* templates or use macros or inline functions from this file, or you compile
* this file and link it with other files to produce an executable, this
* file does not by itself cause the resulting executable to be covered by
* the GNU General Public License. This exception does not however
* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*/
package processing.app.windows;
import java.io.BufferedReader;
@ -8,7 +37,7 @@ import java.util.regex.Pattern;
/**
* Interprets the output of listComPorts.exe
* <p/>
* <p>
* https://github.com/todbot/usbSearch/
*/
public class ListComPortsParser {
@ -25,9 +54,11 @@ public class ListComPortsParser {
BufferedReader reader = new BufferedReader(new StringReader(output));
String line;
while ((line = reader.readLine()) != null) {
if (line.startsWith(serial.toUpperCase())) {
Matcher vidMatcher = vidRegExp.matcher(line);
Matcher pidMatcher = pidRegExp.matcher(line);
String[] lineParts = line.split(" ");
if (lineParts.length > 0 && lineParts[0].toUpperCase().equals(serial.toUpperCase())) {
String vidPidPart = lineParts[lineParts.length - 1];
Matcher vidMatcher = vidRegExp.matcher(vidPidPart);
Matcher pidMatcher = pidRegExp.matcher(vidPidPart);
if (vidMatcher.find() && pidMatcher.find()) {
return ("0x" + vidMatcher.group(1) + "_0x" + pidMatcher.group(1)).toUpperCase();
}