From 3d1bc8ebb9c2a1df808c357b028aad4064b7f6f2 Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Thu, 8 Oct 2015 18:30:12 +0200 Subject: [PATCH] Bugfixes --- .../ClientApplicatie.Designer.cs | 3 +-- .../ErgometerApplication/ClientApplicatie.cs | 18 ++++++++++++++---- .../ErgometerApplication.vshost.exe.manifest | 11 ----------- .../bin/Debug/ErgometerLibrary.dll | Bin 16384 -> 17920 bytes 4 files changed, 15 insertions(+), 17 deletions(-) delete mode 100644 ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.vshost.exe.manifest diff --git a/ErgometerApplication/ErgometerApplication/ClientApplicatie.Designer.cs b/ErgometerApplication/ErgometerApplication/ClientApplicatie.Designer.cs index 53adc8c..2185151 100644 --- a/ErgometerApplication/ErgometerApplication/ClientApplicatie.Designer.cs +++ b/ErgometerApplication/ErgometerApplication/ClientApplicatie.Designer.cs @@ -57,7 +57,7 @@ namespace ErgometerApplication // // updateTimer // - this.updateTimer.Interval = 350; + this.updateTimer.Interval = 800; this.updateTimer.Tick += new System.EventHandler(this.updateTimer_Tick); // // panelClientContainer @@ -176,7 +176,6 @@ namespace ErgometerApplication #endregion private System.Windows.Forms.Timer updateTimer; - private System.Windows.Forms.Timer writeTimer; private System.Windows.Forms.Panel panelClientContainer; private PanelClientChat panelClientChat; private PanelGraphView panelGraphView; diff --git a/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs b/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs index bc4f7f8..19e2004 100644 --- a/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs +++ b/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs @@ -53,10 +53,20 @@ namespace ErgometerApplication } if (password.Length >= 8) { - MainClient.Connect(SerialPort.GetPortNames()[0], username, password); - panelClientContainer.BringToFront(); - this.labelUsername.Text = panelLogin.textBoxUsername.Text; - panelTopBar.Visible = true; + /* + if(SerialPort.GetPortNames().Length <= 0) + { + panelLogin.lblVerification.Text = "De Ergometer is niet gevonden."; + panelLogin.lblVerification.ForeColor = Color.Red; + panelLogin.lblVerification.Visible = true; + } + else + { */ + MainClient.Connect(SerialPort.GetPortNames()[0], username, password); + panelClientContainer.BringToFront(); + this.labelUsername.Text = panelLogin.textBoxUsername.Text; + panelTopBar.Visible = true; + //} } } else diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.vshost.exe.manifest b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.vshost.exe.manifest deleted file mode 100644 index 061c9ca..0000000 --- a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.vshost.exe.manifest +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll index 728e1976bb0b721061bcba5eefc7587f420813b8..46d1c577ca4e5ba65baae29340e6bdf3c4a66531 100644 GIT binary patch delta 7237 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 F{~s|WyMzD$ delta 6084 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