Version 9.0.2202.0701

http://gurux.fi/node/19647
capriusbai · Feb 7, 2022 · fe09c09 · fe09c09
1 parent fab9fdf
commit fe09c09
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Development/ConformanceTests/GXConformanceTests.cs b/Development/ConformanceTests/GXConformanceTests.cs
@@ -207,8 +207,6 @@ private static void Execute(
             GXDLMSObject obj;
             foreach (GXMacro macro in macros)
             {
-                //test.OnProgress(test, "Testing " + m.Name, ++i, cnt);
-                //                lastExternalException = null;
                 List<KeyValuePair<ObjectType, string>> succeeded = new List<KeyValuePair<ObjectType, string>>();
                 if (settings.Delay.TotalSeconds != 0)
                 {
@@ -218,6 +216,9 @@ private static void Execute(
                 {
                     case UserActionType.None:
                         throw new Exception("Invalid macro type.");
+                    case UserActionType.Delay:
+                        Thread.Sleep(int.Parse(macro.Value));
+                        break;
                     case UserActionType.Connect:
                         break;
                     case UserActionType.Disconnecting:

diff --git a/Development/Macro/GXMacroEditor.cs b/Development/Macro/GXMacroEditor.cs
@@ -41,6 +41,7 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
+using System.Threading;
 using System.Windows.Forms;
 using System.Xml;
 using System.Xml.Serialization;
@@ -738,6 +739,9 @@ private void Run(System.Collections.IList items, List<GXMacro> macros)
                                 case UserActionType.Action:
                                     m_OnAction(macro);
                                     break;
+                                case UserActionType.Delay:
+                                    Thread.Sleep(int.Parse(macro.Value));
+                                    break;
                                 default:
                                     break;
                             }