Skip to content

G
GC_Branch
Commit 9de2ecab authored by wangwanxh@sina.com's avatar wangwanxh@sina.com
Browse files
Options

14

parent 017b67c6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
GcDevicePc/MDIBase.cs
View file @ 9de2ecab
...@@ -2091,12 +2091,14 @@ namespace GcDevicePc ...@@ -2091,12 +2091,14 @@ namespace GcDevicePc
{ {
SharedSpace.MControl.SetOut = false; SharedSpace.MControl.SetOut = false;
SharedSpace.MControl.SetRun = false; SharedSpace.MControl.SetRun = false;
SharedSpace.Data.typesint = 0;
Trace.WriteLine("强制校准结束", "sys"); Trace.WriteLine("强制校准结束", "sys");
} }
if (SharedSpace.MControl.MethodType == 2) if (SharedSpace.MControl.MethodType == 2)
{ {
SharedSpace.MControl.SetOut = false; SharedSpace.MControl.SetOut = false;
SharedSpace.MControl.SetRun = false; SharedSpace.MControl.SetRun = false;
SharedSpace.Data.typesint = 0;
Trace.WriteLine("强制校准结束", "sys"); Trace.WriteLine("强制校准结束", "sys");
} }
......
SharedSpace/Data.cs
View file @ 9de2ecab
...@@ -23,9 +23,8 @@ namespace SharedSpace ...@@ -23,9 +23,8 @@ namespace SharedSpace
/// </summary> /// </summary>
public static bool ReadChange = false; public static bool ReadChange = false;
/// <summary> /// <summary>
/// 自动校准 0 正常采样 1 校准开始 2 校准中 3 以校准 /// 自动校准 0 正常采样 1 手动 2 定时 3 校准成功 4 校准失败
/// </summary> /// /// </summary>
public static int typesint = 0; public static int typesint = 0;
/// <summary> /// <summary>
/// 二次校准系数 /// 二次校准系数
......
dll/CKVocAnalyzer.dll
View file @ 9de2ecab
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment