mirror of
https://github.com/fasteddy516/SimplySerial.git
synced 2024-11-24 10:04:35 +00:00
board detection work-in-progress
This commit is contained in:
parent
ba43f073d0
commit
6eba0462d2
@ -62,7 +62,7 @@ namespace SimplySerial
|
|||||||
{
|
{
|
||||||
Console.WriteLine(("<<< SimplySerial v{0} connected via {1} >>>\n" +
|
Console.WriteLine(("<<< SimplySerial v{0} connected via {1} >>>\n" +
|
||||||
"Settings : {2} baud, {3} parity, {4} data bits, {5} stop bit{6}.\n" +
|
"Settings : {2} baud, {3} parity, {4} data bits, {5} stop bit{6}.\n" +
|
||||||
"Device : {7} ({8}) {9} ({10})\n" +
|
"Device : {7} ({8}) {9} ({10}){11}\n" +
|
||||||
"---\n\nUse CTRL-X to exit.\n"),
|
"---\n\nUse CTRL-X to exit.\n"),
|
||||||
version,
|
version,
|
||||||
port.name,
|
port.name,
|
||||||
@ -71,10 +71,11 @@ namespace SimplySerial
|
|||||||
dataBits,
|
dataBits,
|
||||||
(stopBits == StopBits.None) ? "0" : (stopBits == StopBits.One) ? "1" : (stopBits == StopBits.OnePointFive) ? "1.5" : "2",
|
(stopBits == StopBits.None) ? "0" : (stopBits == StopBits.One) ? "1" : (stopBits == StopBits.OnePointFive) ? "1.5" : "2",
|
||||||
(stopBits == StopBits.One) ? "" : "s",
|
(stopBits == StopBits.One) ? "" : "s",
|
||||||
"VID",
|
port.board.make,
|
||||||
port.vid,
|
port.vid,
|
||||||
"PID",
|
port.board.model,
|
||||||
port.pid
|
port.pid,
|
||||||
|
(port.board.isCircuitPython) ? " + CircuitPython" : ""
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -140,7 +141,9 @@ namespace SimplySerial
|
|||||||
static void ProcessArguments(string[] args)
|
static void ProcessArguments(string[] args)
|
||||||
{
|
{
|
||||||
// get a list of all available ports
|
// get a list of all available ports
|
||||||
List<ComPort> availablePorts = SimplySerial.GetSerialPorts();
|
List<ComPort> availablePorts = (SimplySerial.GetSerialPorts()).OrderBy(p => p.num).ToList();
|
||||||
|
//List<ComPort> availablePorts = SimplySerial.GetSerialPorts();
|
||||||
|
//availablePorts = (availablePorts.OrderBy(p => p.board.pid)).ToList();
|
||||||
|
|
||||||
// set default port information
|
// set default port information
|
||||||
port.name = String.Empty;
|
port.name = String.Empty;
|
||||||
@ -172,7 +175,7 @@ namespace SimplySerial
|
|||||||
{
|
{
|
||||||
Console.WriteLine("\nPORT\tVID\tPID\tDESCRIPTION");
|
Console.WriteLine("\nPORT\tVID\tPID\tDESCRIPTION");
|
||||||
Console.WriteLine("------------------------------------------------------------");
|
Console.WriteLine("------------------------------------------------------------");
|
||||||
foreach (ComPort p in SimplySerial.GetSerialPorts())
|
foreach (ComPort p in availablePorts)
|
||||||
{
|
{
|
||||||
Console.WriteLine("{0}\t{1}\t{2}\t{3}", p.name, p.vid, p.pid, p.description);
|
Console.WriteLine("{0}\t{1}\t{2}\t{3}", p.name, p.vid, p.pid, p.description);
|
||||||
}
|
}
|
||||||
@ -278,7 +281,11 @@ namespace SimplySerial
|
|||||||
if (port.name == String.Empty)
|
if (port.name == String.Empty)
|
||||||
{
|
{
|
||||||
if (availablePorts.Count() >= 1)
|
if (availablePorts.Count() >= 1)
|
||||||
SimplySerial.port = availablePorts[0];
|
{
|
||||||
|
SimplySerial.port = availablePorts.Find(p => p.board.isCircuitPython == true);
|
||||||
|
if (SimplySerial.port.name == null)
|
||||||
|
SimplySerial.port = availablePorts[0];
|
||||||
|
}
|
||||||
else
|
else
|
||||||
ExitProgram("No COM ports detected.", exitCode: -1);
|
ExitProgram("No COM ports detected.", exitCode: -1);
|
||||||
}
|
}
|
||||||
@ -366,6 +373,7 @@ namespace SimplySerial
|
|||||||
Environment.Exit(exitCode);
|
Environment.Exit(exitCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Custom structure containing the name, VID, PID and description of a serial (COM) port
|
/// Custom structure containing the name, VID, PID and description of a serial (COM) port
|
||||||
@ -376,9 +384,11 @@ namespace SimplySerial
|
|||||||
struct ComPort // custom struct with our desired values
|
struct ComPort // custom struct with our desired values
|
||||||
{
|
{
|
||||||
public string name;
|
public string name;
|
||||||
|
public int num;
|
||||||
public string vid;
|
public string vid;
|
||||||
public string pid;
|
public string pid;
|
||||||
public string description;
|
public string description;
|
||||||
|
public Board board;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -414,17 +424,86 @@ namespace SimplySerial
|
|||||||
if (mPID.Success)
|
if (mPID.Success)
|
||||||
c.pid = mPID.Groups[1].Value;
|
c.pid = mPID.Groups[1].Value;
|
||||||
|
|
||||||
|
c.board = MatchBoard(c.vid, c.pid);
|
||||||
|
|
||||||
Match mName = Regex.Match(c.name, namePattern);
|
Match mName = Regex.Match(c.name, namePattern);
|
||||||
if (mName.Success)
|
if (mName.Success)
|
||||||
|
{
|
||||||
c.name = mName.Value;
|
c.name = mName.Value;
|
||||||
|
c.num = int.Parse(c.name.Substring(3));
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
c.name = "COM??";
|
c.name = "COM??";
|
||||||
|
c.num = 0;
|
||||||
|
}
|
||||||
|
|
||||||
return c;
|
return c;
|
||||||
|
|
||||||
}).ToList();
|
}).ToList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct Board
|
||||||
|
{
|
||||||
|
public string pid;
|
||||||
|
public string make;
|
||||||
|
public string model;
|
||||||
|
public bool isCircuitPython;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Vendor
|
||||||
|
{
|
||||||
|
public string vid;
|
||||||
|
public string vendor;
|
||||||
|
public bool isCircuitPython;
|
||||||
|
public List<Board> boards;
|
||||||
|
}
|
||||||
|
|
||||||
|
static List<Vendor> vendors = new List<Vendor>()
|
||||||
|
{
|
||||||
|
new Vendor()
|
||||||
|
{
|
||||||
|
vid = "239A",
|
||||||
|
vendor = "Adafruit",
|
||||||
|
isCircuitPython = true,
|
||||||
|
boards = new List<Board>()
|
||||||
|
{
|
||||||
|
new Board() { pid = "8021", make = "", model = "Metro M4 Express", isCircuitPython = true },
|
||||||
|
new Board() { pid = "802A", make = "Nordic Semiconductor", model = "PCA10059", isCircuitPython = true }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
static Board MatchBoard(string vid, string pid)
|
||||||
|
{
|
||||||
|
Board mBoard = new Board();
|
||||||
|
Vendor mVendor = vendors.Find(v => v.vid == vid);
|
||||||
|
if (mVendor.vid != null)
|
||||||
|
{
|
||||||
|
mBoard = mVendor.boards.Find(b => b.pid == pid);
|
||||||
|
|
||||||
|
if (mBoard.make == "")
|
||||||
|
mBoard.make = mVendor.vendor;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mBoard.pid = pid;
|
||||||
|
mBoard.make = "VID";
|
||||||
|
mBoard.model = "PID";
|
||||||
|
mBoard.isCircuitPython = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mBoard.pid == null)
|
||||||
|
{
|
||||||
|
mBoard.pid = pid;
|
||||||
|
mBoard.make = mVendor.vendor;
|
||||||
|
mBoard.model = "Unknown Model";
|
||||||
|
mBoard.isCircuitPython = mVendor.isCircuitPython;
|
||||||
|
}
|
||||||
|
|
||||||
|
return mBoard;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user