Skip to content

Commit 22f572e

Browse files
authored
Merge pull request #1 from lucidcode/feature/com-port-data
Add COM port data output
2 parents 9282d10 + aa27d72 commit 22f572e

6 files changed

Lines changed: 127 additions & 18 deletions

File tree

ESP-SPO2/PluginHandler.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.IO.Ports;
3+
using System.Threading;
34
using System.Windows.Forms;
45

56
namespace lucidcode.LucidScribe.Plugin.ESPSPO2
@@ -33,11 +34,13 @@ public static class Device
3334
public static EventHandler<EventArgs> BpmChanged;
3435
public static EventHandler<EventArgs> AvgBpmChanged;
3536

37+
public static PortForm formPort;
38+
3639
public static Boolean Initialize()
3740
{
3841
if (!Initialized & !InitError)
3942
{
40-
PortForm formPort = new PortForm();
43+
formPort = new PortForm();
4144
if (formPort.ShowDialog() == DialogResult.OK)
4245
{
4346
try
@@ -46,6 +49,9 @@ public static Boolean Initialize()
4649
BlinkInterval = formPort.BlinkInterval / 10;
4750
Threshold = formPort.Threshold;
4851

52+
formPort = new PortForm();
53+
formPort.Show();
54+
4955
// Open the COM port
5056
serialPort = new SerialPort(formPort.SelectedPort);
5157
serialPort.BaudRate = 9600;
@@ -83,6 +89,7 @@ static void serialPort_DataReceived(object sender, SerialDataReceivedEventArgs e
8389
try
8490
{
8591
var data = serialPort.ReadExisting();
92+
formPort.UpdateData(data);
8693
var lines = data.Split(new string[] { "\r\n" }, StringSplitOptions.None);
8794

8895
foreach (var line in lines)

ESP-SPO2/PortForm.Designer.cs

Lines changed: 91 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ESP-SPO2/PortForm.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,18 @@ private void LoadPortList()
6868
}
6969
}
7070

71+
public void UpdateData(string data)
72+
{
73+
if (dataTextbox.InvokeRequired)
74+
{
75+
dataTextbox.BeginInvoke((MethodInvoker)delegate () { dataTextbox.Text = data; });
76+
}
77+
else
78+
{
79+
dataTextbox.Text = data;
80+
}
81+
}
82+
7183
private void LoadSettings()
7284
{
7385
XmlDocument xmlSettings = new XmlDocument();

ESP-SPO2/PortForm.resx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
129129
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
130130
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACW
131-
DQAAAk1TRnQBSQFMAwEBAAGYAQABmAEAAR8BAAEcAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABfAMA
131+
DQAAAk1TRnQBSQFMAwEBAAGgAQABoAEAAR8BAAEcAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABfAMA
132132
ARwDAAEBAQABGAUAAbABKBIAXf//ABgABv8B6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHW
133133
AccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHW
134134
AccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6QHWAccB6AHX
@@ -206,6 +206,15 @@
206206
4uxXeyAMjoP+CfAywr8nANuvY+xV9TYfNFnknNs5SfSmPUGMcagWBhzAv6I8gWQQ6E2zgIjMAoNAIwWS
207207
QGcLgmkChKwJAIJcpoADegefBasdyLAr0LAATVbxt94+w4IVrwL5oldPdwg3iMmQQVoyy6oAAAAASUVO
208208
RK5CYII=
209+
</value>
210+
</data>
211+
<data name="label10.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
212+
<value>
213+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
214+
vAAADrwBlbxySQAAAJdJREFUOE+dkMENwCAIRT24UXdip948dBzvjmPzrSSIYGtfQkws/0kJK0opNaWr
215+
4uxXeyAMjoP+CfAywr8nANuvY+xV9TYfNFnknNs5SfSmPUGMcagWBhzAv6I8gWQQ6E2zgIjMAoNAIwWS
216+
QGcLgmkChKwJAIJcpoADegefBasdyLAr0LAATVbxt94+w4IVrwL5oldPdwg3iMmQQVoyy6oAAAAASUVO
217+
RK5CYII=
209218
</value>
210219
</data>
211220
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

ESP-SPO2/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("1.0.1.0")]
36+
[assembly: AssemblyFileVersion("1.0.1.0")]

Installer/Lucid Scribe ESP-SPO2.vdproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
{
171171
"Name" = "8:.NET Framework"
172172
"Message" = "8:[VSDNETMSG]"
173-
"FrameworkVersion" = "8:3.5.30729 "
173+
"FrameworkVersion" = "8:3.5.30729 "
174174
"AllowLaterVersions" = "11:FALSE"
175175
"InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=76617"
176176
}
@@ -411,15 +411,15 @@
411411
{
412412
"Name" = "8:Microsoft Visual Studio"
413413
"ProductName" = "8:Lucid Scribe ESP-SPO2"
414-
"ProductCode" = "8:{5B024ECE-B4FE-4886-9CEC-6BA435EEAFD8}"
415-
"PackageCode" = "8:{FED646A0-1C58-4177-9EA5-96071D6CA739}"
414+
"ProductCode" = "8:{318E84D7-A6D3-49DE-918F-AD08571CE1E6}"
415+
"PackageCode" = "8:{ACAB95E7-CDBC-42D6-A7C9-FE115AAC9007}"
416416
"UpgradeCode" = "8:{59032C20-F059-4DA7-8D8B-462C04007A63}"
417417
"AspNetVersion" = "8:4.0.30319.0"
418418
"RestartWWWService" = "11:FALSE"
419419
"RemovePreviousVersions" = "11:TRUE"
420420
"DetectNewerInstalledVersion" = "11:TRUE"
421421
"InstallAllUsers" = "11:TRUE"
422-
"ProductVersion" = "8:1.0.0"
422+
"ProductVersion" = "8:1.0.1"
423423
"Manufacturer" = "8:lucidcode"
424424
"ARPHELPTELEPHONE" = "8:"
425425
"ARPHELPLINK" = "8:http://www.lucid-code.com/Support"

0 commit comments

Comments
 (0)