From bf65e0971ee46297b5eddb4e91c20890434599d5 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 May 2013 11:56:25 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=A2=91=E7=8E=87=E9=99=8D=E4=BD=8E=E5=88=B030?= =?UTF-8?q?=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MicroDAQ.smm | Bin 3743 -> 3750 bytes MicroDAQ/MainForm.cs | 2 +- MicroDAQ/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MicroDAQ.smm b/MicroDAQ.smm index a616dd221b49d85061d2a9656d17ddbd38eb823a..12e6f3afc2f243ea3be4fb2ca5be679ee9777ee7 100644 GIT binary patch literal 3750 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 Date: Thu, 30 May 2013 17:44:41 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E2=80=9C=E7=B2=92=E5=AD=90=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E5=99=A8=E6=B5=81=E9=87=8F=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MicroDAQ/DataDisplayForm.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MicroDAQ/DataDisplayForm.cs b/MicroDAQ/DataDisplayForm.cs index 8441d66..4dccc45 100644 --- a/MicroDAQ/DataDisplayForm.cs +++ b/MicroDAQ/DataDisplayForm.cs @@ -88,14 +88,14 @@ meter.State .ToString (), meter.ID.ToString() , meter.Value .ToString () , string.Empty, - "流量", + "粒子计数器流量", meter.State .ToString (), meter.Quality.ToString ()})); else { lsvItems.Items[i - 1].SubItems[0].Text = meter.ID.ToString(); lsvItems.Items[i - 1].SubItems[1].Text = meter.Value.ToString(); - lsvItems.Items[i - 1].SubItems[3].Text = "流量"; + lsvItems.Items[i - 1].SubItems[3].Text = "粒子计数器流量"; lsvItems.Items[i - 1].SubItems[4].Text = meter.State.ToString(); lsvItems.Items[i - 1].SubItems[5].Text = meter.Quality.ToString(); } From 10d2bff193a2e1fec86bdc6035ba8682fc028f37 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 3 Jun 2013 10:26:05 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B430s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MicroDAQ.smm | Bin 3750 -> 3747 bytes MicroDAQ/MicroDAQ.ini | 6 +++--- MicroDAQ/Properties/AssemblyInfo.cs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MicroDAQ.smm b/MicroDAQ.smm index 12e6f3afc2f243ea3be4fb2ca5be679ee9777ee7..fae82f9ec06db359569d9951d111fadf8bb96a5b 100644 GIT binary patch literal 3747 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 G8RGv1irk9; literal 3750 zcmWNTHL}Hs5k+SOUc=<7vY0|K(-SKbGqX}}+k5hHZ8D9WHv7L?Yv33rhtP`eU z+V6`VXI$_&?2m-soIFK|`ZYOHl#nIWJBr)`X}jSst}&3nrY~05xn}DhEw}f^BC(x? z>)NxsLYi^|DtE0h!Qop$$~sLw5`m8Vj1%}K-&)IaAt~@{m3pr=FnA4wu%wo>DC&FX z&zX371%#|Z;CJ$>>N6;2s7+f7NhCMKqETNIlDVac)DO$w8?%g9beHFZXZ~rGeXZvp z{_r|UR>>98h?B)p3rK7N-8NS?b{5h`DQcVxtZH?r2F`M;^tvXJ+e=wax!#ghvsLy&J9oBcHiEe0e0j40NdxO+z$$ zQB*F&*BnAoIyN*a`4*K<^ofzWQ+^8Z2JJ|UBq}tYW3-@GTGc{Mh}s*G;Obi;csRh# zUAk`Fm}-%<8)$T1k!s-6=An0FO-i`^@74=1i&+;@y`Bk4MUO#!4G=gFZa@psYzhrj znt9MS8LByWf?~S8 z0M25xWKv#<_UvkH+lH5223>>$ft}}4$C`fWrkC|%@3<6uXqd{Wl=561JBbj6m6iVh z+%kY6Iww)6NO-d#@;lv=Ao{@1%S1htpN)lI$~eU1O)?yQQhi4RrrSZYm5sgkRFZPI z=A#J9Bq-xrOWx&xEN`%yTI#F8xwo18pw#)U>|8mE0jX||5L%;zU;f*bS;U5I!&%ih zgtNOt1~FB%wRLX57D0@rcpz!C>=>@S%0~M7nwtsQc>l3@8cwP-W;F-M^5@9e+(iGn zJ6+e$&Z}73`&u{zP_P3yQd68hYkAmakxD;h*+F=ws~dWs)-M{fnN3Jz_fpHu$K9%6 z^zTD|8P{=KA1B?LB7;P5=|3u7cFeHj~YT)l$GFEs(OGS{)0{4M~u=#V7f ze&X-2@oR!4oI~G^q%89qJ(w%2WNuYU_js-%o+iKu=ES#OhF zFn)V|4x2wAcwz=fh8%Z3)=c57cUP?#W&Oy9^XjKn$#ZS$wAnsTXJq^xw2uipL-N(vAxv!3j?6^6OX(oz4&unwUtNdk1R~{|m2! z-y$(roL_uGjFr%Zc2?1Vh9R`961?VFTkrm^UoE5c3iW5+`5?QMZAe<3mJ%nVN`;c> z6lFr&p-Ca%k$@0!YRQ!lVVm8x1l6c~;mu>2I;U`2;rn3;^Zr@Jn?R;O=f-B7c z^^7<5Ht@%%;c4wSXIDO$88B&c%Mg1SWX4#V`Xm~qRcO~WX-=|;e?1q+v1SQQkm4`I zlPKQ&jU>AvYD?$0u~k@ns<}thm-XRa$>_6$fCI$WJpW>W&8mgW#JJ&W^khT z^evzK0&cK;tO~sHy7XL#CM#XI(o7zjLZ94f1d|n7auXxAs-28~?82iFg^(~P=brX& z{phmZkY4jMfiK0~DISC^98ZLCX>gk{hxj7~PFtN_{i&tSi6oN%wbkw+)1If}t=u=* zWf+c6w)+D4^a8pIpL=CyvPCCuzddBi_!Uf!CV=UiLIjZ!?WL603YCY?MqlEha@@v2 ztSV%^A(X37Y|5UaMcl%W2zFpoc4}4LTrbXu^oIY;UTsVP^S# zg6p{lf}|7XH`TIfnY~evuB>xlkoutKv?;(dVNN)dp$0rZ&8u=}irDSWYV#F%< zH|t<$RX>>a>ftl6PhP#bw%(J*^K~h}?J&>>F`3zp(p$F}-BCU-ees2d0RfT;;SK1G z#`0f(d*{zmq-v)bzdL3x!ju#ao7COMNT)=ZhC%J Date: Thu, 13 Jun 2013 16:41:25 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=ACAutomatic=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E5=88=B030s=EF=BC=88Ver:1.?= =?UTF-8?q?26.4.3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MicroDAQ/MainForm.cs | 4 ++-- MicroDAQ/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MicroDAQ/MainForm.cs b/MicroDAQ/MainForm.cs index 82fa5c9..2e6156b 100644 --- a/MicroDAQ/MainForm.cs +++ b/MicroDAQ/MainForm.cs @@ -282,8 +282,8 @@ public void start() UpdateCycle = new CycleTask(); RemoteCtrl = new CycleTask(); Program.RemoteCycle = RemoteCtrl; - UpdateCycle.WorkStateChanged += new CycleTask.dgtWorkStateChange(UpdateCycle_WorkStateChanged); - RemoteCtrl.WorkStateChanged += new CycleTask.dgtWorkStateChange(RemoteCtrl_WorkStateChanged); + UpdateCycle.WorkStateChanged += new CycleTask.WorkStateChangeEventHandle(UpdateCycle_WorkStateChanged); + RemoteCtrl.WorkStateChanged += new CycleTask.WorkStateChangeEventHandle(RemoteCtrl_WorkStateChanged); UpdateCycle.Run(update2, System.Threading.ThreadPriority.BelowNormal); RemoteCtrl.Run(remoteCtrl, System.Threading.ThreadPriority.BelowNormal); Start.SetExit = true; diff --git a/MicroDAQ/Properties/AssemblyInfo.cs b/MicroDAQ/Properties/AssemblyInfo.cs index af4b99c..7a0cce9 100644 --- a/MicroDAQ/Properties/AssemblyInfo.cs +++ b/MicroDAQ/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ // // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 方法是按如下所示使用“*”: -[assembly: AssemblyVersion("1.26.4.2")] +[assembly: AssemblyVersion("1.26.4.3")] //[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.26.4.2")] +[assembly: AssemblyFileVersion("1.26.4.3")] From b251c3d1d1363afaebd2a554b76d7be333205313 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 14 Jun 2013 16:26:33 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9SmartInstall=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=AE=89=E8=A3=85=E5=8C=85=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MicroDAQ.smm | Bin 3747 -> 3750 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/MicroDAQ.smm b/MicroDAQ.smm index fae82f9ec06db359569d9951d111fadf8bb96a5b..219db9460a8ead17252a00039f81d19fa99dbf33 100644 GIT binary patch literal 3750 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 I52s822VorHqyPW_ literal 3747 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 G8RGv1irk9; From bc4838e64013c8fc52b475469c83c573dbc6aaaa Mon Sep 17 00:00:00 2001 From: John Date: Fri, 12 Jul 2013 17:33:31 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D0=E4=B8=AA=E7=B2=92?= =?UTF-8?q?=E5=AD=90=E8=AE=A1=E6=95=B0=E5=99=A8=E6=97=B6=E7=9A=84BUG(Ver:?= =?UTF-8?q?=201.26.5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.修复0个粒子计数器时的BUG 2.修复更新过程中未处理异常的BUG. 3.版本号1.26.5 --- MicroDAQ.smm | Bin 3750 -> 3743 bytes MicroDAQ/DataDisplayForm.cs | 32 +++++++++--------- MicroDAQ/MainForm.cs | 38 ++++++++++++++-------- MicroDAQ/Properties/AssemblyInfo.cs | 4 +-- MicroDAQ/Properties/Resources.Designer.cs | 2 +- MicroDAQ/Properties/Settings.Designer.cs | 2 +- 6 files changed, 45 insertions(+), 33 deletions(-) diff --git a/MicroDAQ.smm b/MicroDAQ.smm index 219db9460a8ead17252a00039f81d19fa99dbf33..23a23aeb9b2a845251bc36ac5bce771d267826b7 100644 GIT binary patch literal 3743 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 I52s822VorHqyPW_ diff --git a/MicroDAQ/DataDisplayForm.cs b/MicroDAQ/DataDisplayForm.cs index 4dccc45..8e8e9ec 100644 --- a/MicroDAQ/DataDisplayForm.cs +++ b/MicroDAQ/DataDisplayForm.cs @@ -77,29 +77,29 @@ meter.State .ToString (), lsvItems.Items[i - 1].BackColor = Color.Gold; //Console.WriteLine((item as Meter).ID); } - - if (Program.M_flowAlert.Items != null) - foreach (var item in Program.M_flowAlert.Items) - { - DataItem meter = item as DataItem; - i++; - if (lsvItems.Items.Count < i) - lsvItems.Items.Add(new ListViewItem(new string[]{ + if (Program.M_flowAlert != null) + if (Program.M_flowAlert.Items != null) + foreach (var item in Program.M_flowAlert.Items) + { + DataItem meter = item as DataItem; + i++; + if (lsvItems.Items.Count < i) + lsvItems.Items.Add(new ListViewItem(new string[]{ meter.ID.ToString() , meter.Value .ToString () , string.Empty, "粒子计数器流量", meter.State .ToString (), meter.Quality.ToString ()})); - else - { - lsvItems.Items[i - 1].SubItems[0].Text = meter.ID.ToString(); - lsvItems.Items[i - 1].SubItems[1].Text = meter.Value.ToString(); - lsvItems.Items[i - 1].SubItems[3].Text = "粒子计数器流量"; - lsvItems.Items[i - 1].SubItems[4].Text = meter.State.ToString(); - lsvItems.Items[i - 1].SubItems[5].Text = meter.Quality.ToString(); + else + { + lsvItems.Items[i - 1].SubItems[0].Text = meter.ID.ToString(); + lsvItems.Items[i - 1].SubItems[1].Text = meter.Value.ToString(); + lsvItems.Items[i - 1].SubItems[3].Text = "粒子计数器流量"; + lsvItems.Items[i - 1].SubItems[4].Text = meter.State.ToString(); + lsvItems.Items[i - 1].SubItems[5].Text = meter.Quality.ToString(); + } } - } switch (Program.M.ConnectionState) diff --git a/MicroDAQ/MainForm.cs b/MicroDAQ/MainForm.cs index 2e6156b..b45caab 100644 --- a/MicroDAQ/MainForm.cs +++ b/MicroDAQ/MainForm.cs @@ -204,8 +204,11 @@ private void CreateMeters() Program.M = new DataItemManager("MachineData", h.ToArray(), d.ToArray()); Program.M.Connect("127.0.0.1"); - Program.M_flowAlert = new FlowAlertManager("FlowAlert", h_flow.ToArray(), d_flow.ToArray()); - Program.M_flowAlert.Connect("127.0.0.1"); + if (h_flow.Count > 0) + { + Program.M_flowAlert = new FlowAlertManager("FlowAlert", h_flow.ToArray(), d_flow.ToArray()); + Program.M_flowAlert.Connect("127.0.0.1"); + } } @@ -215,21 +218,30 @@ private void CreateMeters() private void update2() { - foreach (var item in Program.M.Items) + try { - Program.DatabaseManager.UpdateMeterValue(item.ID, (int)item.Type, (int)item.State, (float)item.Value, 0.0f, 0.0f, item.Quality); + foreach (var item in Program.M.Items) + { + Program.DatabaseManager.UpdateMeterValue(item.ID, (int)item.Type, (int)item.State, (float)item.Value, 0.0f, 0.0f, item.Quality); + } + if (Program.M_flowAlert != null) + foreach (var item in Program.M_flowAlert.Items) + { + float t = 0.0f; + if ((item.Value == 0) && ((item.State == DataState.正常) || (item.State == DataState.已启动))) + t = 28.3f; + if (item.Value == 2) + t = 0.0f; + Program.DatabaseManager.UpdateMeterValue(item.ID + 10000, (int)16, (int)item.State, t, 0.0f, 0.0f, item.Quality); + Console.WriteLine(item.ToString()); + } } - foreach (var item in Program.M_flowAlert.Items) + catch + { } + finally { - float t = 0.0f; - if ((item.Value == 0) && ((item.State == DataState.正常) || (item.State == DataState.已启动))) - t = 28.3f; - if (item.Value == 2) - t = 0.0f; - Program.DatabaseManager.UpdateMeterValue(item.ID + 10000, (int)16, (int)item.State, t, 0.0f, 0.0f, item.Quality); - Console.WriteLine(item.ToString()); + Thread.Sleep(30000); } - Thread.Sleep(30000); } int running; public void remoteCtrl() diff --git a/MicroDAQ/Properties/AssemblyInfo.cs b/MicroDAQ/Properties/AssemblyInfo.cs index 7a0cce9..bcd0e3c 100644 --- a/MicroDAQ/Properties/AssemblyInfo.cs +++ b/MicroDAQ/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ // // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 方法是按如下所示使用“*”: -[assembly: AssemblyVersion("1.26.4.3")] +[assembly: AssemblyVersion("1.26.5.0")] //[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.26.4.3")] +[assembly: AssemblyFileVersion("1.26.5.0")] diff --git a/MicroDAQ/Properties/Resources.Designer.cs b/MicroDAQ/Properties/Resources.Designer.cs index 97c9a86..41da1ce 100644 --- a/MicroDAQ/Properties/Resources.Designer.cs +++ b/MicroDAQ/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // 此代码由工具生成。 -// 运行时版本:4.0.30319.296 +// 运行时版本:4.0.30319.1008 // // 对此文件的更改可能会导致不正确的行为，并且如果 // 重新生成代码，这些更改将会丢失。 diff --git a/MicroDAQ/Properties/Settings.Designer.cs b/MicroDAQ/Properties/Settings.Designer.cs index 879f292..d9fe3f7 100644 --- a/MicroDAQ/Properties/Settings.Designer.cs +++ b/MicroDAQ/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // 此代码由工具生成。 -// 运行时版本:4.0.30319.296 +// 运行时版本:4.0.30319.1008 // // 对此文件的更改可能会导致不正确的行为，并且如果 // 重新生成代码，这些更改将会丢失。 From 22dc82aebeb47bd7b5f1ad8a9b8c07543df820a0 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 29 Jul 2013 11:14:18 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9DLL=E5=BC=95=E7=94=A8?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0debug=E8=BF=90=E8=A1=8C=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.修改Automatic.dll，JonLibrary.dll，OpcRcw.Comn.dll，OpcRcw.Da.dll的引用 2.可在启动参数中使用debug参数 --- MicroDAQ/MicroDAQ.csproj | 20 ++++++++------------ MicroDAQ/Program.cs | 22 ++++++++++++++++++++++ MicroDAQ/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/MicroDAQ/MicroDAQ.csproj b/MicroDAQ/MicroDAQ.csproj index d33bb0a..a8e882d 100644 --- a/MicroDAQ/MicroDAQ.csproj +++ b/MicroDAQ/MicroDAQ.csproj @@ -62,23 +62,19 @@ MicroDAQ.Program - - False - bin\Release\Automatic.dll + + ..\..\..\Project\JonLibrary\Automatic\bin\Release\Automatic.dll - - False - bin\Release\JonLibrary.dll + + ..\..\..\Project\JonLibrary\JonLibrary\bin\Release\JonLibrary.dll - - False + + ..\..\..\Project\JonLibrary\JonLibrary\bin\Release\OpcRcw.Comn.dll True - bin\Release\OpcRcw.Comn.dll - - False + + ..\..\..\Project\JonLibrary\JonLibrary\bin\Release\OpcRcw.Da.dll True - bin\Release\OpcRcw.Da.dll diff --git a/MicroDAQ/Program.cs b/MicroDAQ/Program.cs index bafec96..4f614d9 100644 --- a/MicroDAQ/Program.cs +++ b/MicroDAQ/Program.cs @@ -25,6 +25,28 @@ static void Main(string[] args) break; } + } + #endregion + + #region 处理来自参数的调整模式请求，不使用错误捕获和重新启动 + foreach (string arg in args) + { + if (arg.Contains("debug")) + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + + Form MainForm = null; + while (!BeQuit) + { + MainForm = new MainForm(); + Application.Run(MainForm); + if (MainForm != null) MainForm.Dispose(); + } + Environment.Exit(Environment.ExitCode); + break; + } + } #endregion bool createNew; diff --git a/MicroDAQ/Properties/AssemblyInfo.cs b/MicroDAQ/Properties/AssemblyInfo.cs index bcd0e3c..859e591 100644 --- a/MicroDAQ/Properties/AssemblyInfo.cs +++ b/MicroDAQ/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ // // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 方法是按如下所示使用“*”: -[assembly: AssemblyVersion("1.26.5.0")] +[assembly: AssemblyVersion("1.26.6.0")] //[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.26.5.0")] +[assembly: AssemblyFileVersion("1.26.6.0")] From ffe864a4f8e8139d84df58d706d0355009c92411 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 23 Aug 2013 16:17:59 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=8E=BB=E9=99=A430s=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=97=B4=E9=9A=94(Ver:1.26.6.4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MicroDAQ.smm | Bin 3743 -> 3749 bytes MicroDAQ/MainForm.cs | 2 +- MicroDAQ/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MicroDAQ.smm b/MicroDAQ.smm index 23a23aeb9b2a845251bc36ac5bce771d267826b7..d015746869648736e6528faf6a5b19e35cbbebe0 100644 GIT binary patch literal 3749 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 JL`QLE_z!6y>LUOE literal 3743 zcmWMpHO|Hg4tyurGrT_1hN%oQbGk4ye$gI&e|K)Ik;mh)y(!zzf0g+-vvK^_$cAeF z*WQ=DD$alJ|Dyl<&p-bl5WP=rz5k#@7%IIB3#Tb{2#iDzm4$RlmYr4W{1TBKn)joH zv%+ljvAK5ExiyzQt64J|%2pHH6!u|IDxBm_ zmzIOfWh}QGvxDTB23%U4CR^iFDsK;0*?6i3IGKGMx5r3`4!!b+$s>T&w!Sg8G>0X9 z8SB)_69s1_7^b#_%|>i$kC)`Wz)p@e>6JVR!i&G(+(p?E(kH;%=4$p825ZLkp@d9lZhZbPshaw5or_9|U zYYFH;m19{fZo8~Vm>rqc0rgO;;o&K6pjkb(997@#S|CvzT_1d4p?ti#Q~7vo+>VHv z7`X}Wp1`r%I&ORV|Nh%x7 z0#Z$*n^bQcQ~ko+{3|4-uojva|8DUS>mW6l7DwJ@yDnzOV!owMk(zu0Da!z|OZs+0 zbi4uZeK_AG=OWtWu_?bQVxZ{i#+9D=OqJt2Q(uH5sr9%TnT1oR^_3F(kkN*nsn?w~ zrv8Y{#B;p$^y80)`AOhn3-V9i_-=K0)h9;Umpd$LOVokFE|z{%*olOe9%TLO0d<|y zOs6NC0QCk-7E0up-;$wlMqPoqX+F4?5ZCZb zdqDeIIU$S)7etNuHd5#q%>xiZqT!?R>yu>7{@NNawq&kFpX($m8kI1aB*7Dgn%);} zp?j#4Yz}Org<3(@#-c<DwV$`@e1toI@(*_{biZ6xfh5dyA|gevi>~=|XTN zLxek6@Ha(dN=TsGkWlvllD3=nruRN0q8>uA42A4mn+FG#Prqba_o*5(wxA43*-o=s zIm&q^U&c)CLE8xzRT!I${YGFRD??W938B{zZ(3sFBk|PV{GCGan}`y*YV+Zove13A z+2*TW$$i6L+eeReQaLVL%gOS+7`q*pikD3WnG?K$dfpchp_XPY;6ZWfcKEBtYo6Tm z2^#}9lb5ZF)drcb z1N_9?ykeo&d2EH>vYEFtk;WF&T@>4HmR_s1P` za&0iM@HCYCfrc`6cTRvna2@$*>im=^-d4hCh#S*wSFXsKPg}qv#_f^O@=o-0h*@rr zXfFA!F{foyD_c%rM&`rXr^MOMrAz1_)V6>nca&fjie=xIqypF{3ox$=>LcWeVztgn z)K5R|@b0O;aH3(YqZ$;dyKTPSr3E>}z=^64n)95KeZz*QoGa4osj2Z?S(Em#)n?ZT ztJ0mS&`JHuzgdSfgw=Hh6}i}_1Oy4|9hBvI{plr-$6sb{fPE`vl2{#clPu?y4C`H# zU=lb1ezLCpfsFw@TG@3{R%=XvD^es8%7{MDVmovDomc#B2fpeS`hZWvPA;{DxfkxTb7;`WypA(hzs0<;K14Ri50Ds#!8e zsxX?n(*IUJoN6y|4cs{!t|ospdxy)cD@Fb>MzcT z@)se{krur=YrJtgc#Fp(m!gD59(|K2HDY_R<~x4G5}c16A1_#Gk4z zQ*2)|f+!NDs_<>ge5R_aWIJ-ziK*Ye>SbGg(O6bLoN3i2NJ5BodWa z_@+UsY#b#pAl({zbIf9H4Gi~PaxW6eh!(9#nvjilN|Yy2>3H6B$0XX7R@*Jq|EO*f zOqUr-dW@TbvNwl0I=Dije8l6$exA?f@y73K+Ax`s&(RBrh44-%=F3nE6pnk;4M!dC zd(euIdMz+PElDGBbvi4whd>OuJn7Hi((~=}bPC}H5doZn2mN>hR6hf~A!;{ff-{ge zIGLg}=Yri?bF<3mk@1XRbM@g`<3shFSaq(V^4mCrqpvxDrd<#=+4a0`f+LM8%i%Wv zB^ejj{XPr=5%wFo3c}WXm!c1CL)npTJD;I)XWTfW;)i2~#dO&@tX(Q*K+}+HzST#R z(}zQ@a2>GIE#4&g8uh-0S@JUqe