- Prevent keyboard jogging if running a gcode file or in MDI, Issue g…

…erritv#15 - Add Reload for gcode file, reloads same file from scratch, Issue gerritv#11-5, 15 - Add config for startup delay to satisfy Arduino Mega2560 delay, Issue gerritv#8 - Add setting for default file ext in Gcode file load, Issue gerritv#11-4 - Add config to set default gcode file ext, Issue gerritv#11-4 - Set Assembly Version to 1.0.2.0
electrokean · Dec 5, 2014 · ae64d4a · ae64d4a
1 parent 406345d
commit ae64d4a
Show file tree

Hide file tree

Showing 14 changed files with 716 additions and 402 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,32 +1,33 @@
 This file documents changes made:
-V0.1.0.1	- 2014 Sep 8
-			- Initial release
-V0.1.0.2 	- Added horizontal scroll bar to Status list
-			- Increased Q progress bar max value to 30 (temporary)
-V0.1.0.3	- 2014 Sep 15
-			- Jog distance and increment now configurable
-			- Fixed some exit race conditions with serial port close
-			- Swapped X+ and X- jog buttons
-			- Gcode is visible on load of file
-			- Made Q and Rbuff progress bar maximums configurable (future proofing)
-			- Added Simulate/Check Mode checkbox
-			- Added Status indicators
-			- Added Pause on Error
-			- Various code cleanups, added GCodeView class
-			- Changed sequence of instantiating some of the objects
-V0.1.0.4	- 2014 Sep 21
-			- Add Offsets management: retrieve from Grbl, load and save from/to file
-			- Made screen resizable, flexibly
-			- Added Exception display, in case one happens in the wild
-			- Revamped GUI for compactness
-			- Added G28, G30 command strings to Settings page
-			- Interlocks to prevent silly mistakes while running a gcode program
-			- Simplified Status display
-			- Added button and display for Parser status
-			- ConnectOnLoad option to connect when you start Grbl-Panel
-			- Stability improvements on close
-			- Last Beta before release to the wild
-			- Roughed in retrieve and change of Grbl Settings, not complete yet
+V1.0.2.0	- 2014 Dec 5
+			- Prevent keyboard jogging if running a gcode file or in MDI, Issue #15
+			- Add Reload for gcode file, reloads same file from scratch, Issue #11-5, 15
+			- Add config for startup delay to satisfy Arduino Mega2560 delay, Issue #8
+			- Add setting for default file ext in Gcode file load, Issue #11-4
+			- Add config to set default gcode file ext, Issue #11-4
+			- Set Assembly Version to 1.0.2.0
+V1.0.1.0	- 2014 Oct 13
+			- Issue 10 Add defaults and settings save for Jog feed Increment and Distance radio buttons
+			- Remove message box warnings about empty Feed rate and distance settings
+			- Protect from Status Report Mask <> 15 (Issue 5)
+			- Handle empty gcode lines (Issue 9)
+V0.1.0.6	- 2014 Oct 6
+			- Add an AboutBox, which also provides details of Assemblies referenced (to aid troubleshoointg Mono install problems)
+			- Retargeted to .Net 3.5
+			- Add Grbl settings retrieve and editing
+			- Crimson the Home Cycle button on Connect event
+			- Blocked access to Grbl Settings refresh during file run
+			- ReJig layout of State group box
+			- Add line numbers to Gcode display
+			- Removed At Line, in prep for % complete
+			- Expanded width of Message display
+			- On Unlock, clear Home Cycle hint and refocus to Work tab
+			- If $22 <> 1 (Homing Disabled) then hide the Home Cycle button
+			- Combine Machine psition tab into Work one, move the Home Cycle button as well
+			- Fix Jog repeat functions
+			- Fix save of Jog feed increment and rate settings
+			- Add param to set last/highest Grbl param to retrieve
+			- Block edit of Grbl Settings ID and description columns
 V0.1.0.5	- 2014 Sep 29
 			- Added keyboard support for jogging, a settings page option
 			- Fixed missing Zero All tag, not triggering an action
@@ -51,25 +52,32 @@ V0.1.0.5	- 2014 Sep 29
 			  whether you are in Incremental or Absolute mode when you set these values but nowhere is it clear what Update means :-(). 
 			  Its a config item, you can change if need be.
 			- Fix crash if you Reset Grbl (by its button)
-V0.1.0.6	- 2014 Oct 6
-			- Add an AboutBox, which also provides details of Assemblies referenced (to aid troubleshoointg Mono install problems)
-			- Retargeted to .Net 3.5
-			- Add Grbl settings retrieve and editing
-			- Crimson the Home Cycle button on Connect event
-			- Blocked access to Grbl Settings refresh during file run
-			- ReJig layout of State group box
-			- Add line numbers to Gcode display
-			- Removed At Line, in prep for % complete
-			- Expanded width of Message display
-			- On Unlock, clear Home Cycle hint and refocus to Work tab
-			- If $22 <> 1 (Homing Disabled) then hide the Home Cycle button
-			- Combine Machine psition tab into Work one, move the Home Cycle button as well
-			- Fix Jog repeat functions
-			- Fix save of Jog feed increment and rate settings
-			- Add param to set last/highest Grbl param to retrieve
-			- Block edit of Grbl Settings ID and description columns
-V1.0.1.0	- 2014 Oct 13
-			- Issue 10 Add defaults and settings save for Jog feed Increment and Distance radio buttons
-			- Remove message box warnings about empty Feed rate and distance settings
-			- Protect from Status Report Mask <> 15 (Issue 5)
-			- Handle empty gcode lines (Issue 9)
+V0.1.0.4	- 2014 Sep 21
+			- Add Offsets management: retrieve from Grbl, load and save from/to file
+			- Made screen resizable, flexibly
+			- Added Exception display, in case one happens in the wild
+			- Revamped GUI for compactness
+			- Added G28, G30 command strings to Settings page
+			- Interlocks to prevent silly mistakes while running a gcode program
+			- Simplified Status display
+			- Added button and display for Parser status
+			- ConnectOnLoad option to connect when you start Grbl-Panel
+			- Stability improvements on close
+			- Last Beta before release to the wild
+			- Roughed in retrieve and change of Grbl Settings, not complete yet
+V0.1.0.3	- 2014 Sep 15
+			- Jog distance and increment now configurable
+			- Fixed some exit race conditions with serial port close
+			- Swapped X+ and X- jog buttons
+			- Gcode is visible on load of file
+			- Made Q and Rbuff progress bar maximums configurable (future proofing)
+			- Added Simulate/Check Mode checkbox
+			- Added Status indicators
+			- Added Pause on Error
+			- Various code cleanups, added GCodeView class
+			- Changed sequence of instantiating some of the objects
+V0.1.0.2 	- Added horizontal scroll bar to Status list
+			- Increased Q progress bar max value to 30 (temporary)
+V0.1.0.1	- 2014 Sep 8
+			- Initial release
+
diff --git a/Grbl-Panel/App.config b/Grbl-Panel/App.config
@@ -94,6 +94,12 @@
             <setting name="JoggingFRDefault" serializeAs="String">
                 <value>F2</value>
             </setting>
+            <setting name="StartupDelay" serializeAs="String">
+                <value>1.5</value>
+            </setting>
+            <setting name="DefaultFileExt" serializeAs="String">
+                <value />
+            </setting>
         </GrblPanel.My.MySettings>
     </userSettings>
 </configuration>
diff --git a/Grbl-Panel/CHANGES.txt b/Grbl-Panel/CHANGES.txt
@@ -1,32 +1,33 @@
 This file documents changes made:
-V0.1.0.1	- 2014 Sep 8
-			- Initial release
-V0.1.0.2 	- Added horizontal scroll bar to Status list
-			- Increased Q progress bar max value to 30 (temporary)
-V0.1.0.3	- 2014 Sep 15
-			- Jog distance and increment now configurable
-			- Fixed some exit race conditions with serial port close
-			- Swapped X+ and X- jog buttons
-			- Gcode is visible on load of file
-			- Made Q and Rbuff progress bar maximums configurable (future proofing)
-			- Added Simulate/Check Mode checkbox
-			- Added Status indicators
-			- Added Pause on Error
-			- Various code cleanups, added GCodeView class
-			- Changed sequence of instantiating some of the objects
-V0.1.0.4	- 2014 Sep 21
-			- Add Offsets management: retrieve from Grbl, load and save from/to file
-			- Made screen resizable, flexibly
-			- Added Exception display, in case one happens in the wild
-			- Revamped GUI for compactness
-			- Added G28, G30 command strings to Settings page
-			- Interlocks to prevent silly mistakes while running a gcode program
-			- Simplified Status display
-			- Added button and display for Parser status
-			- ConnectOnLoad option to connect when you start Grbl-Panel
-			- Stability improvements on close
-			- Last Beta before release to the wild
-			- Roughed in retrieve and change of Grbl Settings, not complete yet
+V1.0.2.0	- 2014 Dec 5
+			- Prevent keyboard jogging if running a gcode file or in MDI, Issue #15
+			- Add Reload for gcode file, reloads same file from scratch, Issue #11-5, 15
+			- Add config for startup delay to satisfy Arduino Mega2560 delay, Issue #8
+			- Add setting for default file ext in Gcode file load, Issue #11-4
+			- Add config to set default gcode file ext, Issue #11-4
+			- Set Assembly Version to 1.0.2.0
+V1.0.1.0	- 2014 Oct 13
+			- Issue 10 Add defaults and settings save for Jog feed Increment and Distance radio buttons
+			- Remove message box warnings about empty Feed rate and distance settings
+			- Protect from Status Report Mask <> 15 (Issue 5)
+			- Handle empty gcode lines (Issue 9)
+V0.1.0.6	- 2014 Oct 6
+			- Add an AboutBox, which also provides details of Assemblies referenced (to aid troubleshoointg Mono install problems)
+			- Retargeted to .Net 3.5
+			- Add Grbl settings retrieve and editing
+			- Crimson the Home Cycle button on Connect event
+			- Blocked access to Grbl Settings refresh during file run
+			- ReJig layout of State group box
+			- Add line numbers to Gcode display
+			- Removed At Line, in prep for % complete
+			- Expanded width of Message display
+			- On Unlock, clear Home Cycle hint and refocus to Work tab
+			- If $22 <> 1 (Homing Disabled) then hide the Home Cycle button
+			- Combine Machine psition tab into Work one, move the Home Cycle button as well
+			- Fix Jog repeat functions
+			- Fix save of Jog feed increment and rate settings
+			- Add param to set last/highest Grbl param to retrieve
+			- Block edit of Grbl Settings ID and description columns
 V0.1.0.5	- 2014 Sep 29
 			- Added keyboard support for jogging, a settings page option
 			- Fixed missing Zero All tag, not triggering an action
@@ -51,25 +52,32 @@ V0.1.0.5	- 2014 Sep 29
 			  whether you are in Incremental or Absolute mode when you set these values but nowhere is it clear what Update means :-(). 
 			  Its a config item, you can change if need be.
 			- Fix crash if you Reset Grbl (by its button)
-V0.1.0.6	- 2014 Oct 6
-			- Add an AboutBox, which also provides details of Assemblies referenced (to aid troubleshoointg Mono install problems)
-			- Retargeted to .Net 3.5
-			- Add Grbl settings retrieve and editing
-			- Crimson the Home Cycle button on Connect event
-			- Blocked access to Grbl Settings refresh during file run
-			- ReJig layout of State group box
-			- Add line numbers to Gcode display
-			- Removed At Line, in prep for % complete
-			- Expanded width of Message display
-			- On Unlock, clear Home Cycle hint and refocus to Work tab
-			- If $22 <> 1 (Homing Disabled) then hide the Home Cycle button
-			- Combine Machine psition tab into Work one, move the Home Cycle button as well
-			- Fix Jog repeat functions
-			- Fix save of Jog feed increment and rate settings
-			- Add param to set last/highest Grbl param to retrieve
-			- Block edit of Grbl Settings ID and description columns
-V1.0.1.0	- 2014 Oct 13
-			- Issue 10 Add defaults and settings save for Jog feed Increment and Distance radio buttons
-			- Remove message box warnings about empty Feed rate and distance settings
-			- Protect from Status Report Mask <> 15 (Issue 5)
-			- Handle empty gcode lines (Issue 9)
+V0.1.0.4	- 2014 Sep 21
+			- Add Offsets management: retrieve from Grbl, load and save from/to file
+			- Made screen resizable, flexibly
+			- Added Exception display, in case one happens in the wild
+			- Revamped GUI for compactness
+			- Added G28, G30 command strings to Settings page
+			- Interlocks to prevent silly mistakes while running a gcode program
+			- Simplified Status display
+			- Added button and display for Parser status
+			- ConnectOnLoad option to connect when you start Grbl-Panel
+			- Stability improvements on close
+			- Last Beta before release to the wild
+			- Roughed in retrieve and change of Grbl Settings, not complete yet
+V0.1.0.3	- 2014 Sep 15
+			- Jog distance and increment now configurable
+			- Fixed some exit race conditions with serial port close
+			- Swapped X+ and X- jog buttons
+			- Gcode is visible on load of file
+			- Made Q and Rbuff progress bar maximums configurable (future proofing)
+			- Added Simulate/Check Mode checkbox
+			- Added Status indicators
+			- Added Pause on Error
+			- Various code cleanups, added GCodeView class
+			- Changed sequence of instantiating some of the objects
+V0.1.0.2 	- Added horizontal scroll bar to Status list
+			- Increased Q progress bar max value to 30 (temporary)
+V0.1.0.1	- 2014 Sep 8
+			- Initial release
+
diff --git a/Grbl-Panel/Grbl-Panel.vbproj b/Grbl-Panel/Grbl-Panel.vbproj
@@ -160,6 +160,11 @@
     <EmbeddedResource Include="GrblGui.resx">
       <DependentUpon>GrblGui.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources1.Designer.vb</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -222,6 +227,7 @@
     <Content Include="LICENSE.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Reload-32.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Grbl-Panel/GrblGcode.vb b/Grbl-Panel/GrblGcode.vb
@@ -370,7 +370,8 @@ Partial Class GrblGui
         grblPort.sendData("$C")
     End Sub
 
-    Private Sub btnFileGroup_Click(sender As Object, e As EventArgs) Handles btnFileSend.Click, btnFileSelect.Click, btnFilePause.Click, btnFileStop.Click
+    Private Sub btnFileGroup_Click(sender As Object, e As EventArgs) Handles btnFileSend.Click, btnFileSelect.Click, btnFilePause.Click, btnFileStop.Click, _
+                                    btnFileReload.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
@@ -379,7 +380,11 @@ Partial Class GrblGui
             Case "File"
                 Dim str As String = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)
                 ofdGcodeFile.InitialDirectory = Path.Combine(Path.GetFullPath(str), "*")
-                ofdGcodeFile.FileName = "*"
+                If tbSettingsDefaultExt.Text <> "" Then
+                    ofdGcodeFile.Filter = String.Format("Gcode |*.{0}|All Files |*.*", tbSettingsDefaultExt.Text)
+                    ofdGcodeFile.DefaultExt = String.Format(".{0}", tbSettingsDefaultExt.Text)
+                End If
+                ofdGcodeFile.FileName = "File"
                 If ofdGcodeFile.ShowDialog() = Windows.Forms.DialogResult.OK Then
                     'gcode.openGCodeFile(ofdGcodeFile.FileName)
                     gcode.loadGCodeFile(ofdGcodeFile.FileName)
@@ -390,7 +395,10 @@ Partial Class GrblGui
                     btnFileSend.Enabled = True
                     btnFilePause.Enabled = False
                     btnFileStop.Enabled = False
-
+                    btnFileReload.Enabled = False
+                    ' reset filter in case user changes ext on Settings tab
+                    ofdGcodeFile.Filter = ""
+                    ofdGcodeFile.DefaultExt = ""
                 End If
             Case "Send"
                 ' Send a gcode file to Grbl
@@ -400,6 +408,7 @@ Partial Class GrblGui
                 btnFileSend.Enabled = False
                 btnFilePause.Enabled = True
                 btnFileStop.Enabled = True
+                btnFileReload.Enabled = False
 
             Case "Pause"
                 gcode.sendGCodeFilePause()
@@ -409,6 +418,7 @@ Partial Class GrblGui
                 btnFileSend.Enabled = True
                 btnFilePause.Enabled = False
                 btnFileStop.Enabled = True
+                btnFileReload.Enabled = False
 
             Case "Stop"
                 gcode.sendGCodeFilePause()
@@ -421,6 +431,7 @@ Partial Class GrblGui
                 btnFileSend.Enabled = False
                 btnFilePause.Enabled = False
                 btnFileStop.Enabled = False
+                btnFileReload.Enabled = True
 
             Case "Resume"
                 gcode.sendGCodeFileResume()
@@ -430,6 +441,20 @@ Partial Class GrblGui
                 btnFileSend.Enabled = False
                 btnFilePause.Enabled = True
                 btnFileStop.Enabled = True
+                btnFileReload.Enabled = False
+
+            Case "Reload"
+                ' Reload the same file 
+                gcode.loadGCodeFile(ofdGcodeFile.FileName)
+                tbGcodeFile.Text = ofdGcodeFile.FileName
+                lblTotalLines.Text = gcode.lineCount.ToString
+
+                btnFileSelect.Enabled = True    ' Allow changing your mind about the file
+                btnFileSend.Enabled = True
+                btnFilePause.Enabled = False
+                btnFileStop.Enabled = False
+                btnFileReload.Enabled = False
+
 
         End Select
     End Sub

diff --git a/Grbl-Panel/GrblGui.vb b/Grbl-Panel/GrblGui.vb
@@ -169,7 +169,7 @@ Public Class GrblGui
                     settings.EnableState(True)
                     ' Start the status poller
                     statusPrompt("Start")
-                    Sleep(1500)             ' Give Grbl time to wake up from Reset
+                    Sleep(tbSettingsStartupDelay.Text * 1000)             ' Give Grbl time to wake up from Reset
 
                     RaiseEvent Connected("Connected")      ' tell everyone of the happy event
                 Else