allow to define waitTime for locomotive in reached blocks #107 (#108)

Co-authored-by: Christian Benjamin Ries <c.ries@beckhoff.com>
cbries · Apr 16, 2021 · 060b0ec · 060b0ec
1 parent 1288913
commit 060b0ec
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 5 deletions.
diff --git a/EcosApp/railessentials.min.js b/EcosApp/railessentials.min.js
diff --git a/railessentials/AutoMode/AutoMode.cs b/railessentials/AutoMode/AutoMode.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using ecoslib.Entities;
+using ecoslib.Utilities.Commands;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using railessentials.Analyzer;
@@ -30,7 +31,6 @@ namespace railessentials.AutoMode
 
     public partial class AutoMode
     {
-        public const int RunPauseForBlockSeconds = 10;
         private const int RunDelayBetweenChecksMsecs = 2500;
 
         public event AutoModeStarted Started;
@@ -53,6 +53,40 @@ public partial class AutoMode
         private readonly object _autoModeTasksLock = new();
         private readonly List<AutoModeTaskCore> _autoModeTasks = new();
 
+        private readonly Random _random = new Random();
+
+        internal static int GetSecondsToWaitFallback()
+        {
+            return 10;
+        }
+
+        internal int GetSecondsToWait()
+        {
+            var cfg = _ctx?._cfg?.Cfg;
+            if (cfg == null) return GetSecondsToWaitFallback();
+
+            if (cfg?.OccWait?.WaitModeStatic != null)
+            {
+                if (cfg.OccWait.WaitModeStatic.Enabled)
+                {
+                    return cfg.OccWait.WaitModeStatic.Seconds;
+                }
+            }
+
+            if (cfg?.OccWait?.WaitModeRandom != null)
+            {
+                if (cfg.OccWait.WaitModeRandom.Enabled)
+                {
+                    return _random.Next(
+                        cfg.OccWait.WaitModeRandom.SecondsMin,
+                        cfg.OccWait.WaitModeRandom.SecondsMax
+                        );
+                }
+            }
+
+            return GetSecondsToWaitFallback();
+        }
+
         internal ClientHandler.ClientHandler GetClientHandler()
         {
             return _ctx;

diff --git a/railessentials/AutoMode/AutoModeTaskBase.cs b/railessentials/AutoMode/AutoModeTaskBase.cs
@@ -381,7 +381,10 @@ await DecelerateLocomotive(Route.Locomotive, maxSecsToStop: (int)durationSeconds
                 Ctx?.ResetRouteFor(Route.LocomotiveObjectId);
                 Route.OccBlock.FromBlock = finalBlock;
                 Route.OccBlock.ReachedTime = DateTime.Now;
-                Route.OccBlock.SecondsToWait = AutoMode.RunPauseForBlockSeconds;
+                if (Ctx != null)
+                    Route.OccBlock.SecondsToWait = Ctx.GetSecondsToWait();
+                else
+                    Route.OccBlock.SecondsToWait = AutoMode.GetSecondsToWaitFallback();
                 Ctx?.SaveOccAndPromote();
 
                 if (IsCanceled()) return;

diff --git a/railessentials/ClientHandler/ClientHandler.cs b/railessentials/ClientHandler/ClientHandler.cs
@@ -36,7 +36,7 @@ public class ClientHandlerCfg
 
     public partial class ClientHandler
     {
-        private ClientHandlerCfg _cfg;
+        internal ClientHandlerCfg _cfg;
         internal Sniffer _sniffer;
         private JArray _themeData;
         internal Metadata _metadata;

diff --git a/railessentials/Configuration.cs b/railessentials/Configuration.cs
@@ -27,6 +27,9 @@ public class Configuration
         public bool SaveOnEveryPlanfieldChange { get; set; } = false;
         public int InitializeDelay { get; set; } = 500;
 
+        [JsonProperty(PropertyName = "Occ")]
+        public OccWaitModes OccWait { get; set; } = new();
+
         private static string _cfgPath;
 
         public static Configuration Load(string pathToCfg, out string errorMessage)
@@ -116,6 +119,25 @@ public void UpdateWebcam(JObject obj)
         }
     }
 
+    public class OccWaitModeStatic
+    {
+        public bool Enabled { get; set; } = true;
+        public int Seconds { get; set; } = 10;
+    }
+
+    public class OccWaitModeRandom
+    {
+        public bool Enabled { get; set; } = false;
+        public int SecondsMin { get; set; } = 5;
+        public int SecondsMax { get; set; } = 15;
+    }
+
+    public class OccWaitModes
+    {
+        public OccWaitModeStatic WaitModeStatic { get; set; } = new();
+        public OccWaitModeRandom WaitModeRandom { get; set; } = new();
+    }
+
     public class ConfigurationEcos
     {
         public string Ip { get; set; }

diff --git a/railessentials/railessentials.json b/railessentials/railessentials.json
@@ -38,5 +38,16 @@
     "PlanBackground": "rgba(243,243,243,1)"
   },
   "SaveOnEveryPlanfieldChange": true,
-  "InitializeDelay": 500
+  "InitializeDelay": 500,
+  "Occ": {
+    "WaitModeStatic": {
+      "Enabled": false,
+      "Seconds": 9
+    },
+    "WaitModeRandom": {
+      "Enabled": true,
+      "SecondsMin": 4,
+      "SecondsMax": 14
+    }
+  }
 }