[chronojump] Fixing Auto detect on Windows
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixing Auto detect on Windows
- Date: Mon, 11 May 2015 15:34:08 +0000 (UTC)
commit 6da7933def531c5284c0ce6f6f5d4ff00981d96e
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon May 11 17:33:33 2015 +0200
Fixing Auto detect on Windows
src/chronopicDetect.cs | 6 ++++--
src/gui/chronojump.cs | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/chronopicDetect.cs b/src/chronopicDetect.cs
index 43321bf..1749341 100644
--- a/src/chronopicDetect.cs
+++ b/src/chronopicDetect.cs
@@ -34,6 +34,7 @@ public class ChronopicDetect
private static bool cancel;
private static bool needToChangeProgressbarText;
+ private SerialPort sp;
public bool Detecting; //used to block closing chronojump window if true
public string Detected; //readed from chronojump window
@@ -42,8 +43,9 @@ public class ChronopicDetect
public Gtk.Button FakeButtonDone;
- public ChronopicDetect (Gtk.ProgressBar progressbar, Gtk.Button button_cancel, Gtk.Button button_info)
+ public ChronopicDetect (SerialPort sp, Gtk.ProgressBar progressbar, Gtk.Button button_cancel,
Gtk.Button button_info)
{
+ this.sp = sp;
this.progressbar = progressbar;
this.button_cancel = button_cancel;
this.button_info = button_info;
@@ -108,7 +110,6 @@ public class ChronopicDetect
}
private static Chronopic cpDoing;
- private static SerialPort sp;
private static Chronopic.Plataforma platformState; //on (in platform), off (jumping), or unknow
private void connectNormal(string myPort)
@@ -120,6 +121,7 @@ public class ChronopicDetect
string message = "";
bool success = false;
connectedNormalChronopic = chronopicInit.Do(1, out cpDoing, out sp, platformState, myPort,
out message, out success);
+ LogB.Information(message);
LogB.Debug("connectNormal end");
}
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index e4f41e7..acd3d05 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -2926,6 +2926,7 @@ public partial class ChronoJumpWindow
viewport_chronopic_encoder.Visible = false;
cpDetect = new ChronopicDetect(
+ chronopicWin.SP,
progressbar_chronopic_encoder_detecting,
button_chronopic_encoder_detecting_cancel,
button_chronopic_encoder_detecting_info
@@ -2940,6 +2941,7 @@ public partial class ChronoJumpWindow
viewport_chronopics.Visible = false;
cpDetect = new ChronopicDetect(
+ chronopicWin.SP,
progressbar_chronopic_detecting,
button_chronopic_detecting_cancel,
button_chronopic_detecting_info
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]