Add spindle speed to DROs and disable GCode sync (#289)

* ApplicationControls: add spindle speed to DRO

* GCodeSync: remove unreliable code

Author: machinekoder

src/application/ApplicationSettings.qml

@@ -57,6 +57,7 @@ LocalSettings {
         setValue("dro.showOffsets", false, false);
         setValue("dro.showVelocity", true, false);
         setValue("dro.showDistanceToGo", true, false);
+        setValue("dro.showSpindleSpeed", true, false);
         setValue("preview.enable", false, false);
         setValue("preview.showMachineLimits", true, false);
         setValue("preview.showProgram", true, false);

src/applicationcontrols/AbstractDigitalReadOut.qml

@@ -47,6 +47,9 @@ ApplicationItem {
     property bool distanceToGoVisible: settings.initialized && settings.values.dro.showDistanceToGo
     property int positionFeedback: _ready ? status.config.positionFeedback : ApplicationStatus.ActualPositionFeedback
     property int positionOffset: _ready ? status.config.positionOffset : ApplicationStatus.RelativePositionOffset
+    property double spindleSpeed: _ready ? Math.abs(status.motion.spindleSpeed) : 0.0
+    property int spindleDirection: _ready ? status.motion.spindleDirection: 0
+    property bool spindleSpeedVisible: _ready && settings.initialized ? settings.values.dro.showSpindleSpeed && status.ui.spindlePlusVisible : false
 
     readonly property bool _ready: status.synced
     readonly property var _axisNames: helper.ready ? helper.axisNames : ["x", "y", "z", "a"]

src/applicationcontrols/DigitalReadOut.qml

@@ -245,6 +245,18 @@ AbstractDigitalReadOut {
             active: true
             visible: !droRect.offsetsVisible && distanceToGoVisible
         }
+
+        Loader {
+            sourceComponent: textLine
+            onLoaded: {
+                item.title = qsTr("S:")
+                item.type = Qt.binding(function() { return droRect.spindleDirection === 1 ? "⟳" : (droRect.spindleDirection === -1 ? "⟲" : ""); });
+                item.homed = false;
+                item.value = Qt.binding(function() { return droRect.spindleSpeed; });
+            }
+            active: true
+            visible: !droRect.offsetsVisible && spindleSpeedVisible
+        }
     }
 
     ColumnLayout {

src/pathview/GCodeSync.qml

@@ -35,6 +35,7 @@ Item {
                                                                        || status.task.execState === ApplicationStatus.TaskDone) : false
         readonly property string file: status.synced ? status.task.file : ""
         property int lastLine: 1
+        property string lastFile: ""
         readonly property bool ready: status.synced
 
         onCurrentLineChanged: updateLine()
@@ -45,22 +46,11 @@ Item {
                 return;
             }
 
-            if (d.lastLine > d.currentLine) {
-                for (var line = 1; line <= d.lastLine; ++line) {
-                    model.setData(file, line, false, GCodeProgramModel.ExecutedRole);
-                    model.setData(file, line, false, GCodeProgramModel.ActiveRole);
-                }
-                d.lastLine = d.currentLine;
-            }
-
-            for (line = d.lastLine; line < d.currentLine; ++line) {
-                model.setData(file, line, true, GCodeProgramModel.ExecutedRole);
-                model.setData(file, line, false, GCodeProgramModel.ActiveRole);
-            }
-
+            model.setData(d.lastFile, d.lastLine, false, GCodeProgramModel.ActiveRole)
             model.setData(file, currentLine, true, GCodeProgramModel.ActiveRole);
 
             d.lastLine = d.currentLine;
+            d.lastFile = d.file;
         }
     }
 }