V1.0.9.10

- Fix send of tool offset setting, Issue #79
- Expand Macro editing box, Issue #80
- Add indicator colour when Overrides active, Issue #80
- Add Grbl/GrblPanel version info to Settings page, Issue #80
- Add Single Step to file panel, Issue #80, Issue #23

.gitignore

@@ -29,3 +29,4 @@ _ReSharper*/
 [Tt]est[Rr]esult*
 .vs/
 
+/Grbl-Panel/*.user

CHANGES.txt

@@ -1,4 +1,10 @@
 This file documents changes made:
+V1.0.9.10	- 2016 Dec 15
+			- Fix send of tool offset setting, Issue #79
+			- Expand Macro editing box, Issue #80
+			- Add indicator colour when Overrides active, Issue #80
+			- Add Grbl/GrblPanel version info to Settings page, Issue #80
+			- Add Single Step to file panel, Issue #80, Issue #23
 V1.0.9.9	- 2016 Dec 12
 			- Add Laser Mode text to Settings list, Issue 71
 			- Fix revision, Issue 77

Grbl-Panel/CHANGES.txt

@@ -1,4 +1,10 @@
 This file documents changes made:
+V1.0.9.10	- 2016 Dec 15
+			- Fix send of tool offset setting, Issue #79
+			- Expand Macro editing box, Issue #80
+			- Add indicator colour when Overrides active, Issue #80
+			- Add Grbl/GrblPanel version info to Settings page, Issue #80
+			- Add Single Step to file panel, Issue #80, Issue #23
 V1.0.9.9	- 2016 Dec 12
 			- Add Laser Mode text to Settings list, Issue 71
 			- Fix revision, Issue 77

Grbl-Panel/Grbl-Panel.vbproj

@@ -143,6 +143,9 @@
     <Compile Include="GrblGcodeView.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="GrblInfo.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="GrblMacroButtons.vb">
       <SubType>Form</SubType>
     </Compile>

Grbl-Panel/GrblGcode.vb

@@ -14,6 +14,7 @@ Partial Class GrblGui
         Private _gui As GrblGui
         Private _wtgForAck As Boolean = False         '
         Private _runMode As Boolean = True            '
+        Private _stepMode As Boolean = False              ' for single stepping gcode
         Private _sendAnotherLine As Boolean = False   '
         Private _lineCount As Integer = 0               ' No of lines left to send
         Private _linesDone As Integer = 0
@@ -139,9 +140,20 @@ Partial Class GrblGui
             ' Resume sending of file
             _sendAnotherLine = True
             _runMode = True
+            _stepMode = False
             gcodeview.fileMode = True
             _gui.processLineEvent("")              ' Prime the pump again
 
+        End Sub
+
+        Public Sub sendGCodeFileStep()
+            ' Single Step Line from file
+            _sendAnotherLine = True
+            _runMode = False
+            _stepMode = True
+            _gui.gcodeview.fileMode = True
+            _gui.processLineEvent("")              ' Prime the pump again
+
         End Sub
         Public Sub sendGCodeFileStop()
 
@@ -235,6 +247,14 @@ Partial Class GrblGui
                 _wtgForAck = value
             End Set
         End Property
+        Property stepMode() As Boolean
+            Get
+                Return _stepMode
+            End Get
+            Set(value As Boolean)
+                _stepMode = value
+            End Set
+        End Property
         Property sendAnotherLine() As Boolean
             Get
                 Return _sendAnotherLine
@@ -304,50 +324,50 @@ Partial Class GrblGui
                     End If
                 End If
             End If
-            ' Do we have another line to send?
-            If gcode.runMode = True Then                    ' if not paused or stopped
-                If gcode.sendAnotherLine Then
-                    gcode.sendAnotherLine = False
-                    ' if count > 0
-                    If gcode.lineCount > 0 Then
-                        Dim line As String
-                        ' Read another line
-                        line = gcodeview.readGcode(gcode.lineCount, gcode.linesDone)
-                        If Not line.StartsWith("EOF") Then  ' We never hit this but is here just in case the file gets truncated
-                            ' count - 1
-                            gcode.lineCount -= 1
-                            ' show as sent
-                            gcodeview.UpdateGcodeSent(gcode.linesDone)                  ' Mark line as sent
-                            gcode.linesDone += 1
-                            lblCurrentLine.Text = gcode.linesDone.ToString              ' Issue #60
-                            state.ProcessGCode(line)
-                            ' Set Message if it starts with (
-                            If line.StartsWith("(") Then
-                                Dim templine As String = line
-                                templine = templine.Remove(0, 1)
-                                templine = templine.Remove(templine.Length - 1, 1)
-                                tbGCodeMessage.Text = templine
-                            End If
-                            If line.StartsWith("m30") Or line.StartsWith("M30") Then
-                                ' Set M30 flag to rewind on 'ok'
-                                gcode.m30Flag = True
-                            End If
-                            ' Remove all whitespace
-                            line = line.Replace(" ", "")
-                            ' set wtg for Ack
-                            gcode.wtgForAck = True
-                            ' Ship it Dano!
-                            grblPort.sendData(line)
+        ' Do we have another line to send?
+        If gcode.runMode = True Or gcode.stepMode = True Then                    ' if not paused or stopped
+            If gcode.sendAnotherLine Then
+                gcode.sendAnotherLine = False
+                ' if count > 0
+                If gcode.lineCount > 0 Then
+                    Dim line As String
+                    ' Read another line
+                    line = gcodeview.readGcode(gcode.lineCount, gcode.linesDone)
+                    If Not line.StartsWith("EOF") Then  ' We never hit this but is here just in case the file gets truncated
+                        ' count - 1
+                        gcode.lineCount -= 1
+                        ' show as sent
+                        gcodeview.UpdateGcodeSent(gcode.linesDone)                  ' Mark line as sent
+                        gcode.linesDone += 1
+                        lblCurrentLine.Text = gcode.linesDone.ToString              ' Issue #60
+                        state.ProcessGCode(line)
+                        ' Set Message if it starts with (
+                        If line.StartsWith("(") Then
+                            Dim templine As String = line
+                            templine = templine.Remove(0, 1)
+                            templine = templine.Remove(templine.Length - 1, 1)
+                            tbGCodeMessage.Text = templine
+                        End If
+                        If line.StartsWith("m30") Or line.StartsWith("M30") Then
+                            ' Set M30 flag to rewind on 'ok'
+                            gcode.m30Flag = True
                         End If
-                    Else
-                        ' We reached the EOF aka linecount=0, yippee
-                        gcode.sendGCodeFileStop()
+                        ' Remove all whitespace
+                        line = line.Replace(" ", "")
+                        ' set wtg for Ack
+                        gcode.wtgForAck = True
+                        ' Ship it Dano!
+                        grblPort.sendData(line)
                     End If
+                Else
+                    ' We reached the EOF aka linecount=0, yippee
+                    gcode.sendGCodeFileStop()
                 End If
             End If
-            ' Check for status responses that we need to handle here
-            ' Extract status
-            Dim status = Split(data, ",")
+        End If
+        ' Check for status responses that we need to handle here
+        ' Extract status
+        Dim status = Split(data, ",")
             If status(0) = "<Alarm" Or status(0).StartsWith("ALARM") Then
                 ' Major problem so cancel the file
                 ' GrblStatus has set the Alarm indicator etc
@@ -368,7 +388,7 @@ Partial Class GrblGui
     End Sub
 
     Private Sub btnFileGroup_Click(sender As Object, e As EventArgs) Handles btnFileSend.Click, btnFileSelect.Click, btnFilePause.Click, btnFileStop.Click,
-                                    btnFileReload.Click
+                                    btnFileReload.Click, btnFileStep.Click
         ' This event handler deals with the gcode file related buttons
         ' Implements a simple state machine to keep user from clicking the wrong buttons
         ' Uses button.tag instead of .text so the text doesn't mess up the images on the buttons
@@ -391,6 +411,7 @@ Partial Class GrblGui
 
                     btnFileSelect.Enabled = True    ' Allow changing your mind about the file
                     btnFileSend.Enabled = True
+                    btnFileStep.Enabled = True
                     btnFilePause.Enabled = False
                     btnFileStop.Enabled = False
                     btnFileReload.Enabled = False
@@ -408,6 +429,15 @@ Partial Class GrblGui
                 btnFileStop.Enabled = True
                 btnFileReload.Enabled = False
 
+            Case "Step"
+                gcode.sendGCodeFileStep()
+                btnFileSend.Tag = "Resume"
+                btnFileSend.Enabled = True
+                btnFileSelect.Enabled = False
+                btnFilePause.Enabled = True
+                btnFileStop.Enabled = True
+                btnFileReload.Enabled = False
+
             Case "Pause"
                 gcode.sendGCodeFilePause()
 

Grbl-Panel/GrblGui.vb

@@ -18,6 +18,7 @@ Public Class GrblGui
     Public settings As GrblSettings         ' To handle Settings related ops
     Public ovrrides As GrblOverrides       ' to display overrides
     Public pins As GrblPins               ' to display Pin states
+    Public info As GrblInfo                 ' to display Grbl information
 
     Private _exitClicked As Boolean = False   ' to separate Close (x) from File/Exit
 
@@ -66,6 +67,7 @@ Public Class GrblGui
         state = New GrblState(Me)
         ovrrides = New GrblOverrides(Me)
         pins = New GrblPins(Me)
+        info = New GrblInfo(Me)
 
         rescanPorts()
         If My.Settings.Port <> "" Then

Grbl-Panel/GrblInfo.vb

@@ -0,0 +1,57 @@
+Partial Class GrblGui
+    ''' <summary>
+    ''' A Class to handle Grbl VER and OPT messages
+    ''' </summary>
+    ''' 
+
+    Public Class GrblInfo
+        Private _gui As GrblGui
+
+        Public Sub New(ByRef gui As GrblGui)
+            ' Get ref to parent object
+            _gui = gui
+            ' For Connected events
+            AddHandler(GrblGui.Connected), AddressOf Me.GrblConnected
+
+        End Sub
+        ''' <summary>
+        ''' Activate Info object to request/process VER/OPT messages
+        ''' </summary>
+        ''' <param name="msg"></param>
+        Private Sub GrblConnected(ByVal msg As String)     ' Handles GrblGui.Connected Event
+            If msg = "Connected" Then
+                _gui.grblPort.addRcvDelegate(AddressOf _gui.processVerOptMessages)
+                ' We are connected to Grbl so populate the State
+                gcode.sendGCodeLine("$I")
+                once = True
+            End If
+        End Sub
+
+        Private _single As Boolean
+        Public Property once() As Boolean
+            Get
+                Return _single
+            End Get
+            Set(ByVal value As Boolean)
+                _single = value
+            End Set
+        End Property
+    End Class
+    ''' <summary>
+    ''' Handle incoming VER and OPT message from $I request
+    ''' </summary>
+    ''' <param name="data"></param>
+    Public Sub processVerOptMessages(ByVal data As String)
+        If info.once = True Then
+            If data.StartsWith("[VER:") Then
+                Dim str As String = data.Remove(data.Length - 3)
+                tbGrblVersion.Text = str.Remove(0, 5)
+            End If
+            If data.StartsWith("[OPT") Then
+                Dim str As String = data.Remove(data.Length - 3)
+                tbGrblOptions.Text = str.Remove(0, 5)
+                info.once = False
+            End If
+        End If
+    End Sub
+End Class

Grbl-Panel/GrblMacroButtons.vb

@@ -142,7 +142,7 @@ Partial Class GrblGui
                 If btnAdd.Text = Resources.GrblGui_dgMacros_DoubleClick_Update Then
                     For Each row As DataGridViewRow In dgMacros.Rows
                         If row.Cells(0).Value.ToString = tbName.Text Then
-                            row.Cells(1).Value = tbGCode.Text
+                            row.Cells(1).Value = tbGCode.Text.ToUpper()
                             bMatchFound = True
                             Exit For
                         End If
@@ -152,7 +152,7 @@ Partial Class GrblGui
                         dgMacros.Rows.Add(tbName.Text, tbGCode.Text)
                     End If
                 Else
-                    dgMacros.Rows.Add(tbName.Text, tbGCode.Text)
+                    dgMacros.Rows.Add(tbName.Text, tbGCode.Text.ToUpper)
                 End If
                 bDataChanged = True
                 btnAdd.Text = Resources.GrblGui_GrblMacroButtons_Load_Add

Grbl-Panel/GrblOffsets.vb

@@ -204,6 +204,9 @@ Partial Class GrblGui
             End Select
             gcode.sendGCodeLine("G10 L2 " + index + " " + axis + value)
         End If
+        If tag.Contains("G43") Then
+            gcode.sendGCodeLine("G43.1" + axis + value)
+        End If
 
     End Sub
     ''' <summary>

Grbl-Panel/GrblOverrides.vb

@@ -71,26 +71,41 @@ Partial Class grblgui
                     Case "Ov"
                         Dim ovr = Split(portion(1), ",")
                         tbFeedOvr.Text = ovr(0) + "%"
+                        If ovr(0) = "100" Then
+                            tbFeedOvr.BackColor = Color.White
+                        Else
+                            tbFeedOvr.BackColor = Color.Coral
+                        End If
                         tbRapidOvr.Text = ovr(1) + "%"
+                        If ovr(1) = "100" Then
+                            tbRapidOvr.BackColor = Color.White
+                        Else
+                            tbRapidOvr.BackColor = Color.Coral
+                        End If
                         tbSpindleOvr.Text = ovr(2) + "%"
+                        If ovr(2) = "100" Then
+                            tbSpindleOvr.BackColor = Color.White
+                        Else
+                            tbSpindleOvr.BackColor = Color.Coral
+                        End If
                         If Not data.Contains("A") Then
                             btnSpindleOverride.BackColor = Color.Transparent
                             btnFloodOverride.BackColor = Color.Transparent
                             btnMistOverride.BackColor = Color.Transparent
                         End If
                     Case "A"
                         If portion(1).Contains("S") Then
-                            btnSpindleOverride.BackColor = Color.Crimson
+                            btnSpindleOverride.BackColor = Color.Coral
                         Else
                             btnSpindleOverride.BackColor = Color.Transparent
                         End If
                         If portion(1).Contains("F") Then
-                            btnFloodOverride.BackColor = Color.Crimson
+                            btnFloodOverride.BackColor = Color.Coral
                         Else
                             btnFloodOverride.BackColor = Color.Transparent
                         End If
                         If portion(1).Contains("M") Then
-                            btnMistOverride.BackColor = Color.Crimson
+                            btnMistOverride.BackColor = Color.Coral
                         Else
                             btnMistOverride.BackColor = Color.Transparent
                         End If

Grbl-Panel/GrblState.vb

@@ -20,7 +20,7 @@
             If yes Then
                 _gui.gbState.Enabled = True
             Else
-                _gui.gbStatus.Enabled = False
+                _gui.gbState.Enabled = False
             End If
         End Sub