From 406345d98905f07566dcccb1729cc5f184a9e6c8 Mon Sep 17 00:00:00 2001 From: gerritv <3d58b8e6@opayq.com> Date: Mon, 27 Oct 2014 11:59:04 -0400 Subject: [PATCH] Issue 5, Exception if Status Mask <> 15 Issue 9, Exception if empty gcode line Issue 10, Set jogging rate and increment on load --- CHANGES.txt | 5 + Grbl-Panel/App.config | 6 + Grbl-Panel/CHANGES.txt | 5 + Grbl-Panel/GrblGcode.vb | 2 +- Grbl-Panel/GrblGui.vb | 6 - Grbl-Panel/GrblJogging.vb | 34 +- Grbl-Panel/GrblState.vb | 3 + Grbl-Panel/GrblStatus.vb | 18 +- Grbl-Panel/grblgui.Designer.vb | 562 +++++++++++++++++---------------- Grbl-Panel/grblgui.resx | 3 - 10 files changed, 341 insertions(+), 303 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 954b860..820349b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -68,3 +68,8 @@ V0.1.0.6 - 2014 Oct 6 - 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) diff --git a/Grbl-Panel/App.config b/Grbl-Panel/App.config index 6bfa2ce..a27680b 100644 --- a/Grbl-Panel/App.config +++ b/Grbl-Panel/App.config @@ -88,6 +88,12 @@ $132 + + I2 + + + F2 + diff --git a/Grbl-Panel/CHANGES.txt b/Grbl-Panel/CHANGES.txt index 954b860..820349b 100644 --- a/Grbl-Panel/CHANGES.txt +++ b/Grbl-Panel/CHANGES.txt @@ -68,3 +68,8 @@ V0.1.0.6 - 2014 Oct 6 - 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) diff --git a/Grbl-Panel/GrblGcode.vb b/Grbl-Panel/GrblGcode.vb index ca3ad76..67deea4 100644 --- a/Grbl-Panel/GrblGcode.vb +++ b/Grbl-Panel/GrblGcode.vb @@ -320,13 +320,13 @@ Partial Class GrblGui Dim line As String ' Read another line line = gcode.readGcode() - state.ProcessGCode(line) 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 + state.ProcessGCode(line) ' Set Message if it starts with ( If line.StartsWith("(") Then Dim templine As String = line diff --git a/Grbl-Panel/GrblGui.vb b/Grbl-Panel/GrblGui.vb index 2610e51..fdea181 100644 --- a/Grbl-Panel/GrblGui.vb +++ b/Grbl-Panel/GrblGui.vb @@ -286,10 +286,4 @@ Public Class GrblGui ' Raised when we succesfully connected to Grbl Public Event Connected(ByVal msg As String) - Private Sub Button1_Click(sender As Object, e As EventArgs) - Dim i As Integer = settings.IsHomingEnabled() - i = i - - End Sub - End Class diff --git a/Grbl-Panel/GrblJogging.vb b/Grbl-Panel/GrblJogging.vb index c76e3b3..b718dff 100644 --- a/Grbl-Panel/GrblJogging.vb +++ b/Grbl-Panel/GrblJogging.vb @@ -25,6 +25,18 @@ Partial Class GrblGui _gui.btnYMinus.Interval = 1000 / .JoggingYRepeat _gui.btnZPlus.Interval = 1000 / .JoggingZRepeat _gui.btnZMinus.Interval = 1000 / .JoggingZRepeat + + ' Set the default feed rate and increment + For Each rb As RadioButton In _gui.gbDistance.Controls + If rb.Tag = My.Settings.JoggingFIDefault Then + rb.Checked = True + End If + Next + For Each rb As RadioButton In _gui.gbFeedRate.Controls + If rb.Tag = My.Settings.JoggingFRDefault Then + rb.Checked = True + End If + Next End With End Sub @@ -50,10 +62,6 @@ Partial Class GrblGui Private Sub btnJogArray_Click(sender As Object, e As EventArgs) Handles btnXPlus.Click, btnXMinus.Click, btnYPlus.Click, btnYMinus.Click, _ btnZPlus.Click, btnZMinus.Click Dim btn As RepeatButton.RepeatButton = sender - If whichDistance() = "" Or whichFeedRate() = "" Then - MessageBox.Show("Please set Distance and Feed Rate first", "", MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly) - Return - End If Select Case btn.Tag Case "X+" gcode.sendGCodeLine(createJogCommand("X")) @@ -77,12 +85,6 @@ Partial Class GrblGui If cbSettingsKeyboardJogging.Checked Then - If whichDistance() = "" Or whichFeedRate() = "" Then - ' We have no parameters, give message - MessageBox.Show("Please set Distance and Feed Rate first") - Return - End If - Select Case e.KeyCode Case Keys.Left gcode.sendGCodeLine(createJogCommand("X-")) @@ -195,5 +197,17 @@ Partial Class GrblGui End If End Function + Private Sub rbDistancex_CheckedChanged(sender As Object, e As EventArgs) Handles rbDistance1.CheckedChanged, rbDistance2.CheckedChanged, rbDistance3.CheckedChanged, _ + rbDistance4.CheckedChanged, rbFeedRate1.CheckedChanged, rbFeedRate2.CheckedChanged, _ + rbFeedRate3.CheckedChanged, rbFeedRate4.CheckedChanged + ' Remember the setting + Dim rbtn As RadioButton = sender + Select Case rbtn.Tag + Case "I1", "I2", "I3", "I4" + My.Settings.JoggingFIDefault = rbtn.Tag + Case "F1", "F2", "F3", "F4" + My.Settings.JoggingFRDefault = rbtn.Tag + End Select + End Sub End Class diff --git a/Grbl-Panel/GrblState.vb b/Grbl-Panel/GrblState.vb index 479ba37..078d507 100644 --- a/Grbl-Panel/GrblState.vb +++ b/Grbl-Panel/GrblState.vb @@ -48,6 +48,9 @@ Dim gcodeIndex As Integer = 0 ' current entry being processed Dim comment As Boolean = False + If line.Length = 0 Then ' Deal with blank lines + Return + End If If ignore.Contains(line(0)) Or (Not allcodes.Contains(line(0))) Then Return ' ignore lines with no gcode End If diff --git a/Grbl-Panel/GrblStatus.vb b/Grbl-Panel/GrblStatus.vb index f246995..ed3c54f 100644 --- a/Grbl-Panel/GrblStatus.vb +++ b/Grbl-Panel/GrblStatus.vb @@ -128,7 +128,9 @@ Partial Class GrblGui If Me.cbVerbose.Checked Then ' Show data in the Status screen (from our own thread) Me.lbResponses.Items.Add(data) - Me.lbResponses.TopIndex = Me.lbResponses.Items.Count - 1 + If Me.lbResponses.Items.Count > 1 Then ' handle case where user doesn't have + Me.lbResponses.TopIndex = Me.lbResponses.Items.Count - 1 + End If Else ' filter out <> , ok, $G, $$ response messages If data.Length > 0 And Not (data.First() = "<") And Not (data.First = "o") And Not (data.First = "$") And _ @@ -150,10 +152,14 @@ Partial Class GrblGui ' Lets display the values data = data.Remove(data.Length - 2, 2) ' Remove the "> " at end Dim positions = Split(data, ":") - Dim buffer = Split(positions(3), ",") - Dim rx = Split(positions(4), ",") - prgbRxBuf.Value = rx(0) - prgBarQ.Value = buffer(0) + Try + Dim buffer = Split(positions(3), ",") + Dim rx = Split(positions(4), ",") + prgbRxBuf.Value = rx(0) + prgBarQ.Value = buffer(0) + Catch + ' do nothing, should have Status Report mask = 15 + End Try End If ' Show status on the buttons @@ -186,7 +192,7 @@ Partial Class GrblGui ' Major problem so cancel the file ' Let GrblGcode class handle the error 'gcode.sendGCodeFileStop() - End If + End If ' Display the Parser state if that is the message type If data(0) = "[" And data.Contains("F") Then ' we have a Parser status message diff --git a/Grbl-Panel/grblgui.Designer.vb b/Grbl-Panel/grblgui.Designer.vb index 1ba5b0d..bc9237a 100644 --- a/Grbl-Panel/grblgui.Designer.vb +++ b/Grbl-Panel/grblgui.Designer.vb @@ -92,6 +92,7 @@ Partial Class GrblGui Me.Label24 = New System.Windows.Forms.Label() Me.prgbRxBuf = New System.Windows.Forms.ProgressBar() Me.prgBarQ = New System.Windows.Forms.ProgressBar() + Me.cbVerbose = New System.Windows.Forms.CheckBox() Me.lbResponses = New System.Windows.Forms.ListBox() Me.gbGcode = New System.Windows.Forms.GroupBox() Me.tbGCodeMessage = New System.Windows.Forms.TextBox() @@ -184,6 +185,8 @@ Partial Class GrblGui Me.Label21 = New System.Windows.Forms.Label() Me.tabPgSettings = New System.Windows.Forms.TabPage() Me.gbGrblSettings = New System.Windows.Forms.GroupBox() + Me.Label4 = New System.Windows.Forms.Label() + Me.tbSettingsGrblLastParam = New System.Windows.Forms.TextBox() Me.dgGrblSettings = New System.Windows.Forms.DataGridView() Me.btnSettingsGrbl = New System.Windows.Forms.Button() Me.gbSettingsOffsets = New System.Windows.Forms.GroupBox() @@ -202,60 +205,57 @@ Partial Class GrblGui Me.Label69 = New System.Windows.Forms.Label() Me.Label42 = New System.Windows.Forms.Label() Me.gbSettingsMisc = New System.Windows.Forms.GroupBox() + Me.cbSettingsLeftHanded = New System.Windows.Forms.CheckBox() + Me.cbSettingsConnectOnLoad = New System.Windows.Forms.CheckBox() + Me.cbSettingsPauseOnError = New System.Windows.Forms.CheckBox() + Me.cbStatusPollEnable = New System.Windows.Forms.CheckBox() Me.btnSettingsRefreshMisc = New System.Windows.Forms.Button() Me.Label37 = New System.Windows.Forms.Label() Me.Label36 = New System.Windows.Forms.Label() + Me.tbSettingsRBuffSize = New System.Windows.Forms.TextBox() + Me.tbSettingsQSize = New System.Windows.Forms.TextBox() Me.Label26 = New System.Windows.Forms.Label() + Me.tbSettingsPollRate = New System.Windows.Forms.TextBox() Me.gbSettingsPosition = New System.Windows.Forms.GroupBox() Me.Label8 = New System.Windows.Forms.Label() + Me.tbSettingsSpclPosition2 = New System.Windows.Forms.TextBox() Me.btnSettingsRefreshPosition = New System.Windows.Forms.Button() Me.Label29 = New System.Windows.Forms.Label() + Me.tbWorkZ0Cmd = New System.Windows.Forms.TextBox() Me.Label28 = New System.Windows.Forms.Label() + Me.tbWorkY0Cmd = New System.Windows.Forms.TextBox() Me.Label13 = New System.Windows.Forms.Label() Me.Label12 = New System.Windows.Forms.Label() + Me.tbWorkX0Cmd = New System.Windows.Forms.TextBox() + Me.tbSettingsZeroXYZCmd = New System.Windows.Forms.TextBox() Me.Label11 = New System.Windows.Forms.Label() + Me.tbSettingsSpclPosition1 = New System.Windows.Forms.TextBox() Me.gbSettingsJogging = New System.Windows.Forms.GroupBox() + Me.cbSettingsKeyboardJogging = New System.Windows.Forms.CheckBox() Me.btnSettingsRefreshJogging = New System.Windows.Forms.Button() Me.Label41 = New System.Windows.Forms.Label() Me.Label40 = New System.Windows.Forms.Label() Me.Label39 = New System.Windows.Forms.Label() Me.Label38 = New System.Windows.Forms.Label() + Me.tbSettingsZRepeat = New System.Windows.Forms.TextBox() + Me.tbSettingsYRepeat = New System.Windows.Forms.TextBox() + Me.tbSettingsXRepeat = New System.Windows.Forms.TextBox() Me.Label35 = New System.Windows.Forms.Label() Me.Label34 = New System.Windows.Forms.Label() Me.Label32 = New System.Windows.Forms.Label() + Me.tbSettingsFRMetric = New System.Windows.Forms.TextBox() Me.Label33 = New System.Windows.Forms.Label() + Me.tbSettingsFIMetric = New System.Windows.Forms.TextBox() Me.Label31 = New System.Windows.Forms.Label() + Me.tbSettingsFRImperial = New System.Windows.Forms.TextBox() Me.Label30 = New System.Windows.Forms.Label() + Me.cbSettingsMetric = New System.Windows.Forms.CheckBox() + Me.tbSettingsFIImperial = New System.Windows.Forms.TextBox() Me.ofdGcodeFile = New System.Windows.Forms.OpenFileDialog() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.sfdOffsets = New System.Windows.Forms.SaveFileDialog() Me.ofdOffsets = New System.Windows.Forms.OpenFileDialog() Me.GrblSettingsBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.Label4 = New System.Windows.Forms.Label() - Me.cbVerbose = New System.Windows.Forms.CheckBox() - Me.tbSettingsGrblLastParam = New System.Windows.Forms.TextBox() - Me.cbSettingsLeftHanded = New System.Windows.Forms.CheckBox() - Me.cbSettingsConnectOnLoad = New System.Windows.Forms.CheckBox() - Me.cbSettingsPauseOnError = New System.Windows.Forms.CheckBox() - Me.cbStatusPollEnable = New System.Windows.Forms.CheckBox() - Me.tbSettingsRBuffSize = New System.Windows.Forms.TextBox() - Me.tbSettingsQSize = New System.Windows.Forms.TextBox() - Me.tbSettingsPollRate = New System.Windows.Forms.TextBox() - Me.tbSettingsSpclPosition2 = New System.Windows.Forms.TextBox() - Me.tbWorkZ0Cmd = New System.Windows.Forms.TextBox() - Me.tbWorkY0Cmd = New System.Windows.Forms.TextBox() - Me.tbWorkX0Cmd = New System.Windows.Forms.TextBox() - Me.tbSettingsZeroXYZCmd = New System.Windows.Forms.TextBox() - Me.tbSettingsSpclPosition1 = New System.Windows.Forms.TextBox() - Me.cbSettingsKeyboardJogging = New System.Windows.Forms.CheckBox() - Me.tbSettingsZRepeat = New System.Windows.Forms.TextBox() - Me.tbSettingsYRepeat = New System.Windows.Forms.TextBox() - Me.tbSettingsXRepeat = New System.Windows.Forms.TextBox() - Me.tbSettingsFRMetric = New System.Windows.Forms.TextBox() - Me.tbSettingsFIMetric = New System.Windows.Forms.TextBox() - Me.tbSettingsFRImperial = New System.Windows.Forms.TextBox() - Me.cbSettingsMetric = New System.Windows.Forms.CheckBox() - Me.tbSettingsFIImperial = New System.Windows.Forms.TextBox() Me.MenuStrip1.SuspendLayout() Me.TabControl1.SuspendLayout() Me.tabPgInterface.SuspendLayout() @@ -847,6 +847,7 @@ Partial Class GrblGui Me.rbFeedRate2.Size = New System.Drawing.Size(14, 13) Me.rbFeedRate2.TabIndex = 11 Me.rbFeedRate2.TabStop = True + Me.rbFeedRate2.Tag = "F2" Me.rbFeedRate2.UseVisualStyleBackColor = True ' 'rbFeedRate1 @@ -857,6 +858,7 @@ Partial Class GrblGui Me.rbFeedRate1.Size = New System.Drawing.Size(14, 13) Me.rbFeedRate1.TabIndex = 10 Me.rbFeedRate1.TabStop = True + Me.rbFeedRate1.Tag = "F1" Me.rbFeedRate1.UseVisualStyleBackColor = True ' 'rbFeedRate3 @@ -867,6 +869,7 @@ Partial Class GrblGui Me.rbFeedRate3.Size = New System.Drawing.Size(14, 13) Me.rbFeedRate3.TabIndex = 12 Me.rbFeedRate3.TabStop = True + Me.rbFeedRate3.Tag = "F3" Me.rbFeedRate3.UseVisualStyleBackColor = True ' 'rbFeedRate4 @@ -877,6 +880,7 @@ Partial Class GrblGui Me.rbFeedRate4.Size = New System.Drawing.Size(14, 13) Me.rbFeedRate4.TabIndex = 13 Me.rbFeedRate4.TabStop = True + Me.rbFeedRate4.Tag = "F4" Me.rbFeedRate4.UseVisualStyleBackColor = True ' 'gbDistance @@ -901,6 +905,7 @@ Partial Class GrblGui Me.rbDistance1.Size = New System.Drawing.Size(14, 13) Me.rbDistance1.TabIndex = 6 Me.rbDistance1.TabStop = True + Me.rbDistance1.Tag = "I1" Me.rbDistance1.UseVisualStyleBackColor = True ' 'rbDistance2 @@ -911,6 +916,7 @@ Partial Class GrblGui Me.rbDistance2.Size = New System.Drawing.Size(14, 13) Me.rbDistance2.TabIndex = 7 Me.rbDistance2.TabStop = True + Me.rbDistance2.Tag = "I2" Me.rbDistance2.UseVisualStyleBackColor = True ' 'rbDistance3 @@ -921,6 +927,7 @@ Partial Class GrblGui Me.rbDistance3.Size = New System.Drawing.Size(14, 13) Me.rbDistance3.TabIndex = 8 Me.rbDistance3.TabStop = True + Me.rbDistance3.Tag = "I3" Me.rbDistance3.UseVisualStyleBackColor = True ' 'rbDistance4 @@ -931,6 +938,7 @@ Partial Class GrblGui Me.rbDistance4.Size = New System.Drawing.Size(14, 13) Me.rbDistance4.TabIndex = 9 Me.rbDistance4.TabStop = True + Me.rbDistance4.Tag = "I4" Me.rbDistance4.UseVisualStyleBackColor = True ' 'cbUnits @@ -1009,6 +1017,18 @@ Partial Class GrblGui Me.prgBarQ.Style = System.Windows.Forms.ProgressBarStyle.Continuous Me.prgBarQ.TabIndex = 20 ' + 'cbVerbose + ' + Me.cbVerbose.AutoSize = True + Me.cbVerbose.Checked = Global.GrblPanel.My.MySettings.Default.StatusVerbose + Me.cbVerbose.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.GrblPanel.My.MySettings.Default, "statusVerbose", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.cbVerbose.Location = New System.Drawing.Point(87, 20) + Me.cbVerbose.Name = "cbVerbose" + Me.cbVerbose.Size = New System.Drawing.Size(65, 17) + Me.cbVerbose.TabIndex = 15 + Me.cbVerbose.Text = "Verbose" + Me.cbVerbose.UseVisualStyleBackColor = True + ' 'lbResponses ' Me.lbResponses.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ @@ -2014,6 +2034,25 @@ Partial Class GrblGui Me.gbGrblSettings.TabStop = False Me.gbGrblSettings.Text = "Grbl Settings" ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(57, 555) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(82, 13) + Me.Label4.TabIndex = 7 + Me.Label4.Text = "Last Grbl Param" + ' + 'tbSettingsGrblLastParam + ' + Me.tbSettingsGrblLastParam.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "GrblLastParamID", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.tbSettingsGrblLastParam.Location = New System.Drawing.Point(6, 552) + Me.tbSettingsGrblLastParam.Name = "tbSettingsGrblLastParam" + Me.tbSettingsGrblLastParam.Size = New System.Drawing.Size(45, 20) + Me.tbSettingsGrblLastParam.TabIndex = 6 + Me.tbSettingsGrblLastParam.Text = Global.GrblPanel.My.MySettings.Default.GrblLastParamID + Me.ToolTip1.SetToolTip(Me.tbSettingsGrblLastParam, "Change this to reflect the highest Grbl Parameter number") + ' 'dgGrblSettings ' Me.dgGrblSettings.AllowUserToAddRows = False @@ -2218,6 +2257,57 @@ Partial Class GrblGui Me.gbSettingsMisc.TabStop = False Me.gbSettingsMisc.Text = "Misc" ' + 'cbSettingsLeftHanded + ' + Me.cbSettingsLeftHanded.AutoSize = True + Me.cbSettingsLeftHanded.Checked = Global.GrblPanel.My.MySettings.Default.LeftHandedGUI + Me.cbSettingsLeftHanded.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.GrblPanel.My.MySettings.Default, "LeftHandedGUI", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.cbSettingsLeftHanded.Location = New System.Drawing.Point(126, 127) + Me.cbSettingsLeftHanded.Name = "cbSettingsLeftHanded" + Me.cbSettingsLeftHanded.Size = New System.Drawing.Size(107, 17) + Me.cbSettingsLeftHanded.TabIndex = 18 + Me.cbSettingsLeftHanded.Text = "Left Handed GUI" + Me.cbSettingsLeftHanded.UseVisualStyleBackColor = True + ' + 'cbSettingsConnectOnLoad + ' + Me.cbSettingsConnectOnLoad.AutoSize = True + Me.cbSettingsConnectOnLoad.Checked = Global.GrblPanel.My.MySettings.Default.GrblConnectOnLoad + Me.cbSettingsConnectOnLoad.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.GrblPanel.My.MySettings.Default, "GrblConnectOnLoad", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.cbSettingsConnectOnLoad.Location = New System.Drawing.Point(13, 109) + Me.cbSettingsConnectOnLoad.Name = "cbSettingsConnectOnLoad" + Me.cbSettingsConnectOnLoad.Size = New System.Drawing.Size(108, 17) + Me.cbSettingsConnectOnLoad.TabIndex = 12 + Me.cbSettingsConnectOnLoad.Text = "Connect on Load" + Me.ToolTip1.SetToolTip(Me.cbSettingsConnectOnLoad, "Connect automatically to last port") + Me.cbSettingsConnectOnLoad.UseVisualStyleBackColor = True + ' + 'cbSettingsPauseOnError + ' + Me.cbSettingsPauseOnError.AutoSize = True + Me.cbSettingsPauseOnError.Checked = Global.GrblPanel.My.MySettings.Default.GCodePauseOnError + Me.cbSettingsPauseOnError.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbSettingsPauseOnError.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.GrblPanel.My.MySettings.Default, "GCodePauseOnError", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.cbSettingsPauseOnError.Location = New System.Drawing.Point(13, 92) + Me.cbSettingsPauseOnError.Name = "cbSettingsPauseOnError" + Me.cbSettingsPauseOnError.Size = New System.Drawing.Size(96, 17) + Me.cbSettingsPauseOnError.TabIndex = 7 + Me.cbSettingsPauseOnError.Text = "Pause on Error" + Me.cbSettingsPauseOnError.UseVisualStyleBackColor = True + ' + 'cbStatusPollEnable + ' + Me.cbStatusPollEnable.AutoSize = True + Me.cbStatusPollEnable.Checked = Global.GrblPanel.My.MySettings.Default.StatusPollEnabled + Me.cbStatusPollEnable.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbStatusPollEnable.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.GrblPanel.My.MySettings.Default, "StatusPollEnabled", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.cbStatusPollEnable.Location = New System.Drawing.Point(12, 127) + Me.cbStatusPollEnable.Name = "cbStatusPollEnable" + Me.cbStatusPollEnable.Size = New System.Drawing.Size(76, 17) + Me.cbStatusPollEnable.TabIndex = 17 + Me.cbStatusPollEnable.Text = "Status Poll" + Me.cbStatusPollEnable.UseVisualStyleBackColor = True + ' 'btnSettingsRefreshMisc ' Me.btnSettingsRefreshMisc.Location = New System.Drawing.Point(0, 157) @@ -2246,6 +2336,24 @@ Partial Class GrblGui Me.Label36.TabIndex = 4 Me.Label36.Text = "Q Max Size" ' + 'tbSettingsRBuffSize + ' + Me.tbSettingsRBuffSize.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "RBuffMaxSize", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.tbSettingsRBuffSize.Location = New System.Drawing.Point(12, 68) + Me.tbSettingsRBuffSize.Name = "tbSettingsRBuffSize" + Me.tbSettingsRBuffSize.Size = New System.Drawing.Size(43, 20) + Me.tbSettingsRBuffSize.TabIndex = 3 + Me.tbSettingsRBuffSize.Text = Global.GrblPanel.My.MySettings.Default.RBuffMaxSize + ' + 'tbSettingsQSize + ' + Me.tbSettingsQSize.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "QBuffMaxSize", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.tbSettingsQSize.Location = New System.Drawing.Point(12, 42) + Me.tbSettingsQSize.Name = "tbSettingsQSize" + Me.tbSettingsQSize.Size = New System.Drawing.Size(43, 20) + Me.tbSettingsQSize.TabIndex = 2 + Me.tbSettingsQSize.Text = Global.GrblPanel.My.MySettings.Default.QBuffMaxSize + ' 'Label26 ' Me.Label26.AutoSize = True @@ -2255,6 +2363,15 @@ Partial Class GrblGui Me.Label26.TabIndex = 1 Me.Label26.Text = "Poll Interval (ms)" ' + 'tbSettingsPollRate + ' + Me.tbSettingsPollRate.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "statusPollInterval", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.tbSettingsPollRate.Location = New System.Drawing.Point(12, 19) + Me.tbSettingsPollRate.Name = "tbSettingsPollRate" + Me.tbSettingsPollRate.Size = New System.Drawing.Size(43, 20) + Me.tbSettingsPollRate.TabIndex = 0 + Me.tbSettingsPollRate.Text = Global.GrblPanel.My.MySettings.Default.StatusPollInterval + ' 'gbSettingsPosition ' Me.gbSettingsPosition.Controls.Add(Me.Label8) @@ -2286,6 +2403,15 @@ Partial Class GrblGui Me.Label8.TabIndex = 12 Me.Label8.Text = "GoTo Spcl Posn 2" ' + 'tbSettingsSpclPosition2 + ' + Me.tbSettingsSpclPosition2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "MachineSpclPosition2", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.tbSettingsSpclPosition2.Location = New System.Drawing.Point(12, 44) + Me.tbSettingsSpclPosition2.Name = "tbSettingsSpclPosition2" + Me.tbSettingsSpclPosition2.Size = New System.Drawing.Size(117, 20) + Me.tbSettingsSpclPosition2.TabIndex = 11 + Me.tbSettingsSpclPosition2.Text = Global.GrblPanel.My.MySettings.Default.MachineSpclPosition2 + ' 'btnSettingsRefreshPosition ' Me.btnSettingsRefreshPosition.Location = New System.Drawing.Point(-2, 182) @@ -2305,6 +2431,15 @@ Partial Class GrblGui Me.Label29.TabIndex = 9 Me.Label29.Text = "Work Z 0 cmd" ' + 'tbWorkZ0Cmd + ' + Me.tbWorkZ0Cmd.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "WorkZ0Cmd", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.tbWorkZ0Cmd.Location = New System.Drawing.Point(12, 147) + Me.tbWorkZ0Cmd.Name = "tbWorkZ0Cmd" + Me.tbWorkZ0Cmd.Size = New System.Drawing.Size(117, 20) + Me.tbWorkZ0Cmd.TabIndex = 8 + Me.tbWorkZ0Cmd.Text = Global.GrblPanel.My.MySettings.Default.WorkZ0Cmd + ' 'Label28 ' Me.Label28.AutoSize = True @@ -2314,6 +2449,15 @@ Partial Class GrblGui Me.Label28.TabIndex = 7 Me.Label28.Text = "Work Y 0 cmd" ' + 'tbWorkY0Cmd + ' + Me.tbWorkY0Cmd.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "WorkY0Cmd", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.tbWorkY0Cmd.Location = New System.Drawing.Point(12, 121) + Me.tbWorkY0Cmd.Name = "tbWorkY0Cmd" + Me.tbWorkY0Cmd.Size = New System.Drawing.Size(117, 20) + Me.tbWorkY0Cmd.TabIndex = 6 + Me.tbWorkY0Cmd.Text = Global.GrblPanel.My.MySettings.Default.WorkY0Cmd + ' 'Label13 ' Me.Label13.AutoSize = True @@ -2332,6 +2476,24 @@ Partial Class GrblGui Me.Label12.TabIndex = 4 Me.Label12.Text = "Zero All Cmd" ' + 'tbWorkX0Cmd + ' + Me.tbWorkX0Cmd.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "WorkX0Cmd", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.tbWorkX0Cmd.Location = New System.Drawing.Point(12, 96) + Me.tbWorkX0Cmd.Name = "tbWorkX0Cmd" + Me.tbWorkX0Cmd.Size = New System.Drawing.Size(117, 20) + Me.tbWorkX0Cmd.TabIndex = 3 + Me.tbWorkX0Cmd.Text = Global.GrblPanel.My.MySettings.Default.WorkX0Cmd + ' + 'tbSettingsZeroXYZCmd + ' + Me.tbSettingsZeroXYZCmd.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "Work0Cmd", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.tbSettingsZeroXYZCmd.Location = New System.Drawing.Point(12, 70) + Me.tbSettingsZeroXYZCmd.Name = "tbSettingsZeroXYZCmd" + Me.tbSettingsZeroXYZCmd.Size = New System.Drawing.Size(117, 20) + Me.tbSettingsZeroXYZCmd.TabIndex = 2 + Me.tbSettingsZeroXYZCmd.Text = Global.GrblPanel.My.MySettings.Default.Work0Cmd + ' 'Label11 ' Me.Label11.AutoSize = True @@ -2342,6 +2504,15 @@ Partial Class GrblGui Me.Label11.Text = "Go To Spcl Posn1" Me.ToolTip1.SetToolTip(Me.Label11, "Also known as Soft Home") ' + 'tbSettingsSpclPosition1 + ' + Me.tbSettingsSpclPosition1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "MachineSpclPosition1", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.tbSettingsSpclPosition1.Location = New System.Drawing.Point(12, 18) + Me.tbSettingsSpclPosition1.Name = "tbSettingsSpclPosition1" + Me.tbSettingsSpclPosition1.Size = New System.Drawing.Size(117, 20) + Me.tbSettingsSpclPosition1.TabIndex = 0 + Me.tbSettingsSpclPosition1.Text = Global.GrblPanel.My.MySettings.Default.MachineSpclPosition1 + ' 'gbSettingsJogging ' Me.gbSettingsJogging.Controls.Add(Me.cbSettingsKeyboardJogging) @@ -2371,6 +2542,19 @@ Partial Class GrblGui Me.gbSettingsJogging.TabStop = False Me.gbSettingsJogging.Text = "Jogging" ' + 'cbSettingsKeyboardJogging + ' + Me.cbSettingsKeyboardJogging.AutoSize = True + Me.cbSettingsKeyboardJogging.Checked = Global.GrblPanel.My.MySettings.Default.JoggingUseKeyboard + Me.cbSettingsKeyboardJogging.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.GrblPanel.My.MySettings.Default, "JoggingUseKeyboard", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.cbSettingsKeyboardJogging.Location = New System.Drawing.Point(6, 267) + Me.cbSettingsKeyboardJogging.Name = "cbSettingsKeyboardJogging" + Me.cbSettingsKeyboardJogging.Size = New System.Drawing.Size(140, 17) + Me.cbSettingsKeyboardJogging.TabIndex = 27 + Me.cbSettingsKeyboardJogging.Text = "Enable keyboard arrows" + Me.ToolTip1.SetToolTip(Me.cbSettingsKeyboardJogging, "Allow arrows, pg up, pg dn to do jogging") + Me.cbSettingsKeyboardJogging.UseVisualStyleBackColor = True + ' 'btnSettingsRefreshJogging ' Me.btnSettingsRefreshJogging.Location = New System.Drawing.Point(0, 301) @@ -2418,6 +2602,33 @@ Partial Class GrblGui Me.Label38.TabIndex = 23 Me.Label38.Text = "X Repeat Rate" ' + 'tbSettingsZRepeat + ' + Me.tbSettingsZRepeat.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "JoggingZRepeat", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.tbSettingsZRepeat.Location = New System.Drawing.Point(6, 241) + Me.tbSettingsZRepeat.Name = "tbSettingsZRepeat" + Me.tbSettingsZRepeat.Size = New System.Drawing.Size(45, 20) + Me.tbSettingsZRepeat.TabIndex = 22 + Me.tbSettingsZRepeat.Text = Global.GrblPanel.My.MySettings.Default.JoggingZRepeat + ' + 'tbSettingsYRepeat + ' + Me.tbSettingsYRepeat.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "JoggingYRepeat", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.tbSettingsYRepeat.Location = New System.Drawing.Point(6, 215) + Me.tbSettingsYRepeat.Name = "tbSettingsYRepeat" + Me.tbSettingsYRepeat.Size = New System.Drawing.Size(45, 20) + Me.tbSettingsYRepeat.TabIndex = 21 + Me.tbSettingsYRepeat.Text = Global.GrblPanel.My.MySettings.Default.JoggingYRepeat + ' + 'tbSettingsXRepeat + ' + Me.tbSettingsXRepeat.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "JoggingXRepeat", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.tbSettingsXRepeat.Location = New System.Drawing.Point(6, 189) + Me.tbSettingsXRepeat.Name = "tbSettingsXRepeat" + Me.tbSettingsXRepeat.Size = New System.Drawing.Size(45, 20) + Me.tbSettingsXRepeat.TabIndex = 20 + Me.tbSettingsXRepeat.Text = Global.GrblPanel.My.MySettings.Default.JoggingXRepeat + ' 'Label35 ' Me.Label35.AutoSize = True @@ -2447,258 +2658,7 @@ Partial Class GrblGui Me.Label32.TabIndex = 17 Me.Label32.Text = "Feed Rates" ' - 'Label33 - ' - Me.Label33.AutoSize = True - Me.Label33.Location = New System.Drawing.Point(129, 120) - Me.Label33.Name = "Label33" - Me.Label33.Size = New System.Drawing.Size(86, 13) - Me.Label33.TabIndex = 15 - Me.Label33.Text = "Feed Increments" - ' - 'Label31 - ' - Me.Label31.AutoSize = True - Me.Label31.Location = New System.Drawing.Point(129, 85) - Me.Label31.Name = "Label31" - Me.Label31.Size = New System.Drawing.Size(62, 13) - Me.Label31.TabIndex = 13 - Me.Label31.Text = "Feed Rates" - ' - 'Label30 - ' - Me.Label30.AutoSize = True - Me.Label30.Location = New System.Drawing.Point(129, 59) - Me.Label30.Name = "Label30" - Me.Label30.Size = New System.Drawing.Size(86, 13) - Me.Label30.TabIndex = 11 - Me.Label30.Text = "Feed Increments" - ' - 'ofdGcodeFile - ' - Me.ofdGcodeFile.DefaultExt = "ngc" - Me.ofdGcodeFile.FileName = "*.*" - Me.ofdGcodeFile.Filter = "All files (*.*)|*.*" - ' - 'sfdOffsets - ' - Me.sfdOffsets.DefaultExt = "xml" - Me.sfdOffsets.Filter = "WorkOffset Files|*.xml" - ' - 'ofdOffsets - ' - Me.ofdOffsets.DefaultExt = "xml" - Me.ofdOffsets.FileName = "OpenFileDialog1" - Me.ofdOffsets.Filter = "WorkOffset Files|*.xml" - ' - 'GrblSettingsBindingSource - ' - Me.GrblSettingsBindingSource.DataSource = GetType(GrblPanel.GrblGui.GrblSettings) - ' - 'Label4 - ' - Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(57, 555) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(82, 13) - Me.Label4.TabIndex = 7 - Me.Label4.Text = "Last Grbl Param" - ' - 'cbVerbose - ' - Me.cbVerbose.AutoSize = True - Me.cbVerbose.Checked = Global.GrblPanel.My.MySettings.Default.StatusVerbose - Me.cbVerbose.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.GrblPanel.My.MySettings.Default, "statusVerbose", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.cbVerbose.Location = New System.Drawing.Point(87, 20) - Me.cbVerbose.Name = "cbVerbose" - Me.cbVerbose.Size = New System.Drawing.Size(65, 17) - Me.cbVerbose.TabIndex = 15 - Me.cbVerbose.Text = "Verbose" - Me.cbVerbose.UseVisualStyleBackColor = True - ' - 'tbSettingsGrblLastParam - ' - Me.tbSettingsGrblLastParam.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "GrblLastParamID", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.tbSettingsGrblLastParam.Location = New System.Drawing.Point(6, 552) - Me.tbSettingsGrblLastParam.Name = "tbSettingsGrblLastParam" - Me.tbSettingsGrblLastParam.Size = New System.Drawing.Size(45, 20) - Me.tbSettingsGrblLastParam.TabIndex = 6 - Me.tbSettingsGrblLastParam.Text = Global.GrblPanel.My.MySettings.Default.GrblLastParamID - Me.ToolTip1.SetToolTip(Me.tbSettingsGrblLastParam, "Change this to reflect the highest Grbl Parameter number") - ' - 'cbSettingsLeftHanded - ' - Me.cbSettingsLeftHanded.AutoSize = True - Me.cbSettingsLeftHanded.Checked = Global.GrblPanel.My.MySettings.Default.LeftHandedGUI - Me.cbSettingsLeftHanded.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.GrblPanel.My.MySettings.Default, "LeftHandedGUI", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.cbSettingsLeftHanded.Location = New System.Drawing.Point(126, 127) - Me.cbSettingsLeftHanded.Name = "cbSettingsLeftHanded" - Me.cbSettingsLeftHanded.Size = New System.Drawing.Size(107, 17) - Me.cbSettingsLeftHanded.TabIndex = 18 - Me.cbSettingsLeftHanded.Text = "Left Handed GUI" - Me.cbSettingsLeftHanded.UseVisualStyleBackColor = True - ' - 'cbSettingsConnectOnLoad - ' - Me.cbSettingsConnectOnLoad.AutoSize = True - Me.cbSettingsConnectOnLoad.Checked = Global.GrblPanel.My.MySettings.Default.GrblConnectOnLoad - Me.cbSettingsConnectOnLoad.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.GrblPanel.My.MySettings.Default, "GrblConnectOnLoad", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.cbSettingsConnectOnLoad.Location = New System.Drawing.Point(13, 109) - Me.cbSettingsConnectOnLoad.Name = "cbSettingsConnectOnLoad" - Me.cbSettingsConnectOnLoad.Size = New System.Drawing.Size(108, 17) - Me.cbSettingsConnectOnLoad.TabIndex = 12 - Me.cbSettingsConnectOnLoad.Text = "Connect on Load" - Me.ToolTip1.SetToolTip(Me.cbSettingsConnectOnLoad, "Connect automatically to last port") - Me.cbSettingsConnectOnLoad.UseVisualStyleBackColor = True - ' - 'cbSettingsPauseOnError - ' - Me.cbSettingsPauseOnError.AutoSize = True - Me.cbSettingsPauseOnError.Checked = Global.GrblPanel.My.MySettings.Default.GCodePauseOnError - Me.cbSettingsPauseOnError.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbSettingsPauseOnError.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.GrblPanel.My.MySettings.Default, "GCodePauseOnError", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.cbSettingsPauseOnError.Location = New System.Drawing.Point(13, 92) - Me.cbSettingsPauseOnError.Name = "cbSettingsPauseOnError" - Me.cbSettingsPauseOnError.Size = New System.Drawing.Size(96, 17) - Me.cbSettingsPauseOnError.TabIndex = 7 - Me.cbSettingsPauseOnError.Text = "Pause on Error" - Me.cbSettingsPauseOnError.UseVisualStyleBackColor = True - ' - 'cbStatusPollEnable - ' - Me.cbStatusPollEnable.AutoSize = True - Me.cbStatusPollEnable.Checked = Global.GrblPanel.My.MySettings.Default.StatusPollEnabled - Me.cbStatusPollEnable.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbStatusPollEnable.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.GrblPanel.My.MySettings.Default, "StatusPollEnabled", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.cbStatusPollEnable.Location = New System.Drawing.Point(12, 127) - Me.cbStatusPollEnable.Name = "cbStatusPollEnable" - Me.cbStatusPollEnable.Size = New System.Drawing.Size(76, 17) - Me.cbStatusPollEnable.TabIndex = 17 - Me.cbStatusPollEnable.Text = "Status Poll" - Me.cbStatusPollEnable.UseVisualStyleBackColor = True - ' - 'tbSettingsRBuffSize - ' - Me.tbSettingsRBuffSize.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "RBuffMaxSize", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.tbSettingsRBuffSize.Location = New System.Drawing.Point(12, 68) - Me.tbSettingsRBuffSize.Name = "tbSettingsRBuffSize" - Me.tbSettingsRBuffSize.Size = New System.Drawing.Size(43, 20) - Me.tbSettingsRBuffSize.TabIndex = 3 - Me.tbSettingsRBuffSize.Text = Global.GrblPanel.My.MySettings.Default.RBuffMaxSize - ' - 'tbSettingsQSize - ' - Me.tbSettingsQSize.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "QBuffMaxSize", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.tbSettingsQSize.Location = New System.Drawing.Point(12, 42) - Me.tbSettingsQSize.Name = "tbSettingsQSize" - Me.tbSettingsQSize.Size = New System.Drawing.Size(43, 20) - Me.tbSettingsQSize.TabIndex = 2 - Me.tbSettingsQSize.Text = Global.GrblPanel.My.MySettings.Default.QBuffMaxSize - ' - 'tbSettingsPollRate - ' - Me.tbSettingsPollRate.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "statusPollInterval", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.tbSettingsPollRate.Location = New System.Drawing.Point(12, 19) - Me.tbSettingsPollRate.Name = "tbSettingsPollRate" - Me.tbSettingsPollRate.Size = New System.Drawing.Size(43, 20) - Me.tbSettingsPollRate.TabIndex = 0 - Me.tbSettingsPollRate.Text = Global.GrblPanel.My.MySettings.Default.StatusPollInterval - ' - 'tbSettingsSpclPosition2 - ' - Me.tbSettingsSpclPosition2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "MachineSpclPosition2", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.tbSettingsSpclPosition2.Location = New System.Drawing.Point(12, 44) - Me.tbSettingsSpclPosition2.Name = "tbSettingsSpclPosition2" - Me.tbSettingsSpclPosition2.Size = New System.Drawing.Size(117, 20) - Me.tbSettingsSpclPosition2.TabIndex = 11 - Me.tbSettingsSpclPosition2.Text = Global.GrblPanel.My.MySettings.Default.MachineSpclPosition2 - ' - 'tbWorkZ0Cmd - ' - Me.tbWorkZ0Cmd.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "WorkZ0Cmd", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.tbWorkZ0Cmd.Location = New System.Drawing.Point(12, 147) - Me.tbWorkZ0Cmd.Name = "tbWorkZ0Cmd" - Me.tbWorkZ0Cmd.Size = New System.Drawing.Size(117, 20) - Me.tbWorkZ0Cmd.TabIndex = 8 - Me.tbWorkZ0Cmd.Text = Global.GrblPanel.My.MySettings.Default.WorkZ0Cmd - ' - 'tbWorkY0Cmd - ' - Me.tbWorkY0Cmd.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "WorkY0Cmd", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.tbWorkY0Cmd.Location = New System.Drawing.Point(12, 121) - Me.tbWorkY0Cmd.Name = "tbWorkY0Cmd" - Me.tbWorkY0Cmd.Size = New System.Drawing.Size(117, 20) - Me.tbWorkY0Cmd.TabIndex = 6 - Me.tbWorkY0Cmd.Text = Global.GrblPanel.My.MySettings.Default.WorkY0Cmd - ' - 'tbWorkX0Cmd - ' - Me.tbWorkX0Cmd.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "WorkX0Cmd", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.tbWorkX0Cmd.Location = New System.Drawing.Point(12, 96) - Me.tbWorkX0Cmd.Name = "tbWorkX0Cmd" - Me.tbWorkX0Cmd.Size = New System.Drawing.Size(117, 20) - Me.tbWorkX0Cmd.TabIndex = 3 - Me.tbWorkX0Cmd.Text = Global.GrblPanel.My.MySettings.Default.WorkX0Cmd - ' - 'tbSettingsZeroXYZCmd - ' - Me.tbSettingsZeroXYZCmd.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "Work0Cmd", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.tbSettingsZeroXYZCmd.Location = New System.Drawing.Point(12, 70) - Me.tbSettingsZeroXYZCmd.Name = "tbSettingsZeroXYZCmd" - Me.tbSettingsZeroXYZCmd.Size = New System.Drawing.Size(117, 20) - Me.tbSettingsZeroXYZCmd.TabIndex = 2 - Me.tbSettingsZeroXYZCmd.Text = Global.GrblPanel.My.MySettings.Default.Work0Cmd - ' - 'tbSettingsSpclPosition1 - ' - Me.tbSettingsSpclPosition1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "MachineSpclPosition1", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.tbSettingsSpclPosition1.Location = New System.Drawing.Point(12, 18) - Me.tbSettingsSpclPosition1.Name = "tbSettingsSpclPosition1" - Me.tbSettingsSpclPosition1.Size = New System.Drawing.Size(117, 20) - Me.tbSettingsSpclPosition1.TabIndex = 0 - Me.tbSettingsSpclPosition1.Text = Global.GrblPanel.My.MySettings.Default.MachineSpclPosition1 - ' - 'cbSettingsKeyboardJogging - ' - Me.cbSettingsKeyboardJogging.AutoSize = True - Me.cbSettingsKeyboardJogging.Checked = Global.GrblPanel.My.MySettings.Default.JoggingUseKeyboard - Me.cbSettingsKeyboardJogging.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.GrblPanel.My.MySettings.Default, "JoggingUseKeyboard", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.cbSettingsKeyboardJogging.Location = New System.Drawing.Point(6, 267) - Me.cbSettingsKeyboardJogging.Name = "cbSettingsKeyboardJogging" - Me.cbSettingsKeyboardJogging.Size = New System.Drawing.Size(140, 17) - Me.cbSettingsKeyboardJogging.TabIndex = 27 - Me.cbSettingsKeyboardJogging.Text = "Enable keyboard arrows" - Me.ToolTip1.SetToolTip(Me.cbSettingsKeyboardJogging, "Allow arrows, pg up, pg dn to do jogging") - Me.cbSettingsKeyboardJogging.UseVisualStyleBackColor = True - ' - 'tbSettingsZRepeat - ' - Me.tbSettingsZRepeat.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "JoggingZRepeat", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.tbSettingsZRepeat.Location = New System.Drawing.Point(6, 241) - Me.tbSettingsZRepeat.Name = "tbSettingsZRepeat" - Me.tbSettingsZRepeat.Size = New System.Drawing.Size(45, 20) - Me.tbSettingsZRepeat.TabIndex = 22 - Me.tbSettingsZRepeat.Text = Global.GrblPanel.My.MySettings.Default.JoggingZRepeat - ' - 'tbSettingsYRepeat - ' - Me.tbSettingsYRepeat.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "JoggingYRepeat", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.tbSettingsYRepeat.Location = New System.Drawing.Point(6, 215) - Me.tbSettingsYRepeat.Name = "tbSettingsYRepeat" - Me.tbSettingsYRepeat.Size = New System.Drawing.Size(45, 20) - Me.tbSettingsYRepeat.TabIndex = 21 - Me.tbSettingsYRepeat.Text = Global.GrblPanel.My.MySettings.Default.JoggingYRepeat - ' - 'tbSettingsXRepeat - ' - Me.tbSettingsXRepeat.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "JoggingXRepeat", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.tbSettingsXRepeat.Location = New System.Drawing.Point(6, 189) - Me.tbSettingsXRepeat.Name = "tbSettingsXRepeat" - Me.tbSettingsXRepeat.Size = New System.Drawing.Size(45, 20) - Me.tbSettingsXRepeat.TabIndex = 20 - Me.tbSettingsXRepeat.Text = Global.GrblPanel.My.MySettings.Default.JoggingXRepeat - ' - 'tbSettingsFRMetric + 'tbSettingsFRMetric ' Me.tbSettingsFRMetric.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "JoggingFRMetric", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) Me.tbSettingsFRMetric.Location = New System.Drawing.Point(6, 143) @@ -2707,6 +2667,15 @@ Partial Class GrblGui Me.tbSettingsFRMetric.TabIndex = 16 Me.tbSettingsFRMetric.Text = Global.GrblPanel.My.MySettings.Default.JoggingFRMetric ' + 'Label33 + ' + Me.Label33.AutoSize = True + Me.Label33.Location = New System.Drawing.Point(129, 120) + Me.Label33.Name = "Label33" + Me.Label33.Size = New System.Drawing.Size(86, 13) + Me.Label33.TabIndex = 15 + Me.Label33.Text = "Feed Increments" + ' 'tbSettingsFIMetric ' Me.tbSettingsFIMetric.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "JoggingFIMEtric", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) @@ -2716,6 +2685,15 @@ Partial Class GrblGui Me.tbSettingsFIMetric.TabIndex = 14 Me.tbSettingsFIMetric.Text = Global.GrblPanel.My.MySettings.Default.JoggingFIMEtric ' + 'Label31 + ' + Me.Label31.AutoSize = True + Me.Label31.Location = New System.Drawing.Point(129, 85) + Me.Label31.Name = "Label31" + Me.Label31.Size = New System.Drawing.Size(62, 13) + Me.Label31.TabIndex = 13 + Me.Label31.Text = "Feed Rates" + ' 'tbSettingsFRImperial ' Me.tbSettingsFRImperial.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.GrblPanel.My.MySettings.Default, "JoggingFRImperial", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) @@ -2725,6 +2703,15 @@ Partial Class GrblGui Me.tbSettingsFRImperial.TabIndex = 12 Me.tbSettingsFRImperial.Text = Global.GrblPanel.My.MySettings.Default.JoggingFRImperial ' + 'Label30 + ' + Me.Label30.AutoSize = True + Me.Label30.Location = New System.Drawing.Point(129, 59) + Me.Label30.Name = "Label30" + Me.Label30.Size = New System.Drawing.Size(86, 13) + Me.Label30.TabIndex = 11 + Me.Label30.Text = "Feed Increments" + ' 'cbSettingsMetric ' Me.cbSettingsMetric.AutoSize = True @@ -2746,6 +2733,27 @@ Partial Class GrblGui Me.tbSettingsFIImperial.TabIndex = 10 Me.tbSettingsFIImperial.Text = Global.GrblPanel.My.MySettings.Default.JoggingFIImperial ' + 'ofdGcodeFile + ' + Me.ofdGcodeFile.DefaultExt = "ngc" + Me.ofdGcodeFile.FileName = "*.*" + Me.ofdGcodeFile.Filter = "All files (*.*)|*.*" + ' + 'sfdOffsets + ' + Me.sfdOffsets.DefaultExt = "xml" + Me.sfdOffsets.Filter = "WorkOffset Files|*.xml" + ' + 'ofdOffsets + ' + Me.ofdOffsets.DefaultExt = "xml" + Me.ofdOffsets.FileName = "OpenFileDialog1" + Me.ofdOffsets.Filter = "WorkOffset Files|*.xml" + ' + 'GrblSettingsBindingSource + ' + Me.GrblSettingsBindingSource.DataSource = GetType(GrblPanel.GrblGui.GrblSettings) + ' 'GrblGui ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/Grbl-Panel/grblgui.resx b/Grbl-Panel/grblgui.resx index dc816d3..a297fe8 100644 --- a/Grbl-Panel/grblgui.resx +++ b/Grbl-Panel/grblgui.resx @@ -123,9 +123,6 @@ 526, 15 - - 526, 15 -