mirror/SimplySerial
1
0
Fork 0
mirror of https://github.com/fasteddy516/SimplySerial.git synced 2024-11-14 14:04:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

implemented loading of boards.json from application installation path

Browse Source
This commit is contained in:
Edward Wright 2021-10-27 23:46:04 -04:00
parent 68f839f002
commit 9aef1260d6
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
SimplySerial/SimplySerial.cs
View File

@ -32,6 +32,7 @@ namespace SimplySerial
public static extern uint GetLastError(); public static extern uint GetLastError();
static string appFolder = AppDomain.CurrentDomain.BaseDirectory; static string appFolder = AppDomain.CurrentDomain.BaseDirectory;
static BoardData boardData;
static List<ComPort> availablePorts = new List<ComPort>(); static List<ComPort> availablePorts = new List<ComPort>();
static SerialPort serialPort; static SerialPort serialPort;
@ -81,6 +82,9 @@ namespace SimplySerial
// if the above fails, it doesn't really matter - it just means escape sequences won't process nicely // if the above fails, it doesn't really matter - it just means escape sequences won't process nicely
} }
// load and parse data in boards.json
LoadBoards();
// process all command-line arguments // process all command-line arguments
ProcessArguments(args); ProcessArguments(args);
@ -579,8 +583,6 @@ namespace SimplySerial
} }
// TODO: Display board.json version (or note if file could not be found)
/// <summary> /// <summary>
/// Displays help information about this application and its command-line arguments /// Displays help information about this application and its command-line arguments
/// </summary> /// </summary>
@ -598,6 +600,7 @@ namespace SimplySerial
Console.WriteLine($"\n<<< SimplySerial v{version} ({installType} Installation) >>>\n"); Console.WriteLine($"\n<<< SimplySerial v{version} ({installType} Installation) >>>\n");
Console.WriteLine($"Installation Path:\n\t{appFolder}\n"); Console.WriteLine($"Installation Path:\n\t{appFolder}\n");
Console.WriteLine($"Board Data File Version: {boardData.version}\n");
Console.WriteLine("Usage: ss.exe [-com:PORT] [-baud:RATE] [-parity:PARITY] [-databits:VAL]"); Console.WriteLine("Usage: ss.exe [-com:PORT] [-baud:RATE] [-parity:PARITY] [-databits:VAL]");
Console.WriteLine(" [-stopbits:VAL] [-autoconnect:VAL] [-log:LOGFILE] [-logmode:MODE]"); Console.WriteLine(" [-stopbits:VAL] [-autoconnect:VAL] [-log:LOGFILE] [-logmode:MODE]");
Console.WriteLine(" [-quiet]\n"); Console.WriteLine(" [-quiet]\n");
@ -735,9 +738,6 @@ namespace SimplySerial
return detectedPorts; return detectedPorts;
} }
// TODO: Replace temporary JSON code with file-based 'board.json'
private const string board_json = "{\"version\":\"2021-10-25T08:05:42.065255\",\"vendors\":[{\"vid\":\"239A\",\"make\":\"Adafruit\"}],\"boards\":[{\"vid\":\"0403\",\"pid\":\"6015\",\"make\":\"FTDI\",\"model\":\"Thunderlinx\"},{\"vid\":\"239A\",\"pid\":\"80CC\",\"make\":\"Adafruit\",\"model\":\"QT Py M0\"}]}";
static BoardData boardData = JsonConvert.DeserializeObject<BoardData>(board_json);
/// <summary> /// <summary>
/// Matches to a known development board based on VID and PID /// Matches to a known development board based on VID and PID
@ -747,19 +747,40 @@ namespace SimplySerial
/// <returns>Board structure containing information about the matched board, or generic values otherwise/returns> /// <returns>Board structure containing information about the matched board, or generic values otherwise/returns>
static Board MatchBoard(string vid, string pid) static Board MatchBoard(string vid, string pid)
{ {
Board mBoard = boardData.boards.Find(b => (b.vid == vid) && (b.pid == pid)); Board mBoard = null;
if (boardData.boards != null)
mBoard = boardData.boards.Find(b => (b.vid == vid) && (b.pid == pid));
if (mBoard == null) if (mBoard == null)
{ {
mBoard = new Board(vid:vid, pid:pid); mBoard = new Board(vid:vid, pid:pid);
Vendor mVendor = boardData.vendors.Find(v => v.vid == vid); Vendor mVendor = null;
if (boardData.vendors != null)
mVendor = boardData.vendors.Find(v => v.vid == vid);
if (mVendor != null) if (mVendor != null)
mBoard.make = mVendor.make; mBoard.make = mVendor.make;
} }
return mBoard; return mBoard;
} }
static void LoadBoards()
{
try
{
using (StreamReader r = new StreamReader($"{appFolder}\\boards.json"))
{
string json = r.ReadToEnd();
boardData = JsonConvert.DeserializeObject<BoardData>(json);
}
}
catch (Exception e)
{
boardData = new BoardData();
boardData.version = "(boards.json is missing or invalid)";
}
}
} }