Merge branch 'v3.5-dev' of https://github.com/Duet3D/DuetSoftwareFram…

…ework into v3.5-dev
Duet3D · Mar 1, 2024 · d951dc3 · d951dc3
2 parents 8951972 + d901139
commit d951dc3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 2 deletions.
diff --git a/pkg/common/duetcontrolserver/opt/dsf/conf/config.json b/pkg/common/duetcontrolserver/opt/dsf/conf/config.json
@@ -141,7 +141,7 @@
   ],
   "PrintTimeFilters": [
     {
-      "Pattern": "estimated printing time .*= ((?<h>(\\d+))h\\s*)?((?<m>(\\d+))m\\s*)?((?<s>(\\d+))s)?",
+      "Pattern": "estimated printing time .*= ((?<d>(\\d+))d\\s*)?((?<h>(\\d+))h\\s*)?((?<m>(\\d+))m\\s*)?((?<s>(\\d+))s)?",
       "Options": 17
     },
     {

diff --git a/src/DuetAPI/ObjectModel/Boards/Board.cs b/src/DuetAPI/ObjectModel/Boards/Board.cs
@@ -143,6 +143,16 @@ public string? IapFileNameSD
         }
         private string? _iapFileNameSD;
 
+        /// <summary>
+        /// Information about an inductive sensor or null if not present
+        /// </summary>
+        public InductiveSensor? InductiveSensor
+        {
+            get => _inductiveSensor;
+            set => SetPropertyValue(ref _inductiveSensor, value);
+        }
+        private InductiveSensor? _inductiveSensor;
+
         /// <summary>
         /// Maximum number of heaters this board can control
         /// </summary>

diff --git a/src/DuetAPI/ObjectModel/Boards/InductiveSensor.cs b/src/DuetAPI/ObjectModel/Boards/InductiveSensor.cs
@@ -0,0 +1,10 @@
+namespace DuetAPI.ObjectModel
+{
+    /// <summary>
+    /// Information about an inductive sensor
+    /// </summary>
+    public class InductiveSensor : ModelObject
+    {
+        // still empty
+    }
+}
diff --git a/src/DuetControlServer/Files/InfoParser.cs b/src/DuetControlServer/Files/InfoParser.cs
@@ -461,6 +461,9 @@ private static bool FindPrintTime(string line, ref GCodeFileInfo fileInfo)
                         {
                             switch (grp.Name)
                             {
+                                case "d":
+                                    seconds += (long)Math.Round(printTime) * 86400L;
+                                    break;
                                 case "h":
                                     seconds += (long)Math.Round(printTime) * 3600L;
                                     break;
@@ -503,6 +506,9 @@ private static bool FindSimulatedTime(string line, ref GCodeFileInfo fileInfo)
                         {
                             switch (grp.Name)
                             {
+                                case "d":
+                                    seconds += simulatedTime * 86400;
+                                    break;
                                 case "h":
                                     seconds += simulatedTime * 3600;
                                     break;

diff --git a/src/DuetControlServer/Settings.cs b/src/DuetControlServer/Settings.cs
@@ -333,7 +333,7 @@ public static class Settings
         /// </summary>
         public static List<Regex> PrintTimeFilters { get; set; } = new()
         {
-            new Regex(@"estimated printing time .*= ((?<h>(\d+))h\s*)?((?<m>(\d+))m\s*)?((?<s>(\d+))s)?", RegexFlags),                                  // Slic3r PE
+            new Regex(@"estimated printing time .*= ((?<d>(\d+))d\s*)?((?<h>(\d+))h\s*)?((?<m>(\d+))m\s*)?((?<s>(\d+))s)?", RegexFlags),                // Slic3r PE
             new Regex(@"TIME:(?<s>(\d+\.?\d*))", RegexFlags),                                                                                           // Cura
             new Regex(@"Build Time:\s+((?<h>(\d+\.?\d*)) hour(s)?\s*)?((?<m>(\d+\.?\d*)) minute(s)?\s*)?((?<s>(\d+\.?\d*)) second(s)?)?", RegexFlags),  // Simplify3D, KISSlicer, Canvas, IceSL
             new Regex(@"print time:\s+(?<s>(\d+\.?\d*))(s)?", RegexFlags),                                                                              // Kiri:Moto, and IdeaMaker v4