From 8b87b1cebba7f82b9bcab0ab94b7572f45bd9f0d Mon Sep 17 00:00:00 2001 From: Philipp von den Hoff Date: Sun, 6 Mar 2022 22:35:42 +0100 Subject: [PATCH 01/10] added marlin gcode support and marlin fan pwm --- LaserGRBL/Core/GrblCore.cs | 21 +- LaserGRBL/Core/MarlinCore.cs | 8 + LaserGRBL/CsPotrace/CsPotraceExportGCODE.cs | 12 +- LaserGRBL/GrblFile.cs | 178 +- .../ConvertSizeAndOptionForm.Designer.cs | 1024 +++---- .../ConvertSizeAndOptionForm.cs | 42 +- .../ConvertSizeAndOptionForm.resx | 35 +- LaserGRBL/RasterConverter/ImageProcessor.cs | 11 + LaserGRBL/SettingsForm.Designer.cs | 2410 +++++++++-------- LaserGRBL/SettingsForm.cs | 34 +- LaserGRBL/SettingsForm.resx | 243 +- LaserGRBL/StateBuilder.cs | 14 +- .../ConvertSizeAndOptionForm.Designer.cs | 496 ++-- .../SvgConverter/ConvertSizeAndOptionForm.cs | 20 +- .../ConvertSizeAndOptionForm.resx | 15 +- LaserGRBL/SvgConverter/gcodeRelated.cs | 90 +- LaserGRBL/WiFiDiscovery/IPAddressHelper.cs | 2 - 17 files changed, 2616 insertions(+), 2039 deletions(-) diff --git a/LaserGRBL/Core/GrblCore.cs b/LaserGRBL/Core/GrblCore.cs index 08dc3f38d..ac6f2a547 100644 --- a/LaserGRBL/Core/GrblCore.cs +++ b/LaserGRBL/Core/GrblCore.cs @@ -16,7 +16,7 @@ namespace LaserGRBL { - public enum Firmware + public enum Firmware { Grbl, Smoothie, Marlin, VigoWork } /// @@ -84,6 +84,12 @@ public enum DetectedIssue MachineAlarm = 5, } + public enum PwmMode + { + Spindle = 0, + Fan = 1, + } + public enum MacStatus { Disconnected, Connecting, Idle, Run, Hold, Door, Home, Alarm, Check, Jog, Queue, Cooling } @@ -981,8 +987,17 @@ public void AbortProgram() lock (this) { + GrblCommand stop = null; + if(Settings.GetObject("Firmware Type", Firmware.Grbl) == Firmware.Marlin && Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle) == GrblCore.PwmMode.Fan) + { + stop = new GrblCommand("M107"); + } + else + { + stop = new GrblCommand("M5"); + } mQueue.Clear(); //flush the queue of item to send - mQueue.Enqueue(new GrblCommand("M5")); //shut down laser + mQueue.Enqueue(stop); //shut down laser } } catch (Exception ex) @@ -2499,7 +2514,7 @@ internal void HKDisconnect() internal void HelpOnLine() { Tools.Utils.OpenLink(@"https://lasergrbl.com/usage/"); } - internal void GrblHoming() + internal virtual void GrblHoming() { if (CanDoHoming) EnqueueCommand(new GrblCommand("$H")); } internal void GrblUnlock() diff --git a/LaserGRBL/Core/MarlinCore.cs b/LaserGRBL/Core/MarlinCore.cs index 824cc9275..d62c474ed 100644 --- a/LaserGRBL/Core/MarlinCore.cs +++ b/LaserGRBL/Core/MarlinCore.cs @@ -66,6 +66,14 @@ public override void RefreshConfig() } + internal override void SendHomingCommand() + { + EnqueueCommand(new GrblCommand("G28")); + } + + internal override void GrblHoming() + { if (CanDoHoming) EnqueueCommand(new GrblCommand("G28")); } + protected override void DetectHang() { if (mTP.LastIssue == DetectedIssue.Unknown && MachineStatus == MacStatus.Run && InProgram) diff --git a/LaserGRBL/CsPotrace/CsPotraceExportGCODE.cs b/LaserGRBL/CsPotrace/CsPotraceExportGCODE.cs index 23e947857..cb893f93a 100644 --- a/LaserGRBL/CsPotrace/CsPotraceExportGCODE.cs +++ b/LaserGRBL/CsPotrace/CsPotraceExportGCODE.cs @@ -26,7 +26,7 @@ public partial class Potrace /// Width of the exportd cvg-File /// Height of the exportd cvg-File /// - public static List Export2GCode(List> list, float oX, float oY, double scale, string lOn, string lOff, Size originalImageSize, string skipcmd) + public static List Export2GCode(List> list, float oX, float oY, double scale, List lOn, List lOff, Size originalImageSize, string skipcmd) { bool debug = false; @@ -55,7 +55,7 @@ public static List Export2GCode(List> list, float return rv; } - private static List GetPathGC(List Curves, string lOn, string lOff, double oX, double oY, double scale, Graphics g, string skipcmd) + private static List GetPathGC(List Curves, List lOn, List lOff, double oX, double oY, double scale, Graphics g, string skipcmd) { List rv = new List(); @@ -125,22 +125,22 @@ private static void OnPathSegment(CsPotrace.Curve Curve, double oX, double oY, d } } - private static void OnPathBegin(List Curves, string lOn, double oX, double oY, double scale, List rv, string skipcmd) + private static void OnPathBegin(List Curves, List lOn, double oX, double oY, double scale, List rv, string skipcmd) { if (Curves.Count > 0) { //fast go to position rv.Add(String.Format("{0} X{1} Y{2}", skipcmd, formatnumber(Curves[0].A.X + oX, scale), formatnumber(Curves[0].A.Y + oY, scale))); //turn on laser - rv.Add(lOn); + rv.AddRange(lOn); } } - private static void OnPathEnd(List Curves, string lOff, double oX, double oY, double scale, List rv) + private static void OnPathEnd(List Curves, List lOff, double oX, double oY, double scale, List rv) { //turn off laser if (Curves.Count > 0) - rv.Add(lOff); + rv.AddRange(lOff); } private static string GetArcGC(Arc arc, double oX, double oY, double scale, Graphics g) diff --git a/LaserGRBL/GrblFile.cs b/LaserGRBL/GrblFile.cs index ed6885641..f0e6279d3 100644 --- a/LaserGRBL/GrblFile.cs +++ b/LaserGRBL/GrblFile.cs @@ -338,8 +338,20 @@ public void LoadImagePotrace(Bitmap bmp, string filename, bool UseSpotRemoval, i using (Bitmap resampled = RasterConverter.ImageTransform.ResizeImage(ptb, new Size((int)(bmp.Width * c.fres / c.res) + 1, (int)(bmp.Height * c.fres / c.res) + 1), true, InterpolationMode.HighQualityBicubic)) { + if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) + { + list.Add(new GrblCommand(String.Format("G4 P0"))); + } if (c.pwm) - list.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero + if (c.firmwareType == Firmware.Marlin) + { + if (c.pwmMode == GrblCore.PwmMode.Fan) + list.Add(new GrblCommand(String.Format("{0} S0 P{1}", c.lOn, c.fanId))); //laser on and power to zero + else + list.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero + } + else + list.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero else list.Add(new GrblCommand(String.Format($"{c.lOff} S{core.Configuration.MaxPWM}"))); //laser off and power to max power @@ -360,20 +372,69 @@ public void LoadImagePotrace(Bitmap bmp, string filename, bool UseSpotRemoval, i bool supportPWM = Settings.GetObject("Support Hardware PWM", true); - + if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) + { + list.Add(new GrblCommand(String.Format("G4 P0"))); + } if (supportPWM) - list.Add(new GrblCommand($"{c.lOn} S0")); //laser on and power to 0 + { + if (c.firmwareType == Firmware.Marlin) + { + if (c.pwmMode == GrblCore.PwmMode.Fan) + list.Add(new GrblCommand(String.Format("{0} S0 P{1}", c.lOn, c.fanId))); //laser on and power to zero + else + list.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero + } + else + list.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero + } else list.Add(new GrblCommand($"{c.lOff} S{core.Configuration.MaxPWM}")); //laser off and power to maxPower + List LaserOn = new List(); + List LaserOff = new List(); + if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) + { + LaserOn.Add(String.Format("G4 P0")); + LaserOff.Add(String.Format("G4 P0")); + } + if (supportPWM) + { + if (c.firmwareType == Firmware.Marlin) + { + if (c.pwmMode == GrblCore.PwmMode.Fan) + { + LaserOn.Add(String.Format("{0} S{1} P{2}", c.lOn, c.maxPower, c.fanId)); + LaserOff.Add(String.Format("{0} S0 P{1}", c.lOn, c.fanId)); + } + else + { + LaserOn.Add(String.Format("{0} S{1}", c.lOn, c.maxPower)); + LaserOff.Add(String.Format("{0} S0", c.lOn)); + } + } + else + { + LaserOn.Add(String.Format("{0} S{1}", c.lOn, c.maxPower)); + LaserOff.Add(String.Format("{0} S0", c.lOn)); + } + } + else + { + LaserOn.Add(c.lOn); + LaserOff.Add(c.lOff); + } + + if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) + { + LaserOn.Add(String.Format("G4 P{0}", c.dwelltime)); + } + //trace raster filling if (flist != null) { List gc = new List(); - if (supportPWM) - gc.AddRange(Potrace.Export2GCode(flist, c.oX, c.oY, c.res, $"S{c.maxPower}", "S0", bmp.Size, skipcmd)); - else - gc.AddRange(Potrace.Export2GCode(flist, c.oX, c.oY, c.res, c.lOn, c.lOff, bmp.Size, skipcmd)); + gc.AddRange(Potrace.Export2GCode(flist, c.oX, c.oY, c.res, LaserOn, LaserOff, bmp.Size, skipcmd)); list.Add(new GrblCommand(String.Format("F{0}", c.markSpeed))); foreach (string code in gc) @@ -391,10 +452,7 @@ public void LoadImagePotrace(Bitmap bmp, string filename, bool UseSpotRemoval, i plist.Reverse(); //la lista viene fornita da potrace con prima esterni e poi interni, ma per il taglio รจ meglio il contrario List gc = new List(); - if (supportPWM) - gc.AddRange(Potrace.Export2GCode(plist, c.oX, c.oY, c.res, $"S{c.maxPower}", "S0", bmp.Size, skipcmd)); - else - gc.AddRange(Potrace.Export2GCode(plist, c.oX, c.oY, c.res, c.lOn, c.lOff, bmp.Size, skipcmd)); + gc.AddRange(Potrace.Export2GCode(plist, c.oX, c.oY, c.res, LaserOn, LaserOff, bmp.Size, skipcmd)); // For marlin, need to specify G1 each time : //list.Add(new GrblCommand(String.Format("G1 F{0}", c.borderSpeed))); @@ -450,6 +508,9 @@ public class L2LConf public double fres; public bool vectorfilling; public Firmware firmwareType; + public int dwelltime; + public int fanId; + public GrblCore.PwmMode pwmMode; } private string skipcmd = "G0"; @@ -474,11 +535,26 @@ public void LoadImageL2L(Bitmap bmp, string filename, L2LConf c, bool append, Gr //move fast to offset (or slow if disable G0) and set mark speed list.Add(new GrblCommand(String.Format("{0} X{1} Y{2} F{3}", skipcmd, formatnumber(c.oX), formatnumber(c.oY), c.markSpeed))); + if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) + { + list.Add(new GrblCommand(String.Format("G4 P0"))); + } if (c.pwm) - list.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero + { + if (c.firmwareType == Firmware.Marlin) + { + if (c.pwmMode == GrblCore.PwmMode.Fan) + list.Add(new GrblCommand(String.Format("{0} S0 P{1}", c.lOn, c.fanId))); //laser on and power to zero + else + list.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero + } + else + { + list.Add(new GrblCommand("S0")); + } + } else list.Add(new GrblCommand($"{c.lOff} S{core.Configuration.MaxPWM}")); //laser off and power to maxpower - //set speed to markspeed // For marlin, need to specify G1 each time : //list.Add(new GrblCommand(String.Format("G1 F{0}", c.markSpeed))); @@ -487,6 +563,10 @@ public void LoadImageL2L(Bitmap bmp, string filename, L2LConf c, bool append, Gr ImageLine2Line(bmp, c); //laser off + if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) + { + list.Add(new GrblCommand(String.Format("G4 P0"))); + } list.Add(new GrblCommand(c.lOff)); //move fast to origin @@ -508,41 +588,69 @@ private void ImageLine2Line(Bitmap bmp, L2LConf c) int cumX = 0; int cumY = 0; - + int lastColorSend = 0; foreach (ColorSegment seg in segments) { bool changeGMode = (fast != seg.Fast(c)); //se veloce != dafareveloce if (seg.IsSeparator && !fast) //fast = previous segment contains S0 color { + if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) + { + temp.Add(new GrblCommand(String.Format("G4 P0"))); + } if (c.pwm) - temp.Add(new GrblCommand("S0")); + { + if (c.firmwareType == Firmware.Marlin) + { + if(c.pwmMode == GrblCore.PwmMode.Fan) + temp.Add(new GrblCommand(String.Format("{0} S0 P{1}", c.lOn, c.fanId))); //laser on and power to zero + else + temp.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero + } + else + { + temp.Add(new GrblCommand("S0")); + } + } else + { temp.Add(new GrblCommand(c.lOff)); //laser off + } } fast = seg.Fast(c); - // For marlin firmware, we must defined laser power before moving (unsing M106 or M107) - // So we have to speficy gcode (G0 or G1) each time.... - //if (c.firmwareType == Firmware.Marlin) - //{ - // // Add M106 only if color has changed - // if (lastColorSend != seg.mColor) - // temp.Add(new GrblCommand(String.Format("M106 P1 S{0}", fast ? 0 : seg.mColor))); - // lastColorSend = seg.mColor; - // temp.Add(new GrblCommand(String.Format("{0} {1}", fast ? "G0" : "G1", seg.ToGCodeNumber(ref cumX, ref cumY, c)))); - //} - //else - //{ - - if (changeGMode) - temp.Add(new GrblCommand(String.Format("{0} {1}", fast ? skipcmd : "G1", seg.ToGCodeNumber(ref cumX, ref cumY, c)))); - else - temp.Add(new GrblCommand(seg.ToGCodeNumber(ref cumX, ref cumY, c))); - - //} - } + // For marlin firmware, we must defined laser power before moving (unsing M106 or M107) + // So we have to speficy gcode (G0 or G1) each time.... + if (c.firmwareType == Firmware.Marlin) + { + // Add M106 only if color has changed + if (lastColorSend != seg.mColor) + { + if (c.pwmMode == GrblCore.PwmMode.Fan) + { + temp.Add(new GrblCommand(String.Format("G4 P0"))); + temp.Add(new GrblCommand(String.Format("{0} S{1} P{2}", c.lOn, fast ? 0 : seg.mColor, c.fanId))); + temp.Add(new GrblCommand(String.Format("G4 P{0}", c.dwelltime))); + } + else + { + temp.Add(new GrblCommand(String.Format("{0} S{1}", c.lOn, fast ? 0 : seg.mColor))); + } + lastColorSend = seg.mColor; + + } + temp.Add(new GrblCommand(String.Format("{0} {1}", fast ? "G0" : "G1", seg.ToGCodeNumber(ref cumX, ref cumY, c)))); + } + else + { + if (changeGMode) + temp.Add(new GrblCommand(String.Format("{0} {1}", fast ? skipcmd : "G1", seg.ToGCodeNumber(ref cumX, ref cumY, c)))); + else + temp.Add(new GrblCommand(seg.ToGCodeNumber(ref cumX, ref cumY, c))); + } + } temp = OptimizeLine2Line(temp, c); list.AddRange(temp); diff --git a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.Designer.cs b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.Designer.cs index 689be1d70..96576ebe1 100644 --- a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.Designer.cs +++ b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.Designer.cs @@ -67,518 +67,518 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConvertSizeAndOptionForm)); - this.tableLayoutPanel9 = new System.Windows.Forms.TableLayoutPanel(); - this.GbSize = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.label9 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.label1 = new System.Windows.Forms.Label(); - this.CbAutosize = new System.Windows.Forms.CheckBox(); - this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.GbSpeed = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); - this.LblBorderTracing = new System.Windows.Forms.Label(); - this.LblBorderTracingmm = new System.Windows.Forms.Label(); - this.LblLinearFillingmm = new System.Windows.Forms.Label(); - this.LblLinearFilling = new System.Windows.Forms.Label(); - this.GbLaser = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); - this.LblSmin = new System.Windows.Forms.Label(); - this.LblLaserMode = new System.Windows.Forms.Label(); - this.CBLaserON = new System.Windows.Forms.ComboBox(); - this.LblSmax = new System.Windows.Forms.Label(); - this.LblMinPerc = new System.Windows.Forms.Label(); - this.LblMaxPerc = new System.Windows.Forms.Label(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.BtnCancel = new System.Windows.Forms.Button(); - this.BtnCreate = new System.Windows.Forms.Button(); - this.TT = new System.Windows.Forms.ToolTip(this.components); - this.BtnUnlockProportion = new LaserGRBL.UserControls.ImageButton(); - this.IIOffsetX = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); - this.IIOffsetY = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); - this.IISizeH = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); - this.IISizeW = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); - this.IIDpi = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.BtnDPI = new LaserGRBL.UserControls.ImageButton(); - this.BtnReset = new LaserGRBL.UserControls.ImageButton(); - this.BtnCenter = new LaserGRBL.UserControls.ImageButton(); - this.IIBorderTracing = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.IILinearFilling = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.BtnPSHelper = new LaserGRBL.UserControls.ImageButton(); - this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); - this.IIMinPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.BtnOnOffInfo = new LaserGRBL.UserControls.ImageButton(); - this.IIMaxPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.tableLayoutPanel9.SuspendLayout(); - this.GbSize.SuspendLayout(); - this.tableLayoutPanel3.SuspendLayout(); - this.tableLayoutPanel2.SuspendLayout(); - this.tableLayoutPanel4.SuspendLayout(); - this.GbSpeed.SuspendLayout(); - this.tableLayoutPanel6.SuspendLayout(); - this.GbLaser.SuspendLayout(); - this.tableLayoutPanel7.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); - this.SuspendLayout(); - // - // tableLayoutPanel9 - // - resources.ApplyResources(this.tableLayoutPanel9, "tableLayoutPanel9"); - this.tableLayoutPanel9.Controls.Add(this.GbSize, 0, 2); - this.tableLayoutPanel9.Controls.Add(this.GbSpeed, 0, 0); - this.tableLayoutPanel9.Controls.Add(this.GbLaser, 0, 1); - this.tableLayoutPanel9.Controls.Add(this.tableLayoutPanel1, 0, 3); - this.tableLayoutPanel9.Name = "tableLayoutPanel9"; - // - // GbSize - // - resources.ApplyResources(this.GbSize, "GbSize"); - this.GbSize.Controls.Add(this.tableLayoutPanel3); - this.GbSize.Name = "GbSize"; - this.GbSize.TabStop = false; - // - // tableLayoutPanel3 - // - resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3"); - this.tableLayoutPanel3.Controls.Add(this.BtnUnlockProportion, 5, 2); - this.tableLayoutPanel3.Controls.Add(this.label9, 0, 3); - this.tableLayoutPanel3.Controls.Add(this.label4, 0, 2); - this.tableLayoutPanel3.Controls.Add(this.IIOffsetX, 2, 3); - this.tableLayoutPanel3.Controls.Add(this.IIOffsetY, 4, 3); - this.tableLayoutPanel3.Controls.Add(this.IISizeH, 4, 2); - this.tableLayoutPanel3.Controls.Add(this.IISizeW, 2, 2); - this.tableLayoutPanel3.Controls.Add(this.label6, 1, 2); - this.tableLayoutPanel3.Controls.Add(this.label10, 1, 3); - this.tableLayoutPanel3.Controls.Add(this.label7, 3, 2); - this.tableLayoutPanel3.Controls.Add(this.label11, 3, 3); - this.tableLayoutPanel3.Controls.Add(this.tableLayoutPanel2, 0, 0); - this.tableLayoutPanel3.Controls.Add(this.tableLayoutPanel4, 5, 3); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - // - // label9 - // - resources.ApplyResources(this.label9, "label9"); - this.label9.Name = "label9"; - // - // label4 - // - resources.ApplyResources(this.label4, "label4"); - this.label4.Name = "label4"; - // - // label6 - // - resources.ApplyResources(this.label6, "label6"); - this.label6.Name = "label6"; - // - // label10 - // - resources.ApplyResources(this.label10, "label10"); - this.label10.Name = "label10"; - // - // label7 - // - resources.ApplyResources(this.label7, "label7"); - this.label7.Name = "label7"; - // - // label11 - // - resources.ApplyResources(this.label11, "label11"); - this.label11.Name = "label11"; - // - // tableLayoutPanel2 - // - resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); - this.tableLayoutPanel3.SetColumnSpan(this.tableLayoutPanel2, 6); - this.tableLayoutPanel2.Controls.Add(this.label1, 2, 0); - this.tableLayoutPanel2.Controls.Add(this.CbAutosize, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.IIDpi, 1, 0); - this.tableLayoutPanel2.Controls.Add(this.BtnDPI, 3, 0); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; - // - // CbAutosize - // - resources.ApplyResources(this.CbAutosize, "CbAutosize"); - this.CbAutosize.Name = "CbAutosize"; - this.CbAutosize.UseVisualStyleBackColor = true; - this.CbAutosize.CheckedChanged += new System.EventHandler(this.CbAutosize_CheckedChanged); - // - // tableLayoutPanel4 - // - resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); - this.tableLayoutPanel4.Controls.Add(this.BtnReset, 0, 0); - this.tableLayoutPanel4.Controls.Add(this.BtnCenter, 1, 0); - this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - // - // GbSpeed - // - resources.ApplyResources(this.GbSpeed, "GbSpeed"); - this.GbSpeed.Controls.Add(this.tableLayoutPanel6); - this.GbSpeed.Name = "GbSpeed"; - this.GbSpeed.TabStop = false; - // - // tableLayoutPanel6 - // - resources.ApplyResources(this.tableLayoutPanel6, "tableLayoutPanel6"); - this.tableLayoutPanel6.Controls.Add(this.LblBorderTracing, 0, 0); - this.tableLayoutPanel6.Controls.Add(this.LblBorderTracingmm, 2, 0); - this.tableLayoutPanel6.Controls.Add(this.IIBorderTracing, 1, 0); - this.tableLayoutPanel6.Controls.Add(this.IILinearFilling, 1, 1); - this.tableLayoutPanel6.Controls.Add(this.LblLinearFillingmm, 2, 1); - this.tableLayoutPanel6.Controls.Add(this.LblLinearFilling, 0, 1); - this.tableLayoutPanel6.Controls.Add(this.BtnPSHelper, 4, 0); - this.tableLayoutPanel6.Name = "tableLayoutPanel6"; - // - // LblBorderTracing - // - resources.ApplyResources(this.LblBorderTracing, "LblBorderTracing"); - this.LblBorderTracing.Name = "LblBorderTracing"; - // - // LblBorderTracingmm - // - resources.ApplyResources(this.LblBorderTracingmm, "LblBorderTracingmm"); - this.LblBorderTracingmm.Name = "LblBorderTracingmm"; - // - // LblLinearFillingmm - // - resources.ApplyResources(this.LblLinearFillingmm, "LblLinearFillingmm"); - this.LblLinearFillingmm.Name = "LblLinearFillingmm"; - // - // LblLinearFilling - // - resources.ApplyResources(this.LblLinearFilling, "LblLinearFilling"); - this.LblLinearFilling.Name = "LblLinearFilling"; - // - // GbLaser - // - resources.ApplyResources(this.GbLaser, "GbLaser"); - this.GbLaser.Controls.Add(this.tableLayoutPanel7); - this.GbLaser.Name = "GbLaser"; - this.GbLaser.TabStop = false; - // - // tableLayoutPanel7 - // - resources.ApplyResources(this.tableLayoutPanel7, "tableLayoutPanel7"); - this.tableLayoutPanel7.Controls.Add(this.BtnModulationInfo, 3, 1); - this.tableLayoutPanel7.Controls.Add(this.LblSmin, 0, 1); - this.tableLayoutPanel7.Controls.Add(this.IIMinPower, 1, 1); - this.tableLayoutPanel7.Controls.Add(this.LblLaserMode, 0, 0); - this.tableLayoutPanel7.Controls.Add(this.BtnOnOffInfo, 3, 0); - this.tableLayoutPanel7.Controls.Add(this.CBLaserON, 1, 0); - this.tableLayoutPanel7.Controls.Add(this.LblSmax, 0, 2); - this.tableLayoutPanel7.Controls.Add(this.IIMaxPower, 1, 2); - this.tableLayoutPanel7.Controls.Add(this.LblMinPerc, 2, 1); - this.tableLayoutPanel7.Controls.Add(this.LblMaxPerc, 2, 2); - this.tableLayoutPanel7.Name = "tableLayoutPanel7"; - // - // LblSmin - // - resources.ApplyResources(this.LblSmin, "LblSmin"); - this.LblSmin.Name = "LblSmin"; - // - // LblLaserMode - // - resources.ApplyResources(this.LblLaserMode, "LblLaserMode"); - this.LblLaserMode.Name = "LblLaserMode"; - // - // CBLaserON - // - this.tableLayoutPanel7.SetColumnSpan(this.CBLaserON, 2); - resources.ApplyResources(this.CBLaserON, "CBLaserON"); - this.CBLaserON.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CBLaserON.FormattingEnabled = true; - this.CBLaserON.Name = "CBLaserON"; - this.CBLaserON.SelectedIndexChanged += new System.EventHandler(this.CBLaserON_SelectedIndexChanged); - // - // LblSmax - // - resources.ApplyResources(this.LblSmax, "LblSmax"); - this.LblSmax.Name = "LblSmax"; - // - // LblMinPerc - // - resources.ApplyResources(this.LblMinPerc, "LblMinPerc"); - this.LblMinPerc.Name = "LblMinPerc"; - // - // LblMaxPerc - // - resources.ApplyResources(this.LblMaxPerc, "LblMaxPerc"); - this.LblMaxPerc.Name = "LblMaxPerc"; - // - // tableLayoutPanel1 - // - resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); - this.tableLayoutPanel1.Controls.Add(this.BtnCancel, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.BtnCreate, 2, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - // - // BtnCancel - // - this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - resources.ApplyResources(this.BtnCancel, "BtnCancel"); - this.BtnCancel.Name = "BtnCancel"; - this.BtnCancel.UseVisualStyleBackColor = true; - // - // BtnCreate - // - resources.ApplyResources(this.BtnCreate, "BtnCreate"); - this.BtnCreate.Name = "BtnCreate"; - this.BtnCreate.UseVisualStyleBackColor = true; - this.BtnCreate.Click += new System.EventHandler(this.BtnCreate_Click); - // - // TT - // - this.TT.AutoPopDelay = 10000; - this.TT.InitialDelay = 500; - this.TT.ReshowDelay = 100; - // - // BtnUnlockProportion - // - this.BtnUnlockProportion.AltImage = ((System.Drawing.Image)(resources.GetObject("BtnUnlockProportion.AltImage"))); - resources.ApplyResources(this.BtnUnlockProportion, "BtnUnlockProportion"); - this.BtnUnlockProportion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnUnlockProportion.Caption = null; - this.BtnUnlockProportion.Coloration = System.Drawing.Color.Empty; - this.BtnUnlockProportion.Image = ((System.Drawing.Image)(resources.GetObject("BtnUnlockProportion.Image"))); - this.BtnUnlockProportion.Name = "BtnUnlockProportion"; - this.BtnUnlockProportion.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnUnlockProportion, resources.GetString("BtnUnlockProportion.ToolTip")); - this.BtnUnlockProportion.UseAltImage = false; - this.BtnUnlockProportion.Click += new System.EventHandler(this.BtnUnlockProportion_Click); - // - // IIOffsetX - // - resources.ApplyResources(this.IIOffsetX, "IIOffsetX"); - this.IIOffsetX.CurrentValue = 0F; - this.IIOffsetX.DecimalPositions = 1; - this.IIOffsetX.ForceMinMax = false; - this.IIOffsetX.MaxValue = 1000F; - this.IIOffsetX.MinValue = 0F; - this.IIOffsetX.Name = "IIOffsetX"; - this.IIOffsetX.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IIOffsetX.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IIOffsetXYCurrentValueChanged); - // - // IIOffsetY - // - this.IIOffsetY.CurrentValue = 0F; - this.IIOffsetY.DecimalPositions = 1; - this.IIOffsetY.ForceMinMax = false; - resources.ApplyResources(this.IIOffsetY, "IIOffsetY"); - this.IIOffsetY.MaxValue = 1000F; - this.IIOffsetY.MinValue = 0F; - this.IIOffsetY.Name = "IIOffsetY"; - this.IIOffsetY.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IIOffsetY.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IIOffsetXYCurrentValueChanged); - // - // IISizeH - // - this.IISizeH.CurrentValue = 0F; - this.IISizeH.DecimalPositions = 1; - this.IISizeH.ForceMinMax = false; - resources.ApplyResources(this.IISizeH, "IISizeH"); - this.IISizeH.MaxValue = 1000F; - this.IISizeH.MinValue = 10F; - this.IISizeH.Name = "IISizeH"; - this.IISizeH.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IISizeH.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IISizeH_CurrentValueChanged); - this.IISizeH.OnTheFlyValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IISizeH_OnTheFlyValueChanged); - // - // IISizeW - // - this.IISizeW.CurrentValue = 0F; - this.IISizeW.DecimalPositions = 1; - this.IISizeW.ForceMinMax = false; - resources.ApplyResources(this.IISizeW, "IISizeW"); - this.IISizeW.MaxValue = 1000F; - this.IISizeW.MinValue = 10F; - this.IISizeW.Name = "IISizeW"; - this.IISizeW.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IISizeW.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IISizeW_CurrentValueChanged); - this.IISizeW.OnTheFlyValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IISizeW_OnTheFlyValueChanged); - // - // IIDpi - // - resources.ApplyResources(this.IIDpi, "IIDpi"); - this.IIDpi.CurrentValue = 300; - this.IIDpi.ForcedText = null; - this.IIDpi.ForceMinMax = false; - this.IIDpi.MaxValue = 10000; - this.IIDpi.MinValue = 1; - this.IIDpi.Name = "IIDpi"; - this.IIDpi.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IIDpi.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIDpi_CurrentValueChanged); - // - // BtnDPI - // - this.BtnDPI.AltImage = null; - resources.ApplyResources(this.BtnDPI, "BtnDPI"); - this.BtnDPI.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnDPI.Caption = null; - this.BtnDPI.Coloration = System.Drawing.Color.Empty; - this.BtnDPI.Image = ((System.Drawing.Image)(resources.GetObject("BtnDPI.Image"))); - this.BtnDPI.Name = "BtnDPI"; - this.BtnDPI.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnDPI, resources.GetString("BtnDPI.ToolTip")); - this.BtnDPI.UseAltImage = false; - this.BtnDPI.Click += new System.EventHandler(this.BtnDPI_Click); - // - // BtnReset - // - this.BtnReset.AltImage = null; - this.BtnReset.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnReset.Caption = null; - this.BtnReset.Coloration = System.Drawing.Color.Empty; - this.BtnReset.Image = ((System.Drawing.Image)(resources.GetObject("BtnReset.Image"))); - resources.ApplyResources(this.BtnReset, "BtnReset"); - this.BtnReset.Name = "BtnReset"; - this.BtnReset.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.StretchImage; - this.BtnReset.TabStop = false; - this.BtnReset.UseAltImage = false; - this.BtnReset.Click += new System.EventHandler(this.BtnReset_Click); - // - // BtnCenter - // - this.BtnCenter.AltImage = null; - resources.ApplyResources(this.BtnCenter, "BtnCenter"); - this.BtnCenter.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnCenter.Caption = null; - this.BtnCenter.Coloration = System.Drawing.Color.Empty; - this.BtnCenter.Image = ((System.Drawing.Image)(resources.GetObject("BtnCenter.Image"))); - this.BtnCenter.Name = "BtnCenter"; - this.BtnCenter.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnCenter, resources.GetString("BtnCenter.ToolTip")); - this.BtnCenter.UseAltImage = false; - this.BtnCenter.Click += new System.EventHandler(this.BtnCenter_Click); - // - // IIBorderTracing - // - resources.ApplyResources(this.IIBorderTracing, "IIBorderTracing"); - this.IIBorderTracing.CurrentValue = 1000; - this.IIBorderTracing.ForcedText = null; - this.IIBorderTracing.ForceMinMax = false; - this.IIBorderTracing.MaxValue = 4000; - this.IIBorderTracing.MinValue = 1; - this.IIBorderTracing.Name = "IIBorderTracing"; - this.IIBorderTracing.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IIBorderTracing.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIBorderTracingCurrentValueChanged); - // - // IILinearFilling - // - resources.ApplyResources(this.IILinearFilling, "IILinearFilling"); - this.IILinearFilling.CurrentValue = 1000; - this.IILinearFilling.ForcedText = null; - this.IILinearFilling.ForceMinMax = false; - this.IILinearFilling.MaxValue = 4000; - this.IILinearFilling.MinValue = 1; - this.IILinearFilling.Name = "IILinearFilling"; - this.IILinearFilling.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IILinearFilling.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMarkSpeedCurrentValueChanged); - // - // BtnPSHelper - // - this.BtnPSHelper.AltImage = null; - resources.ApplyResources(this.BtnPSHelper, "BtnPSHelper"); - this.BtnPSHelper.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnPSHelper.Caption = null; - this.BtnPSHelper.Coloration = System.Drawing.Color.Empty; - this.BtnPSHelper.Image = ((System.Drawing.Image)(resources.GetObject("BtnPSHelper.Image"))); - this.BtnPSHelper.Name = "BtnPSHelper"; - this.tableLayoutPanel6.SetRowSpan(this.BtnPSHelper, 2); - this.BtnPSHelper.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnPSHelper, resources.GetString("BtnPSHelper.ToolTip")); - this.BtnPSHelper.UseAltImage = false; - this.BtnPSHelper.Click += new System.EventHandler(this.BtnPSHelper_Click); - // - // BtnModulationInfo - // - this.BtnModulationInfo.AltImage = null; - resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); - this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnModulationInfo.Caption = null; - this.BtnModulationInfo.Coloration = System.Drawing.Color.Empty; - this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); - this.BtnModulationInfo.Name = "BtnModulationInfo"; - this.tableLayoutPanel7.SetRowSpan(this.BtnModulationInfo, 2); - this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnModulationInfo, resources.GetString("BtnModulationInfo.ToolTip")); - this.BtnModulationInfo.UseAltImage = false; - this.BtnModulationInfo.Click += new System.EventHandler(this.BtnModulationInfo_Click); - // - // IIMinPower - // - resources.ApplyResources(this.IIMinPower, "IIMinPower"); - this.IIMinPower.ForcedText = null; - this.IIMinPower.ForceMinMax = false; - this.IIMinPower.MaxValue = 999; - this.IIMinPower.MinValue = 0; - this.IIMinPower.Name = "IIMinPower"; - this.IIMinPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IIMinPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMinPowerCurrentValueChanged); - // - // BtnOnOffInfo - // - this.BtnOnOffInfo.AltImage = null; - resources.ApplyResources(this.BtnOnOffInfo, "BtnOnOffInfo"); - this.BtnOnOffInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnOnOffInfo.Caption = null; - this.BtnOnOffInfo.Coloration = System.Drawing.Color.Empty; - this.BtnOnOffInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnOnOffInfo.Image"))); - this.BtnOnOffInfo.Name = "BtnOnOffInfo"; - this.BtnOnOffInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnOnOffInfo, resources.GetString("BtnOnOffInfo.ToolTip")); - this.BtnOnOffInfo.UseAltImage = false; - this.BtnOnOffInfo.Click += new System.EventHandler(this.BtnOnOffInfo_Click); - // - // IIMaxPower - // - resources.ApplyResources(this.IIMaxPower, "IIMaxPower"); - this.IIMaxPower.CurrentValue = 1000; - this.IIMaxPower.ForcedText = null; - this.IIMaxPower.ForceMinMax = false; - this.IIMaxPower.MaxValue = 1000; - this.IIMaxPower.MinValue = 1; - this.IIMaxPower.Name = "IIMaxPower"; - this.IIMaxPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IIMaxPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMaxPowerCurrentValueChanged); - // - // ConvertSizeAndOptionForm - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.tableLayoutPanel9); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "ConvertSizeAndOptionForm"; - this.tableLayoutPanel9.ResumeLayout(false); - this.tableLayoutPanel9.PerformLayout(); - this.GbSize.ResumeLayout(false); - this.GbSize.PerformLayout(); - this.tableLayoutPanel3.ResumeLayout(false); - this.tableLayoutPanel3.PerformLayout(); - this.tableLayoutPanel2.ResumeLayout(false); - this.tableLayoutPanel2.PerformLayout(); - this.tableLayoutPanel4.ResumeLayout(false); - this.GbSpeed.ResumeLayout(false); - this.GbSpeed.PerformLayout(); - this.tableLayoutPanel6.ResumeLayout(false); - this.tableLayoutPanel6.PerformLayout(); - this.GbLaser.ResumeLayout(false); - this.GbLaser.PerformLayout(); - this.tableLayoutPanel7.ResumeLayout(false); - this.tableLayoutPanel7.PerformLayout(); - this.tableLayoutPanel1.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConvertSizeAndOptionForm)); + this.tableLayoutPanel9 = new System.Windows.Forms.TableLayoutPanel(); + this.GbSize = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnUnlockProportion = new LaserGRBL.UserControls.ImageButton(); + this.label9 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.IIOffsetX = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); + this.IIOffsetY = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); + this.IISizeH = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); + this.IISizeW = new LaserGRBL.UserControls.NumericInput.DecimalInputRanged(); + this.label6 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.label1 = new System.Windows.Forms.Label(); + this.CbAutosize = new System.Windows.Forms.CheckBox(); + this.IIDpi = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + this.BtnDPI = new LaserGRBL.UserControls.ImageButton(); + this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnReset = new LaserGRBL.UserControls.ImageButton(); + this.BtnCenter = new LaserGRBL.UserControls.ImageButton(); + this.GbSpeed = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); + this.LblBorderTracing = new System.Windows.Forms.Label(); + this.LblBorderTracingmm = new System.Windows.Forms.Label(); + this.IIBorderTracing = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + this.IILinearFilling = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + this.LblLinearFillingmm = new System.Windows.Forms.Label(); + this.LblLinearFilling = new System.Windows.Forms.Label(); + this.BtnPSHelper = new LaserGRBL.UserControls.ImageButton(); + this.GbLaser = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); + this.LblSmin = new System.Windows.Forms.Label(); + this.IIMinPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + this.LblLaserMode = new System.Windows.Forms.Label(); + this.BtnOnOffInfo = new LaserGRBL.UserControls.ImageButton(); + this.CBLaserON = new System.Windows.Forms.ComboBox(); + this.LblSmax = new System.Windows.Forms.Label(); + this.IIMaxPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + this.LblMinPerc = new System.Windows.Forms.Label(); + this.LblMaxPerc = new System.Windows.Forms.Label(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnCancel = new System.Windows.Forms.Button(); + this.BtnCreate = new System.Windows.Forms.Button(); + this.TT = new System.Windows.Forms.ToolTip(this.components); + this.tableLayoutPanel9.SuspendLayout(); + this.GbSize.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); + this.tableLayoutPanel4.SuspendLayout(); + this.GbSpeed.SuspendLayout(); + this.tableLayoutPanel6.SuspendLayout(); + this.GbLaser.SuspendLayout(); + this.tableLayoutPanel7.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + this.SuspendLayout(); + // + // tableLayoutPanel9 + // + resources.ApplyResources(this.tableLayoutPanel9, "tableLayoutPanel9"); + this.tableLayoutPanel9.Controls.Add(this.GbSize, 0, 2); + this.tableLayoutPanel9.Controls.Add(this.GbSpeed, 0, 0); + this.tableLayoutPanel9.Controls.Add(this.GbLaser, 0, 1); + this.tableLayoutPanel9.Controls.Add(this.tableLayoutPanel1, 0, 3); + this.tableLayoutPanel9.Name = "tableLayoutPanel9"; + // + // GbSize + // + resources.ApplyResources(this.GbSize, "GbSize"); + this.GbSize.Controls.Add(this.tableLayoutPanel3); + this.GbSize.Name = "GbSize"; + this.GbSize.TabStop = false; + // + // tableLayoutPanel3 + // + resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3"); + this.tableLayoutPanel3.Controls.Add(this.BtnUnlockProportion, 5, 2); + this.tableLayoutPanel3.Controls.Add(this.label9, 0, 3); + this.tableLayoutPanel3.Controls.Add(this.label4, 0, 2); + this.tableLayoutPanel3.Controls.Add(this.IIOffsetX, 2, 3); + this.tableLayoutPanel3.Controls.Add(this.IIOffsetY, 4, 3); + this.tableLayoutPanel3.Controls.Add(this.IISizeH, 4, 2); + this.tableLayoutPanel3.Controls.Add(this.IISizeW, 2, 2); + this.tableLayoutPanel3.Controls.Add(this.label6, 1, 2); + this.tableLayoutPanel3.Controls.Add(this.label10, 1, 3); + this.tableLayoutPanel3.Controls.Add(this.label7, 3, 2); + this.tableLayoutPanel3.Controls.Add(this.label11, 3, 3); + this.tableLayoutPanel3.Controls.Add(this.tableLayoutPanel2, 0, 0); + this.tableLayoutPanel3.Controls.Add(this.tableLayoutPanel4, 5, 3); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + // + // BtnUnlockProportion + // + this.BtnUnlockProportion.AltImage = ((System.Drawing.Image)(resources.GetObject("BtnUnlockProportion.AltImage"))); + resources.ApplyResources(this.BtnUnlockProportion, "BtnUnlockProportion"); + this.BtnUnlockProportion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnUnlockProportion.Caption = null; + this.BtnUnlockProportion.Coloration = System.Drawing.Color.Empty; + this.BtnUnlockProportion.Image = ((System.Drawing.Image)(resources.GetObject("BtnUnlockProportion.Image"))); + this.BtnUnlockProportion.Name = "BtnUnlockProportion"; + this.BtnUnlockProportion.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnUnlockProportion, resources.GetString("BtnUnlockProportion.ToolTip")); + this.BtnUnlockProportion.UseAltImage = false; + this.BtnUnlockProportion.Click += new System.EventHandler(this.BtnUnlockProportion_Click); + // + // label9 + // + resources.ApplyResources(this.label9, "label9"); + this.label9.Name = "label9"; + // + // label4 + // + resources.ApplyResources(this.label4, "label4"); + this.label4.Name = "label4"; + // + // IIOffsetX + // + resources.ApplyResources(this.IIOffsetX, "IIOffsetX"); + this.IIOffsetX.CurrentValue = 0F; + this.IIOffsetX.DecimalPositions = 1; + this.IIOffsetX.ForceMinMax = false; + this.IIOffsetX.MaxValue = 1000F; + this.IIOffsetX.MinValue = 0F; + this.IIOffsetX.Name = "IIOffsetX"; + this.IIOffsetX.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IIOffsetX.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IIOffsetXYCurrentValueChanged); + // + // IIOffsetY + // + this.IIOffsetY.CurrentValue = 0F; + this.IIOffsetY.DecimalPositions = 1; + this.IIOffsetY.ForceMinMax = false; + resources.ApplyResources(this.IIOffsetY, "IIOffsetY"); + this.IIOffsetY.MaxValue = 1000F; + this.IIOffsetY.MinValue = 0F; + this.IIOffsetY.Name = "IIOffsetY"; + this.IIOffsetY.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IIOffsetY.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IIOffsetXYCurrentValueChanged); + // + // IISizeH + // + this.IISizeH.CurrentValue = 0F; + this.IISizeH.DecimalPositions = 1; + this.IISizeH.ForceMinMax = false; + resources.ApplyResources(this.IISizeH, "IISizeH"); + this.IISizeH.MaxValue = 1000F; + this.IISizeH.MinValue = 10F; + this.IISizeH.Name = "IISizeH"; + this.IISizeH.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IISizeH.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IISizeH_CurrentValueChanged); + this.IISizeH.OnTheFlyValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IISizeH_OnTheFlyValueChanged); + // + // IISizeW + // + this.IISizeW.CurrentValue = 0F; + this.IISizeW.DecimalPositions = 1; + this.IISizeW.ForceMinMax = false; + resources.ApplyResources(this.IISizeW, "IISizeW"); + this.IISizeW.MaxValue = 1000F; + this.IISizeW.MinValue = 10F; + this.IISizeW.Name = "IISizeW"; + this.IISizeW.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IISizeW.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IISizeW_CurrentValueChanged); + this.IISizeW.OnTheFlyValueChanged += new LaserGRBL.UserControls.NumericInput.DecimalInputBase.CurrentValueChangedDlg(this.IISizeW_OnTheFlyValueChanged); + // + // label6 + // + resources.ApplyResources(this.label6, "label6"); + this.label6.Name = "label6"; + // + // label10 + // + resources.ApplyResources(this.label10, "label10"); + this.label10.Name = "label10"; + // + // label7 + // + resources.ApplyResources(this.label7, "label7"); + this.label7.Name = "label7"; + // + // label11 + // + resources.ApplyResources(this.label11, "label11"); + this.label11.Name = "label11"; + // + // tableLayoutPanel2 + // + resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); + this.tableLayoutPanel3.SetColumnSpan(this.tableLayoutPanel2, 6); + this.tableLayoutPanel2.Controls.Add(this.label1, 2, 0); + this.tableLayoutPanel2.Controls.Add(this.CbAutosize, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.IIDpi, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.BtnDPI, 3, 0); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // CbAutosize + // + resources.ApplyResources(this.CbAutosize, "CbAutosize"); + this.CbAutosize.Name = "CbAutosize"; + this.CbAutosize.UseVisualStyleBackColor = true; + this.CbAutosize.CheckedChanged += new System.EventHandler(this.CbAutosize_CheckedChanged); + // + // IIDpi + // + resources.ApplyResources(this.IIDpi, "IIDpi"); + this.IIDpi.CurrentValue = 300; + this.IIDpi.ForcedText = null; + this.IIDpi.ForceMinMax = false; + this.IIDpi.MaxValue = 10000; + this.IIDpi.MinValue = 1; + this.IIDpi.Name = "IIDpi"; + this.IIDpi.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IIDpi.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIDpi_CurrentValueChanged); + // + // BtnDPI + // + this.BtnDPI.AltImage = null; + resources.ApplyResources(this.BtnDPI, "BtnDPI"); + this.BtnDPI.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnDPI.Caption = null; + this.BtnDPI.Coloration = System.Drawing.Color.Empty; + this.BtnDPI.Image = ((System.Drawing.Image)(resources.GetObject("BtnDPI.Image"))); + this.BtnDPI.Name = "BtnDPI"; + this.BtnDPI.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnDPI, resources.GetString("BtnDPI.ToolTip")); + this.BtnDPI.UseAltImage = false; + this.BtnDPI.Click += new System.EventHandler(this.BtnDPI_Click); + // + // tableLayoutPanel4 + // + resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); + this.tableLayoutPanel4.Controls.Add(this.BtnReset, 0, 0); + this.tableLayoutPanel4.Controls.Add(this.BtnCenter, 1, 0); + this.tableLayoutPanel4.Name = "tableLayoutPanel4"; + // + // BtnReset + // + this.BtnReset.AltImage = null; + this.BtnReset.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnReset.Caption = null; + this.BtnReset.Coloration = System.Drawing.Color.Empty; + this.BtnReset.Image = ((System.Drawing.Image)(resources.GetObject("BtnReset.Image"))); + resources.ApplyResources(this.BtnReset, "BtnReset"); + this.BtnReset.Name = "BtnReset"; + this.BtnReset.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.StretchImage; + this.BtnReset.TabStop = false; + this.BtnReset.UseAltImage = false; + this.BtnReset.Click += new System.EventHandler(this.BtnReset_Click); + // + // BtnCenter + // + this.BtnCenter.AltImage = null; + resources.ApplyResources(this.BtnCenter, "BtnCenter"); + this.BtnCenter.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnCenter.Caption = null; + this.BtnCenter.Coloration = System.Drawing.Color.Empty; + this.BtnCenter.Image = ((System.Drawing.Image)(resources.GetObject("BtnCenter.Image"))); + this.BtnCenter.Name = "BtnCenter"; + this.BtnCenter.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnCenter, resources.GetString("BtnCenter.ToolTip")); + this.BtnCenter.UseAltImage = false; + this.BtnCenter.Click += new System.EventHandler(this.BtnCenter_Click); + // + // GbSpeed + // + resources.ApplyResources(this.GbSpeed, "GbSpeed"); + this.GbSpeed.Controls.Add(this.tableLayoutPanel6); + this.GbSpeed.Name = "GbSpeed"; + this.GbSpeed.TabStop = false; + // + // tableLayoutPanel6 + // + resources.ApplyResources(this.tableLayoutPanel6, "tableLayoutPanel6"); + this.tableLayoutPanel6.Controls.Add(this.LblBorderTracing, 0, 0); + this.tableLayoutPanel6.Controls.Add(this.LblBorderTracingmm, 2, 0); + this.tableLayoutPanel6.Controls.Add(this.IIBorderTracing, 1, 0); + this.tableLayoutPanel6.Controls.Add(this.IILinearFilling, 1, 1); + this.tableLayoutPanel6.Controls.Add(this.LblLinearFillingmm, 2, 1); + this.tableLayoutPanel6.Controls.Add(this.LblLinearFilling, 0, 1); + this.tableLayoutPanel6.Controls.Add(this.BtnPSHelper, 4, 0); + this.tableLayoutPanel6.Name = "tableLayoutPanel6"; + // + // LblBorderTracing + // + resources.ApplyResources(this.LblBorderTracing, "LblBorderTracing"); + this.LblBorderTracing.Name = "LblBorderTracing"; + // + // LblBorderTracingmm + // + resources.ApplyResources(this.LblBorderTracingmm, "LblBorderTracingmm"); + this.LblBorderTracingmm.Name = "LblBorderTracingmm"; + // + // IIBorderTracing + // + resources.ApplyResources(this.IIBorderTracing, "IIBorderTracing"); + this.IIBorderTracing.CurrentValue = 1000; + this.IIBorderTracing.ForcedText = null; + this.IIBorderTracing.ForceMinMax = false; + this.IIBorderTracing.MaxValue = 4000; + this.IIBorderTracing.MinValue = 1; + this.IIBorderTracing.Name = "IIBorderTracing"; + this.IIBorderTracing.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IIBorderTracing.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIBorderTracingCurrentValueChanged); + // + // IILinearFilling + // + resources.ApplyResources(this.IILinearFilling, "IILinearFilling"); + this.IILinearFilling.CurrentValue = 1000; + this.IILinearFilling.ForcedText = null; + this.IILinearFilling.ForceMinMax = false; + this.IILinearFilling.MaxValue = 4000; + this.IILinearFilling.MinValue = 1; + this.IILinearFilling.Name = "IILinearFilling"; + this.IILinearFilling.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IILinearFilling.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMarkSpeedCurrentValueChanged); + // + // LblLinearFillingmm + // + resources.ApplyResources(this.LblLinearFillingmm, "LblLinearFillingmm"); + this.LblLinearFillingmm.Name = "LblLinearFillingmm"; + // + // LblLinearFilling + // + resources.ApplyResources(this.LblLinearFilling, "LblLinearFilling"); + this.LblLinearFilling.Name = "LblLinearFilling"; + // + // BtnPSHelper + // + this.BtnPSHelper.AltImage = null; + resources.ApplyResources(this.BtnPSHelper, "BtnPSHelper"); + this.BtnPSHelper.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnPSHelper.Caption = null; + this.BtnPSHelper.Coloration = System.Drawing.Color.Empty; + this.BtnPSHelper.Image = ((System.Drawing.Image)(resources.GetObject("BtnPSHelper.Image"))); + this.BtnPSHelper.Name = "BtnPSHelper"; + this.tableLayoutPanel6.SetRowSpan(this.BtnPSHelper, 2); + this.BtnPSHelper.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnPSHelper, resources.GetString("BtnPSHelper.ToolTip")); + this.BtnPSHelper.UseAltImage = false; + this.BtnPSHelper.Click += new System.EventHandler(this.BtnPSHelper_Click); + // + // GbLaser + // + resources.ApplyResources(this.GbLaser, "GbLaser"); + this.GbLaser.Controls.Add(this.tableLayoutPanel7); + this.GbLaser.Name = "GbLaser"; + this.GbLaser.TabStop = false; + // + // tableLayoutPanel7 + // + resources.ApplyResources(this.tableLayoutPanel7, "tableLayoutPanel7"); + this.tableLayoutPanel7.Controls.Add(this.BtnModulationInfo, 3, 1); + this.tableLayoutPanel7.Controls.Add(this.LblSmin, 0, 1); + this.tableLayoutPanel7.Controls.Add(this.IIMinPower, 1, 1); + this.tableLayoutPanel7.Controls.Add(this.LblLaserMode, 0, 0); + this.tableLayoutPanel7.Controls.Add(this.BtnOnOffInfo, 3, 0); + this.tableLayoutPanel7.Controls.Add(this.CBLaserON, 1, 0); + this.tableLayoutPanel7.Controls.Add(this.LblSmax, 0, 2); + this.tableLayoutPanel7.Controls.Add(this.IIMaxPower, 1, 2); + this.tableLayoutPanel7.Controls.Add(this.LblMinPerc, 2, 1); + this.tableLayoutPanel7.Controls.Add(this.LblMaxPerc, 2, 2); + this.tableLayoutPanel7.Name = "tableLayoutPanel7"; + // + // BtnModulationInfo + // + this.BtnModulationInfo.AltImage = null; + resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); + this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnModulationInfo.Caption = null; + this.BtnModulationInfo.Coloration = System.Drawing.Color.Empty; + this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); + this.BtnModulationInfo.Name = "BtnModulationInfo"; + this.tableLayoutPanel7.SetRowSpan(this.BtnModulationInfo, 2); + this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnModulationInfo, resources.GetString("BtnModulationInfo.ToolTip")); + this.BtnModulationInfo.UseAltImage = false; + this.BtnModulationInfo.Click += new System.EventHandler(this.BtnModulationInfo_Click); + // + // LblSmin + // + resources.ApplyResources(this.LblSmin, "LblSmin"); + this.LblSmin.Name = "LblSmin"; + // + // IIMinPower + // + resources.ApplyResources(this.IIMinPower, "IIMinPower"); + this.IIMinPower.ForcedText = null; + this.IIMinPower.ForceMinMax = false; + this.IIMinPower.MaxValue = 999; + this.IIMinPower.MinValue = 0; + this.IIMinPower.Name = "IIMinPower"; + this.IIMinPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IIMinPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMinPowerCurrentValueChanged); + // + // LblLaserMode + // + resources.ApplyResources(this.LblLaserMode, "LblLaserMode"); + this.LblLaserMode.Name = "LblLaserMode"; + // + // BtnOnOffInfo + // + this.BtnOnOffInfo.AltImage = null; + resources.ApplyResources(this.BtnOnOffInfo, "BtnOnOffInfo"); + this.BtnOnOffInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnOnOffInfo.Caption = null; + this.BtnOnOffInfo.Coloration = System.Drawing.Color.Empty; + this.BtnOnOffInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnOnOffInfo.Image"))); + this.BtnOnOffInfo.Name = "BtnOnOffInfo"; + this.BtnOnOffInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnOnOffInfo, resources.GetString("BtnOnOffInfo.ToolTip")); + this.BtnOnOffInfo.UseAltImage = false; + this.BtnOnOffInfo.Click += new System.EventHandler(this.BtnOnOffInfo_Click); + // + // CBLaserON + // + this.tableLayoutPanel7.SetColumnSpan(this.CBLaserON, 2); + resources.ApplyResources(this.CBLaserON, "CBLaserON"); + this.CBLaserON.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CBLaserON.FormattingEnabled = true; + this.CBLaserON.Name = "CBLaserON"; + this.CBLaserON.SelectedIndexChanged += new System.EventHandler(this.CBLaserON_SelectedIndexChanged); + // + // LblSmax + // + resources.ApplyResources(this.LblSmax, "LblSmax"); + this.LblSmax.Name = "LblSmax"; + // + // IIMaxPower + // + resources.ApplyResources(this.IIMaxPower, "IIMaxPower"); + this.IIMaxPower.CurrentValue = 1000; + this.IIMaxPower.ForcedText = null; + this.IIMaxPower.ForceMinMax = false; + this.IIMaxPower.MaxValue = 1000; + this.IIMaxPower.MinValue = 1; + this.IIMaxPower.Name = "IIMaxPower"; + this.IIMaxPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IIMaxPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMaxPowerCurrentValueChanged); + // + // LblMinPerc + // + resources.ApplyResources(this.LblMinPerc, "LblMinPerc"); + this.LblMinPerc.Name = "LblMinPerc"; + // + // LblMaxPerc + // + resources.ApplyResources(this.LblMaxPerc, "LblMaxPerc"); + this.LblMaxPerc.Name = "LblMaxPerc"; + // + // tableLayoutPanel1 + // + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); + this.tableLayoutPanel1.Controls.Add(this.BtnCancel, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.BtnCreate, 2, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + // + // BtnCancel + // + this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + resources.ApplyResources(this.BtnCancel, "BtnCancel"); + this.BtnCancel.Name = "BtnCancel"; + this.BtnCancel.UseVisualStyleBackColor = true; + // + // BtnCreate + // + resources.ApplyResources(this.BtnCreate, "BtnCreate"); + this.BtnCreate.Name = "BtnCreate"; + this.BtnCreate.UseVisualStyleBackColor = true; + this.BtnCreate.Click += new System.EventHandler(this.BtnCreate_Click); + // + // TT + // + this.TT.AutoPopDelay = 10000; + this.TT.InitialDelay = 500; + this.TT.ReshowDelay = 100; + // + // ConvertSizeAndOptionForm + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.tableLayoutPanel9); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "ConvertSizeAndOptionForm"; + this.tableLayoutPanel9.ResumeLayout(false); + this.tableLayoutPanel9.PerformLayout(); + this.GbSize.ResumeLayout(false); + this.GbSize.PerformLayout(); + this.tableLayoutPanel3.ResumeLayout(false); + this.tableLayoutPanel3.PerformLayout(); + this.tableLayoutPanel2.ResumeLayout(false); + this.tableLayoutPanel2.PerformLayout(); + this.tableLayoutPanel4.ResumeLayout(false); + this.GbSpeed.ResumeLayout(false); + this.GbSpeed.PerformLayout(); + this.tableLayoutPanel6.ResumeLayout(false); + this.tableLayoutPanel6.PerformLayout(); + this.GbLaser.ResumeLayout(false); + this.GbLaser.PerformLayout(); + this.tableLayoutPanel7.ResumeLayout(false); + this.tableLayoutPanel7.PerformLayout(); + this.tableLayoutPanel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.cs b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.cs index 10233a78d..a2c07dd20 100644 --- a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.cs +++ b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.cs @@ -21,7 +21,7 @@ public partial class ConvertSizeAndOptionForm : Form GrblCore mCore; bool supportPWM = Settings.GetObject("Support Hardware PWM", true); - public ComboboxItem[] LaserOptions = new ComboboxItem[] { new ComboboxItem("M3 - Constant Power", "M3"), new ComboboxItem("M4 - Dynamic Power", "M4") }; + public ComboboxItem[] LaserOptions = new ComboboxItem[] { new ComboboxItem("M3 - Constant Power", "M3"), new ComboboxItem("M4 - Dynamic Power", "M4"), new ComboboxItem("M106 - Fan Dynamic Power", "M106") }; public class ComboboxItem { public string Text { get; set; } @@ -49,7 +49,14 @@ public ConvertSizeAndOptionForm(GrblCore core) AssignMinMaxLimit(); CBLaserON.Items.Add(LaserOptions[0]); - CBLaserON.Items.Add(LaserOptions[1]); + if (Settings.GetObject("Firmware Type", Firmware.Grbl) == Firmware.Marlin && Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle) == GrblCore.PwmMode.Fan) + { + CBLaserON.Items.Add(LaserOptions[2]); + } + else + { + CBLaserON.Items.Add(LaserOptions[1]); + } } private void AssignMinMaxLimit() @@ -92,11 +99,25 @@ public void ShowDialog(Form parent, ImageProcessor processor) IP.LaserOn = Settings.GetObject("GrayScaleConversion.Gcode.LaserOptions.LaserOn", "M3"); if (IP.LaserOn == "M3" || !mCore.Configuration.LaserMode) + { CBLaserON.SelectedItem = LaserOptions[0]; + IP.LaserOff = "M5"; + } else - CBLaserON.SelectedItem = LaserOptions[1]; - - IP.LaserOff = "M5"; + { + if (Settings.GetObject("Firmware Type", Firmware.Grbl) == Firmware.Marlin && Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle) == GrblCore.PwmMode.Fan) + { + CBLaserON.SelectedItem = LaserOptions[2]; + IP.LaserOn = "M106"; + IP.LaserOff = "M107"; + } + else + { + CBLaserON.SelectedItem = LaserOptions[1]; + IP.LaserOn = "M4"; + IP.LaserOff = "M5"; + } + } IIMinPower.CurrentValue = IP.MinPower = Settings.GetObject("GrayScaleConversion.Gcode.LaserOptions.PowerMin", 0); IIMaxPower.CurrentValue = IP.MaxPower = Settings.GetObject("GrayScaleConversion.Gcode.LaserOptions.PowerMax", (int)mCore.Configuration.MaxPWM); @@ -220,13 +241,22 @@ private void CBLaserON_SelectedIndexChanged(object sender, EventArgs e) if (mode != null) { - if (!mCore.Configuration.LaserMode && (mode.Value as string) == "M4") + if (!mCore.Configuration.LaserMode && ((mode.Value as string) == "M4" || (mode.Value as string) == "M106")) MessageBox.Show(Strings.WarnWrongLaserMode, Strings.WarnWrongLaserModeTitle, MessageBoxButtons.OK, MessageBoxIcon.Warning);//warning!! IP.LaserOn = mode.Value as string; } else IP.LaserOn = "M3"; + + if(IP.LaserOn == "M106") + { + IP.LaserOff = "M107"; + } + else + { + IP.LaserOff = "M5"; + } } //private void CBLaserOFF_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.resx b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.resx index e43759174..4df458e8a 100644 --- a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.resx +++ b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.resx @@ -208,7 +208,7 @@ BtnUnlockProportion - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -298,7 +298,7 @@ IIOffsetX - LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -319,7 +319,7 @@ IIOffsetY - LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -340,7 +340,7 @@ IISizeH - LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -361,7 +361,7 @@ IISizeW - LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.DecimalInputRanged, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -625,7 +625,7 @@ IIDpi - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -681,7 +681,7 @@ BtnDPI - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -775,7 +775,7 @@ BtnReset - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel4 @@ -816,7 +816,7 @@ BtnCenter - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel4 @@ -1011,7 +1011,7 @@ IIBorderTracing - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -1038,7 +1038,7 @@ IILinearFilling - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -1149,7 +1149,7 @@ BtnPSHelper - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -1266,7 +1266,7 @@ Click for more information... BtnModulationInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -1323,7 +1323,7 @@ Click for more information... IIMinPower - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -1402,7 +1402,7 @@ Click for more information... BtnOnOffInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -1483,7 +1483,7 @@ Click for more information... IIMaxPower - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.6.2.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -1752,9 +1752,6 @@ Click for more information... 289, 300 - - NoControl - 4, 4, 4, 4 diff --git a/LaserGRBL/RasterConverter/ImageProcessor.cs b/LaserGRBL/RasterConverter/ImageProcessor.cs index 2e80e73f5..95b19073d 100644 --- a/LaserGRBL/RasterConverter/ImageProcessor.cs +++ b/LaserGRBL/RasterConverter/ImageProcessor.cs @@ -1050,6 +1050,17 @@ void DoTrueWork() conf.borderSpeed = BorderSpeed; conf.pwm = Settings.GetObject("Support Hardware PWM", true); conf.firmwareType = Settings.GetObject("Firmware Type", Firmware.Grbl); + conf.pwmMode = Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle); + conf.fanId = Settings.GetObject("Pwm FanId", 0); + try + { + conf.dwelltime = Int32.Parse(Settings.GetObject("Pwm FanDwell", "0")); + } + catch (FormatException) + { + conf.dwelltime = 0; + } + if (SelectedTool == Tool.Line2Line || SelectedTool == Tool.Dithering || SelectedTool == Tool.NoProcessing) mCore.LoadedFile.LoadImageL2L(bmp, mFileName, conf, mAppend, mCore); diff --git a/LaserGRBL/SettingsForm.Designer.cs b/LaserGRBL/SettingsForm.Designer.cs index 21856dc19..26215db14 100644 --- a/LaserGRBL/SettingsForm.Designer.cs +++ b/LaserGRBL/SettingsForm.Designer.cs @@ -28,1174 +28,1238 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsForm)); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.BtnCancel = new System.Windows.Forms.Button(); - this.BtnSave = new System.Windows.Forms.Button(); - this.MainTabPage = new System.Windows.Forms.TabControl(); - this.TpHardware = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.CBCore = new System.Windows.Forms.ComboBox(); - this.CbThreadingMode = new System.Windows.Forms.ComboBox(); - this.label4 = new System.Windows.Forms.Label(); - this.CBStreamingMode = new System.Windows.Forms.ComboBox(); - this.BtnStreamingMode = new LaserGRBL.UserControls.ImageButton(); - this.CBProtocol = new System.Windows.Forms.ComboBox(); - this.label3 = new System.Windows.Forms.Label(); - this.BtnProtocol = new LaserGRBL.UserControls.ImageButton(); - this.label6 = new System.Windows.Forms.Label(); - this.BtnThreadingModel = new LaserGRBL.UserControls.ImageButton(); - this.CbIssueDetector = new System.Windows.Forms.CheckBox(); - this.label7 = new System.Windows.Forms.Label(); - this.CbSoftReset = new System.Windows.Forms.CheckBox(); - this.label2 = new System.Windows.Forms.Label(); - this.CbHardReset = new System.Windows.Forms.CheckBox(); - this.label8 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.BtnFType = new LaserGRBL.UserControls.ImageButton(); - this.TpRasterImport = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.label1 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.CbUnidirectional = new System.Windows.Forms.CheckBox(); - this.CBSupportPWM = new System.Windows.Forms.CheckBox(); - this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); - this.CbHiRes = new System.Windows.Forms.CheckBox(); - this.label22 = new System.Windows.Forms.Label(); - this.CbDisableSkip = new System.Windows.Forms.CheckBox(); - this.label39 = new System.Windows.Forms.Label(); - this.CbDisableBoundWarn = new System.Windows.Forms.CheckBox(); - this.label40 = new System.Windows.Forms.Label(); - this.TpVectorImport = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel18 = new System.Windows.Forms.TableLayoutPanel(); - this.label43 = new System.Windows.Forms.Label(); - this.CbSmartBezier = new System.Windows.Forms.CheckBox(); - this.imageButton1 = new LaserGRBL.UserControls.ImageButton(); - this.TpJogControl = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); - this.label10 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.CbEnableZJog = new System.Windows.Forms.CheckBox(); - this.CbContinuosJog = new System.Windows.Forms.CheckBox(); - this.CbClickNJog = new System.Windows.Forms.CheckBox(); - this.label41 = new System.Windows.Forms.Label(); - this.TpAutoCooling = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); - this.label20 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.CbAutoCooling = new System.Windows.Forms.CheckBox(); - this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); - this.label15 = new System.Windows.Forms.Label(); - this.CbOnMin = new System.Windows.Forms.ComboBox(); - this.CbOnSec = new System.Windows.Forms.ComboBox(); - this.label14 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.tableLayoutPanel8 = new System.Windows.Forms.TableLayoutPanel(); - this.label17 = new System.Windows.Forms.Label(); - this.CbOffMin = new System.Windows.Forms.ComboBox(); - this.CbOffSec = new System.Windows.Forms.ComboBox(); - this.label18 = new System.Windows.Forms.Label(); - this.label19 = new System.Windows.Forms.Label(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.label21 = new System.Windows.Forms.Label(); - this.LblWarnOrturAC = new System.Windows.Forms.Label(); - this.TpGCodeSettings = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel9 = new System.Windows.Forms.TableLayoutPanel(); - this.LblHeader = new System.Windows.Forms.Label(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.TBHeader = new System.Windows.Forms.TextBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.TBFooter = new System.Windows.Forms.TextBox(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.TBPasses = new System.Windows.Forms.TextBox(); - this.LblFooter = new System.Windows.Forms.Label(); - this.LblPasses = new System.Windows.Forms.Label(); - this.TpSoundSettings = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel16 = new System.Windows.Forms.TableLayoutPanel(); - this.CbPlaySuccess = new System.Windows.Forms.CheckBox(); - this.CbPlayWarning = new System.Windows.Forms.CheckBox(); - this.CbPlayFatal = new System.Windows.Forms.CheckBox(); - this.CbPlayConnect = new System.Windows.Forms.CheckBox(); - this.CbPlayDisconnect = new System.Windows.Forms.CheckBox(); - this.tableLayoutPanel10 = new System.Windows.Forms.TableLayoutPanel(); - this.CbTelegramNotification = new System.Windows.Forms.CheckBox(); - this.DisconnectFullLabel = new System.Windows.Forms.Label(); - this.ConnectFullLabel = new System.Windows.Forms.Label(); - this.ErrorFullLabel = new System.Windows.Forms.Label(); - this.WarningFullLabel = new System.Windows.Forms.Label(); - this.SuccesFullLabel = new System.Windows.Forms.Label(); - this.label23 = new System.Windows.Forms.Label(); - this.label24 = new System.Windows.Forms.Label(); - this.tableLayoutPanel11 = new System.Windows.Forms.TableLayoutPanel(); - this.label26 = new System.Windows.Forms.Label(); - this.changeWarBtn = new System.Windows.Forms.Button(); - this.label27 = new System.Windows.Forms.Label(); - this.warningSoundLabel = new System.Windows.Forms.Label(); - this.tableLayoutPanel12 = new System.Windows.Forms.TableLayoutPanel(); - this.label29 = new System.Windows.Forms.Label(); - this.changeFatBtn = new System.Windows.Forms.Button(); - this.label30 = new System.Windows.Forms.Label(); - this.fatalSoundLabel = new System.Windows.Forms.Label(); - this.tableLayoutPanel14 = new System.Windows.Forms.TableLayoutPanel(); - this.label34 = new System.Windows.Forms.Label(); - this.changeConBtn = new System.Windows.Forms.Button(); - this.label35 = new System.Windows.Forms.Label(); - this.connectSoundLabel = new System.Windows.Forms.Label(); - this.tableLayoutPanel15 = new System.Windows.Forms.TableLayoutPanel(); - this.label37 = new System.Windows.Forms.Label(); - this.changeDconBtn = new System.Windows.Forms.Button(); - this.label38 = new System.Windows.Forms.Label(); - this.disconnectSoundLabel = new System.Windows.Forms.Label(); - this.tableLayoutPanel13 = new System.Windows.Forms.TableLayoutPanel(); - this.LblSuccessSound = new System.Windows.Forms.Label(); - this.changeSucBtn = new System.Windows.Forms.Button(); - this.label25 = new System.Windows.Forms.Label(); - this.successSoundLabel = new System.Windows.Forms.Label(); - this.label32 = new System.Windows.Forms.Label(); - this.label36 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.tableLayoutPanel17 = new System.Windows.Forms.TableLayoutPanel(); - this.BtnTelegNoteInfo = new LaserGRBL.UserControls.ImageButton(); - this.label31 = new System.Windows.Forms.Label(); - this.label33 = new System.Windows.Forms.Label(); - this.TxtNotification = new System.Windows.Forms.TextBox(); - this.BtnTestNotification = new System.Windows.Forms.Button(); - this.label42 = new System.Windows.Forms.Label(); - this.SoundBrowserDialog = new System.Windows.Forms.OpenFileDialog(); - this.tableLayoutPanel1.SuspendLayout(); - this.tableLayoutPanel2.SuspendLayout(); - this.MainTabPage.SuspendLayout(); - this.TpHardware.SuspendLayout(); - this.tableLayoutPanel3.SuspendLayout(); - this.TpRasterImport.SuspendLayout(); - this.tableLayoutPanel4.SuspendLayout(); - this.TpVectorImport.SuspendLayout(); - this.tableLayoutPanel18.SuspendLayout(); - this.TpJogControl.SuspendLayout(); - this.tableLayoutPanel5.SuspendLayout(); - this.TpAutoCooling.SuspendLayout(); - this.tableLayoutPanel6.SuspendLayout(); - this.tableLayoutPanel7.SuspendLayout(); - this.tableLayoutPanel8.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.TpGCodeSettings.SuspendLayout(); - this.tableLayoutPanel9.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.TpSoundSettings.SuspendLayout(); - this.tableLayoutPanel16.SuspendLayout(); - this.tableLayoutPanel10.SuspendLayout(); - this.tableLayoutPanel11.SuspendLayout(); - this.tableLayoutPanel12.SuspendLayout(); - this.tableLayoutPanel14.SuspendLayout(); - this.tableLayoutPanel15.SuspendLayout(); - this.tableLayoutPanel13.SuspendLayout(); - this.tableLayoutPanel17.SuspendLayout(); - this.SuspendLayout(); - // - // tableLayoutPanel1 - // - resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); - this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.MainTabPage, 0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - // - // tableLayoutPanel2 - // - resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); - this.tableLayoutPanel2.Controls.Add(this.BtnCancel, 1, 0); - this.tableLayoutPanel2.Controls.Add(this.BtnSave, 2, 0); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - // - // BtnCancel - // - this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - resources.ApplyResources(this.BtnCancel, "BtnCancel"); - this.BtnCancel.Name = "BtnCancel"; - this.BtnCancel.UseVisualStyleBackColor = true; - this.BtnCancel.Click += new System.EventHandler(this.BtnCancel_Click); - // - // BtnSave - // - resources.ApplyResources(this.BtnSave, "BtnSave"); - this.BtnSave.Name = "BtnSave"; - this.BtnSave.UseVisualStyleBackColor = true; - this.BtnSave.Click += new System.EventHandler(this.BtnSave_Click); - // - // MainTabPage - // - this.MainTabPage.Controls.Add(this.TpHardware); - this.MainTabPage.Controls.Add(this.TpRasterImport); - this.MainTabPage.Controls.Add(this.TpVectorImport); - this.MainTabPage.Controls.Add(this.TpJogControl); - this.MainTabPage.Controls.Add(this.TpAutoCooling); - this.MainTabPage.Controls.Add(this.TpGCodeSettings); - this.MainTabPage.Controls.Add(this.TpSoundSettings); - resources.ApplyResources(this.MainTabPage, "MainTabPage"); - this.MainTabPage.Name = "MainTabPage"; - this.MainTabPage.SelectedIndex = 0; - // - // TpHardware - // - this.TpHardware.Controls.Add(this.tableLayoutPanel3); - resources.ApplyResources(this.TpHardware, "TpHardware"); - this.TpHardware.Name = "TpHardware"; - this.TpHardware.UseVisualStyleBackColor = true; - // - // tableLayoutPanel3 - // - resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3"); - this.tableLayoutPanel3.Controls.Add(this.CBCore, 1, 0); - this.tableLayoutPanel3.Controls.Add(this.CbThreadingMode, 1, 3); - this.tableLayoutPanel3.Controls.Add(this.label4, 2, 2); - this.tableLayoutPanel3.Controls.Add(this.CBStreamingMode, 1, 2); - this.tableLayoutPanel3.Controls.Add(this.BtnStreamingMode, 0, 2); - this.tableLayoutPanel3.Controls.Add(this.CBProtocol, 1, 1); - this.tableLayoutPanel3.Controls.Add(this.label3, 2, 1); - this.tableLayoutPanel3.Controls.Add(this.BtnProtocol, 0, 1); - this.tableLayoutPanel3.Controls.Add(this.label6, 2, 3); - this.tableLayoutPanel3.Controls.Add(this.BtnThreadingModel, 0, 3); - this.tableLayoutPanel3.Controls.Add(this.CbIssueDetector, 1, 4); - this.tableLayoutPanel3.Controls.Add(this.label7, 2, 4); - this.tableLayoutPanel3.Controls.Add(this.CbSoftReset, 1, 5); - this.tableLayoutPanel3.Controls.Add(this.label2, 2, 5); - this.tableLayoutPanel3.Controls.Add(this.CbHardReset, 1, 6); - this.tableLayoutPanel3.Controls.Add(this.label8, 2, 6); - this.tableLayoutPanel3.Controls.Add(this.label9, 2, 0); - this.tableLayoutPanel3.Controls.Add(this.BtnFType, 0, 0); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - // - // CBCore - // - resources.ApplyResources(this.CBCore, "CBCore"); - this.CBCore.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CBCore.FormattingEnabled = true; - this.CBCore.Name = "CBCore"; - // - // CbThreadingMode - // - resources.ApplyResources(this.CbThreadingMode, "CbThreadingMode"); - this.CbThreadingMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CbThreadingMode.FormattingEnabled = true; - this.CbThreadingMode.Name = "CbThreadingMode"; - // - // label4 - // - resources.ApplyResources(this.label4, "label4"); - this.label4.Name = "label4"; - // - // CBStreamingMode - // - resources.ApplyResources(this.CBStreamingMode, "CBStreamingMode"); - this.CBStreamingMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CBStreamingMode.FormattingEnabled = true; - this.CBStreamingMode.Name = "CBStreamingMode"; - // - // BtnStreamingMode - // - this.BtnStreamingMode.AltImage = null; - this.BtnStreamingMode.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnStreamingMode.Caption = null; - this.BtnStreamingMode.Coloration = System.Drawing.Color.Empty; - this.BtnStreamingMode.Image = ((System.Drawing.Image)(resources.GetObject("BtnStreamingMode.Image"))); - resources.ApplyResources(this.BtnStreamingMode, "BtnStreamingMode"); - this.BtnStreamingMode.Name = "BtnStreamingMode"; - this.BtnStreamingMode.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnStreamingMode.UseAltImage = false; - this.BtnStreamingMode.Click += new System.EventHandler(this.BtnStreamingMode_Click); - // - // CBProtocol - // - resources.ApplyResources(this.CBProtocol, "CBProtocol"); - this.CBProtocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CBProtocol.FormattingEnabled = true; - this.CBProtocol.Name = "CBProtocol"; - // - // label3 - // - resources.ApplyResources(this.label3, "label3"); - this.label3.Name = "label3"; - // - // BtnProtocol - // - this.BtnProtocol.AltImage = null; - this.BtnProtocol.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnProtocol.Caption = null; - this.BtnProtocol.Coloration = System.Drawing.Color.Empty; - this.BtnProtocol.Image = ((System.Drawing.Image)(resources.GetObject("BtnProtocol.Image"))); - resources.ApplyResources(this.BtnProtocol, "BtnProtocol"); - this.BtnProtocol.Name = "BtnProtocol"; - this.BtnProtocol.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnProtocol.UseAltImage = false; - this.BtnProtocol.Click += new System.EventHandler(this.BtnProtocol_Click); - // - // label6 - // - resources.ApplyResources(this.label6, "label6"); - this.label6.Name = "label6"; - // - // BtnThreadingModel - // - this.BtnThreadingModel.AltImage = null; - this.BtnThreadingModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnThreadingModel.Caption = null; - this.BtnThreadingModel.Coloration = System.Drawing.Color.Empty; - this.BtnThreadingModel.Image = ((System.Drawing.Image)(resources.GetObject("BtnThreadingModel.Image"))); - resources.ApplyResources(this.BtnThreadingModel, "BtnThreadingModel"); - this.BtnThreadingModel.Name = "BtnThreadingModel"; - this.BtnThreadingModel.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnThreadingModel.UseAltImage = false; - this.BtnThreadingModel.Click += new System.EventHandler(this.BtnThreadingModel_Click); - // - // CbIssueDetector - // - resources.ApplyResources(this.CbIssueDetector, "CbIssueDetector"); - this.CbIssueDetector.Name = "CbIssueDetector"; - this.CbIssueDetector.UseVisualStyleBackColor = true; - // - // label7 - // - resources.ApplyResources(this.label7, "label7"); - this.label7.Name = "label7"; - // - // CbSoftReset - // - resources.ApplyResources(this.CbSoftReset, "CbSoftReset"); - this.CbSoftReset.Name = "CbSoftReset"; - this.CbSoftReset.UseVisualStyleBackColor = true; - // - // label2 - // - resources.ApplyResources(this.label2, "label2"); - this.label2.Name = "label2"; - // - // CbHardReset - // - resources.ApplyResources(this.CbHardReset, "CbHardReset"); - this.CbHardReset.Name = "CbHardReset"; - this.CbHardReset.UseVisualStyleBackColor = true; - // - // label8 - // - resources.ApplyResources(this.label8, "label8"); - this.label8.Name = "label8"; - // - // label9 - // - resources.ApplyResources(this.label9, "label9"); - this.label9.Name = "label9"; - // - // BtnFType - // - this.BtnFType.AltImage = null; - this.BtnFType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnFType.Caption = null; - this.BtnFType.Coloration = System.Drawing.Color.Empty; - this.BtnFType.Image = ((System.Drawing.Image)(resources.GetObject("BtnFType.Image"))); - resources.ApplyResources(this.BtnFType, "BtnFType"); - this.BtnFType.Name = "BtnFType"; - this.BtnFType.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnFType.UseAltImage = false; - this.BtnFType.Click += new System.EventHandler(this.BtnFType_Click); - // - // TpRasterImport - // - this.TpRasterImport.Controls.Add(this.tableLayoutPanel4); - resources.ApplyResources(this.TpRasterImport, "TpRasterImport"); - this.TpRasterImport.Name = "TpRasterImport"; - this.TpRasterImport.UseVisualStyleBackColor = true; - // - // tableLayoutPanel4 - // - resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); - this.tableLayoutPanel4.Controls.Add(this.label1, 2, 0); - this.tableLayoutPanel4.Controls.Add(this.label5, 2, 1); - this.tableLayoutPanel4.Controls.Add(this.CbUnidirectional, 1, 1); - this.tableLayoutPanel4.Controls.Add(this.CBSupportPWM, 1, 0); - this.tableLayoutPanel4.Controls.Add(this.BtnModulationInfo, 0, 0); - this.tableLayoutPanel4.Controls.Add(this.CbHiRes, 1, 2); - this.tableLayoutPanel4.Controls.Add(this.label22, 2, 2); - this.tableLayoutPanel4.Controls.Add(this.CbDisableSkip, 1, 3); - this.tableLayoutPanel4.Controls.Add(this.label39, 2, 3); - this.tableLayoutPanel4.Controls.Add(this.CbDisableBoundWarn, 1, 4); - this.tableLayoutPanel4.Controls.Add(this.label40, 2, 4); - this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; - // - // label5 - // - resources.ApplyResources(this.label5, "label5"); - this.label5.Name = "label5"; - // - // CbUnidirectional - // - resources.ApplyResources(this.CbUnidirectional, "CbUnidirectional"); - this.CbUnidirectional.Name = "CbUnidirectional"; - this.CbUnidirectional.UseVisualStyleBackColor = true; - // - // CBSupportPWM - // - resources.ApplyResources(this.CBSupportPWM, "CBSupportPWM"); - this.CBSupportPWM.Name = "CBSupportPWM"; - this.CBSupportPWM.UseVisualStyleBackColor = true; - // - // BtnModulationInfo - // - this.BtnModulationInfo.AltImage = null; - this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnModulationInfo.Caption = null; - this.BtnModulationInfo.Coloration = System.Drawing.Color.Empty; - this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); - resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); - this.BtnModulationInfo.Name = "BtnModulationInfo"; - this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnModulationInfo.UseAltImage = false; - this.BtnModulationInfo.Click += new System.EventHandler(this.BtnModulationInfo_Click); - // - // CbHiRes - // - resources.ApplyResources(this.CbHiRes, "CbHiRes"); - this.CbHiRes.Name = "CbHiRes"; - this.CbHiRes.UseVisualStyleBackColor = true; - // - // label22 - // - resources.ApplyResources(this.label22, "label22"); - this.label22.Name = "label22"; - // - // CbDisableSkip - // - resources.ApplyResources(this.CbDisableSkip, "CbDisableSkip"); - this.CbDisableSkip.Name = "CbDisableSkip"; - this.CbDisableSkip.UseVisualStyleBackColor = true; - // - // label39 - // - resources.ApplyResources(this.label39, "label39"); - this.label39.Name = "label39"; - // - // CbDisableBoundWarn - // - resources.ApplyResources(this.CbDisableBoundWarn, "CbDisableBoundWarn"); - this.CbDisableBoundWarn.Name = "CbDisableBoundWarn"; - this.CbDisableBoundWarn.UseVisualStyleBackColor = true; - // - // label40 - // - resources.ApplyResources(this.label40, "label40"); - this.label40.Name = "label40"; - // - // TpVectorImport - // - this.TpVectorImport.Controls.Add(this.tableLayoutPanel18); - resources.ApplyResources(this.TpVectorImport, "TpVectorImport"); - this.TpVectorImport.Name = "TpVectorImport"; - this.TpVectorImport.UseVisualStyleBackColor = true; - // - // tableLayoutPanel18 - // - resources.ApplyResources(this.tableLayoutPanel18, "tableLayoutPanel18"); - this.tableLayoutPanel18.Controls.Add(this.label43, 2, 0); - this.tableLayoutPanel18.Controls.Add(this.CbSmartBezier, 1, 0); - this.tableLayoutPanel18.Controls.Add(this.imageButton1, 0, 0); - this.tableLayoutPanel18.Name = "tableLayoutPanel18"; - // - // label43 - // - resources.ApplyResources(this.label43, "label43"); - this.label43.Name = "label43"; - // - // CbSmartBezier - // - resources.ApplyResources(this.CbSmartBezier, "CbSmartBezier"); - this.CbSmartBezier.Name = "CbSmartBezier"; - this.CbSmartBezier.UseVisualStyleBackColor = true; - // - // imageButton1 - // - this.imageButton1.AltImage = null; - this.imageButton1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.imageButton1.Caption = null; - this.imageButton1.Coloration = System.Drawing.Color.Empty; - this.imageButton1.Image = ((System.Drawing.Image)(resources.GetObject("imageButton1.Image"))); - resources.ApplyResources(this.imageButton1, "imageButton1"); - this.imageButton1.Name = "imageButton1"; - this.imageButton1.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.imageButton1.UseAltImage = false; - // - // TpJogControl - // - this.TpJogControl.Controls.Add(this.tableLayoutPanel5); - resources.ApplyResources(this.TpJogControl, "TpJogControl"); - this.TpJogControl.Name = "TpJogControl"; - this.TpJogControl.UseVisualStyleBackColor = true; - // - // tableLayoutPanel5 - // - resources.ApplyResources(this.tableLayoutPanel5, "tableLayoutPanel5"); - this.tableLayoutPanel5.Controls.Add(this.label10, 2, 0); - this.tableLayoutPanel5.Controls.Add(this.label11, 2, 1); - this.tableLayoutPanel5.Controls.Add(this.CbEnableZJog, 1, 1); - this.tableLayoutPanel5.Controls.Add(this.CbContinuosJog, 1, 0); - this.tableLayoutPanel5.Controls.Add(this.CbClickNJog, 1, 2); - this.tableLayoutPanel5.Controls.Add(this.label41, 2, 2); - this.tableLayoutPanel5.Name = "tableLayoutPanel5"; - // - // label10 - // - resources.ApplyResources(this.label10, "label10"); - this.label10.Name = "label10"; - // - // label11 - // - resources.ApplyResources(this.label11, "label11"); - this.label11.Name = "label11"; - // - // CbEnableZJog - // - resources.ApplyResources(this.CbEnableZJog, "CbEnableZJog"); - this.CbEnableZJog.Name = "CbEnableZJog"; - this.CbEnableZJog.UseVisualStyleBackColor = true; - // - // CbContinuosJog - // - resources.ApplyResources(this.CbContinuosJog, "CbContinuosJog"); - this.CbContinuosJog.Name = "CbContinuosJog"; - this.CbContinuosJog.UseVisualStyleBackColor = true; - // - // CbClickNJog - // - resources.ApplyResources(this.CbClickNJog, "CbClickNJog"); - this.CbClickNJog.Name = "CbClickNJog"; - this.CbClickNJog.UseVisualStyleBackColor = true; - // - // label41 - // - resources.ApplyResources(this.label41, "label41"); - this.label41.Name = "label41"; - // - // TpAutoCooling - // - this.TpAutoCooling.Controls.Add(this.tableLayoutPanel6); - resources.ApplyResources(this.TpAutoCooling, "TpAutoCooling"); - this.TpAutoCooling.Name = "TpAutoCooling"; - this.TpAutoCooling.UseVisualStyleBackColor = true; - // - // tableLayoutPanel6 - // - resources.ApplyResources(this.tableLayoutPanel6, "tableLayoutPanel6"); - this.tableLayoutPanel6.Controls.Add(this.label20, 2, 2); - this.tableLayoutPanel6.Controls.Add(this.label12, 2, 0); - this.tableLayoutPanel6.Controls.Add(this.label13, 2, 1); - this.tableLayoutPanel6.Controls.Add(this.CbAutoCooling, 1, 0); - this.tableLayoutPanel6.Controls.Add(this.tableLayoutPanel7, 1, 1); - this.tableLayoutPanel6.Controls.Add(this.tableLayoutPanel8, 1, 2); - this.tableLayoutPanel6.Controls.Add(this.pictureBox1, 1, 3); - this.tableLayoutPanel6.Controls.Add(this.label21, 2, 3); - this.tableLayoutPanel6.Controls.Add(this.LblWarnOrturAC, 2, 4); - this.tableLayoutPanel6.Name = "tableLayoutPanel6"; - // - // label20 - // - resources.ApplyResources(this.label20, "label20"); - this.label20.Name = "label20"; - // - // label12 - // - resources.ApplyResources(this.label12, "label12"); - this.label12.Name = "label12"; - // - // label13 - // - resources.ApplyResources(this.label13, "label13"); - this.label13.Name = "label13"; - // - // CbAutoCooling - // - resources.ApplyResources(this.CbAutoCooling, "CbAutoCooling"); - this.CbAutoCooling.Name = "CbAutoCooling"; - this.CbAutoCooling.UseVisualStyleBackColor = true; - // - // tableLayoutPanel7 - // - resources.ApplyResources(this.tableLayoutPanel7, "tableLayoutPanel7"); - this.tableLayoutPanel7.Controls.Add(this.label15, 2, 0); - this.tableLayoutPanel7.Controls.Add(this.CbOnMin, 1, 0); - this.tableLayoutPanel7.Controls.Add(this.CbOnSec, 3, 0); - this.tableLayoutPanel7.Controls.Add(this.label14, 0, 0); - this.tableLayoutPanel7.Controls.Add(this.label16, 4, 0); - this.tableLayoutPanel7.Name = "tableLayoutPanel7"; - // - // label15 - // - resources.ApplyResources(this.label15, "label15"); - this.label15.Name = "label15"; - // - // CbOnMin - // - resources.ApplyResources(this.CbOnMin, "CbOnMin"); - this.CbOnMin.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CbOnMin.FormattingEnabled = true; - this.CbOnMin.Name = "CbOnMin"; - // - // CbOnSec - // - resources.ApplyResources(this.CbOnSec, "CbOnSec"); - this.CbOnSec.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CbOnSec.FormattingEnabled = true; - this.CbOnSec.Name = "CbOnSec"; - // - // label14 - // - resources.ApplyResources(this.label14, "label14"); - this.label14.Name = "label14"; - // - // label16 - // - resources.ApplyResources(this.label16, "label16"); - this.label16.Name = "label16"; - // - // tableLayoutPanel8 - // - resources.ApplyResources(this.tableLayoutPanel8, "tableLayoutPanel8"); - this.tableLayoutPanel8.Controls.Add(this.label17, 2, 0); - this.tableLayoutPanel8.Controls.Add(this.CbOffMin, 1, 0); - this.tableLayoutPanel8.Controls.Add(this.CbOffSec, 3, 0); - this.tableLayoutPanel8.Controls.Add(this.label18, 0, 0); - this.tableLayoutPanel8.Controls.Add(this.label19, 4, 0); - this.tableLayoutPanel8.Name = "tableLayoutPanel8"; - // - // label17 - // - resources.ApplyResources(this.label17, "label17"); - this.label17.Name = "label17"; - // - // CbOffMin - // - resources.ApplyResources(this.CbOffMin, "CbOffMin"); - this.CbOffMin.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CbOffMin.FormattingEnabled = true; - this.CbOffMin.Name = "CbOffMin"; - // - // CbOffSec - // - resources.ApplyResources(this.CbOffSec, "CbOffSec"); - this.CbOffSec.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CbOffSec.FormattingEnabled = true; - this.CbOffSec.Name = "CbOffSec"; - // - // label18 - // - resources.ApplyResources(this.label18, "label18"); - this.label18.Name = "label18"; - // - // label19 - // - resources.ApplyResources(this.label19, "label19"); - this.label19.Name = "label19"; - // - // pictureBox1 - // - resources.ApplyResources(this.pictureBox1, "pictureBox1"); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.TabStop = false; - // - // label21 - // - resources.ApplyResources(this.label21, "label21"); - this.label21.ForeColor = System.Drawing.Color.Red; - this.label21.Name = "label21"; - // - // LblWarnOrturAC - // - resources.ApplyResources(this.LblWarnOrturAC, "LblWarnOrturAC"); - this.LblWarnOrturAC.ForeColor = System.Drawing.Color.Red; - this.LblWarnOrturAC.Name = "LblWarnOrturAC"; - // - // TpGCodeSettings - // - this.TpGCodeSettings.Controls.Add(this.tableLayoutPanel9); - resources.ApplyResources(this.TpGCodeSettings, "TpGCodeSettings"); - this.TpGCodeSettings.Name = "TpGCodeSettings"; - this.TpGCodeSettings.UseVisualStyleBackColor = true; - // - // tableLayoutPanel9 - // - resources.ApplyResources(this.tableLayoutPanel9, "tableLayoutPanel9"); - this.tableLayoutPanel9.Controls.Add(this.LblHeader, 2, 0); - this.tableLayoutPanel9.Controls.Add(this.groupBox1, 1, 0); - this.tableLayoutPanel9.Controls.Add(this.groupBox2, 1, 2); - this.tableLayoutPanel9.Controls.Add(this.groupBox3, 1, 1); - this.tableLayoutPanel9.Controls.Add(this.LblFooter, 2, 2); - this.tableLayoutPanel9.Controls.Add(this.LblPasses, 2, 1); - this.tableLayoutPanel9.Name = "tableLayoutPanel9"; - // - // LblHeader - // - resources.ApplyResources(this.LblHeader, "LblHeader"); - this.LblHeader.Name = "LblHeader"; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.TBHeader); - resources.ApplyResources(this.groupBox1, "groupBox1"); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.TabStop = false; - // - // TBHeader - // - resources.ApplyResources(this.TBHeader, "TBHeader"); - this.TBHeader.Name = "TBHeader"; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.TBFooter); - resources.ApplyResources(this.groupBox2, "groupBox2"); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.TabStop = false; - // - // TBFooter - // - resources.ApplyResources(this.TBFooter, "TBFooter"); - this.TBFooter.Name = "TBFooter"; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.TBPasses); - resources.ApplyResources(this.groupBox3, "groupBox3"); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.TabStop = false; - // - // TBPasses - // - resources.ApplyResources(this.TBPasses, "TBPasses"); - this.TBPasses.Name = "TBPasses"; - // - // LblFooter - // - resources.ApplyResources(this.LblFooter, "LblFooter"); - this.LblFooter.Name = "LblFooter"; - // - // LblPasses - // - resources.ApplyResources(this.LblPasses, "LblPasses"); - this.LblPasses.Name = "LblPasses"; - // - // TpSoundSettings - // - this.TpSoundSettings.Controls.Add(this.tableLayoutPanel16); - this.TpSoundSettings.Controls.Add(this.tableLayoutPanel10); - resources.ApplyResources(this.TpSoundSettings, "TpSoundSettings"); - this.TpSoundSettings.Name = "TpSoundSettings"; - this.TpSoundSettings.UseVisualStyleBackColor = true; - // - // tableLayoutPanel16 - // - resources.ApplyResources(this.tableLayoutPanel16, "tableLayoutPanel16"); - this.tableLayoutPanel16.Controls.Add(this.CbPlaySuccess, 0, 0); - this.tableLayoutPanel16.Controls.Add(this.CbPlayWarning, 0, 1); - this.tableLayoutPanel16.Controls.Add(this.CbPlayFatal, 0, 2); - this.tableLayoutPanel16.Controls.Add(this.CbPlayConnect, 0, 3); - this.tableLayoutPanel16.Controls.Add(this.CbPlayDisconnect, 0, 4); - this.tableLayoutPanel16.ForeColor = System.Drawing.Color.Transparent; - this.tableLayoutPanel16.Name = "tableLayoutPanel16"; - // - // CbPlaySuccess - // - resources.ApplyResources(this.CbPlaySuccess, "CbPlaySuccess"); - this.CbPlaySuccess.Name = "CbPlaySuccess"; - this.CbPlaySuccess.UseVisualStyleBackColor = true; - // - // CbPlayWarning - // - resources.ApplyResources(this.CbPlayWarning, "CbPlayWarning"); - this.CbPlayWarning.Name = "CbPlayWarning"; - this.CbPlayWarning.UseVisualStyleBackColor = true; - // - // CbPlayFatal - // - resources.ApplyResources(this.CbPlayFatal, "CbPlayFatal"); - this.CbPlayFatal.Name = "CbPlayFatal"; - this.CbPlayFatal.UseVisualStyleBackColor = true; - // - // CbPlayConnect - // - resources.ApplyResources(this.CbPlayConnect, "CbPlayConnect"); - this.CbPlayConnect.Name = "CbPlayConnect"; - this.CbPlayConnect.UseVisualStyleBackColor = true; - // - // CbPlayDisconnect - // - resources.ApplyResources(this.CbPlayDisconnect, "CbPlayDisconnect"); - this.CbPlayDisconnect.Name = "CbPlayDisconnect"; - this.CbPlayDisconnect.UseVisualStyleBackColor = true; - // - // tableLayoutPanel10 - // - resources.ApplyResources(this.tableLayoutPanel10, "tableLayoutPanel10"); - this.tableLayoutPanel10.Controls.Add(this.CbTelegramNotification, 0, 6); - this.tableLayoutPanel10.Controls.Add(this.DisconnectFullLabel, 0, 4); - this.tableLayoutPanel10.Controls.Add(this.ConnectFullLabel, 0, 3); - this.tableLayoutPanel10.Controls.Add(this.ErrorFullLabel, 0, 2); - this.tableLayoutPanel10.Controls.Add(this.WarningFullLabel, 0, 1); - this.tableLayoutPanel10.Controls.Add(this.SuccesFullLabel, 0, 0); - this.tableLayoutPanel10.Controls.Add(this.label23, 2, 0); - this.tableLayoutPanel10.Controls.Add(this.label24, 2, 1); - this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel11, 1, 1); - this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel12, 1, 2); - this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel14, 1, 3); - this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel15, 1, 4); - this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel13, 1, 0); - this.tableLayoutPanel10.Controls.Add(this.label32, 2, 3); - this.tableLayoutPanel10.Controls.Add(this.label36, 2, 4); - this.tableLayoutPanel10.Controls.Add(this.label28, 2, 2); - this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel17, 1, 6); - this.tableLayoutPanel10.Controls.Add(this.label42, 2, 6); - this.tableLayoutPanel10.Name = "tableLayoutPanel10"; - // - // CbTelegramNotification - // - resources.ApplyResources(this.CbTelegramNotification, "CbTelegramNotification"); - this.CbTelegramNotification.Name = "CbTelegramNotification"; - this.CbTelegramNotification.UseVisualStyleBackColor = true; - this.CbTelegramNotification.CheckedChanged += new System.EventHandler(this.CbTelegramNotification_CheckedChanged); - // - // DisconnectFullLabel - // - resources.ApplyResources(this.DisconnectFullLabel, "DisconnectFullLabel"); - this.DisconnectFullLabel.Name = "DisconnectFullLabel"; - // - // ConnectFullLabel - // - resources.ApplyResources(this.ConnectFullLabel, "ConnectFullLabel"); - this.ConnectFullLabel.Name = "ConnectFullLabel"; - // - // ErrorFullLabel - // - resources.ApplyResources(this.ErrorFullLabel, "ErrorFullLabel"); - this.ErrorFullLabel.Name = "ErrorFullLabel"; - // - // WarningFullLabel - // - resources.ApplyResources(this.WarningFullLabel, "WarningFullLabel"); - this.WarningFullLabel.Name = "WarningFullLabel"; - // - // SuccesFullLabel - // - resources.ApplyResources(this.SuccesFullLabel, "SuccesFullLabel"); - this.SuccesFullLabel.Name = "SuccesFullLabel"; - // - // label23 - // - resources.ApplyResources(this.label23, "label23"); - this.label23.Name = "label23"; - // - // label24 - // - resources.ApplyResources(this.label24, "label24"); - this.label24.Name = "label24"; - // - // tableLayoutPanel11 - // - resources.ApplyResources(this.tableLayoutPanel11, "tableLayoutPanel11"); - this.tableLayoutPanel11.Controls.Add(this.label26, 0, 0); - this.tableLayoutPanel11.Controls.Add(this.changeWarBtn, 0, 1); - this.tableLayoutPanel11.Controls.Add(this.label27, 1, 0); - this.tableLayoutPanel11.Controls.Add(this.warningSoundLabel, 1, 1); - this.tableLayoutPanel11.Name = "tableLayoutPanel11"; - // - // label26 - // - resources.ApplyResources(this.label26, "label26"); - this.label26.Name = "label26"; - // - // changeWarBtn - // - resources.ApplyResources(this.changeWarBtn, "changeWarBtn"); - this.changeWarBtn.Name = "changeWarBtn"; - this.changeWarBtn.UseVisualStyleBackColor = true; - this.changeWarBtn.Click += new System.EventHandler(this.changeWarBtn_Click); - // - // label27 - // - resources.ApplyResources(this.label27, "label27"); - this.label27.Name = "label27"; - // - // warningSoundLabel - // - resources.ApplyResources(this.warningSoundLabel, "warningSoundLabel"); - this.warningSoundLabel.Name = "warningSoundLabel"; - // - // tableLayoutPanel12 - // - resources.ApplyResources(this.tableLayoutPanel12, "tableLayoutPanel12"); - this.tableLayoutPanel12.Controls.Add(this.label29, 0, 0); - this.tableLayoutPanel12.Controls.Add(this.changeFatBtn, 0, 1); - this.tableLayoutPanel12.Controls.Add(this.label30, 1, 0); - this.tableLayoutPanel12.Controls.Add(this.fatalSoundLabel, 1, 1); - this.tableLayoutPanel12.Name = "tableLayoutPanel12"; - // - // label29 - // - resources.ApplyResources(this.label29, "label29"); - this.label29.Name = "label29"; - // - // changeFatBtn - // - resources.ApplyResources(this.changeFatBtn, "changeFatBtn"); - this.changeFatBtn.Name = "changeFatBtn"; - this.changeFatBtn.UseVisualStyleBackColor = true; - this.changeFatBtn.Click += new System.EventHandler(this.changeFatBtn_Click); - // - // label30 - // - resources.ApplyResources(this.label30, "label30"); - this.label30.Name = "label30"; - // - // fatalSoundLabel - // - resources.ApplyResources(this.fatalSoundLabel, "fatalSoundLabel"); - this.fatalSoundLabel.Name = "fatalSoundLabel"; - // - // tableLayoutPanel14 - // - resources.ApplyResources(this.tableLayoutPanel14, "tableLayoutPanel14"); - this.tableLayoutPanel14.Controls.Add(this.label34, 0, 0); - this.tableLayoutPanel14.Controls.Add(this.changeConBtn, 0, 1); - this.tableLayoutPanel14.Controls.Add(this.label35, 1, 0); - this.tableLayoutPanel14.Controls.Add(this.connectSoundLabel, 1, 1); - this.tableLayoutPanel14.Name = "tableLayoutPanel14"; - // - // label34 - // - resources.ApplyResources(this.label34, "label34"); - this.label34.Name = "label34"; - // - // changeConBtn - // - resources.ApplyResources(this.changeConBtn, "changeConBtn"); - this.changeConBtn.Name = "changeConBtn"; - this.changeConBtn.UseVisualStyleBackColor = true; - this.changeConBtn.Click += new System.EventHandler(this.changeConBtn_Click); - // - // label35 - // - resources.ApplyResources(this.label35, "label35"); - this.label35.Name = "label35"; - // - // connectSoundLabel - // - resources.ApplyResources(this.connectSoundLabel, "connectSoundLabel"); - this.connectSoundLabel.Name = "connectSoundLabel"; - // - // tableLayoutPanel15 - // - resources.ApplyResources(this.tableLayoutPanel15, "tableLayoutPanel15"); - this.tableLayoutPanel15.Controls.Add(this.label37, 0, 0); - this.tableLayoutPanel15.Controls.Add(this.changeDconBtn, 0, 1); - this.tableLayoutPanel15.Controls.Add(this.label38, 1, 0); - this.tableLayoutPanel15.Controls.Add(this.disconnectSoundLabel, 1, 1); - this.tableLayoutPanel15.Name = "tableLayoutPanel15"; - // - // label37 - // - resources.ApplyResources(this.label37, "label37"); - this.label37.Name = "label37"; - // - // changeDconBtn - // - resources.ApplyResources(this.changeDconBtn, "changeDconBtn"); - this.changeDconBtn.Name = "changeDconBtn"; - this.changeDconBtn.UseVisualStyleBackColor = true; - this.changeDconBtn.Click += new System.EventHandler(this.changeDconBtn_Click); - // - // label38 - // - resources.ApplyResources(this.label38, "label38"); - this.label38.Name = "label38"; - // - // disconnectSoundLabel - // - resources.ApplyResources(this.disconnectSoundLabel, "disconnectSoundLabel"); - this.disconnectSoundLabel.Name = "disconnectSoundLabel"; - // - // tableLayoutPanel13 - // - resources.ApplyResources(this.tableLayoutPanel13, "tableLayoutPanel13"); - this.tableLayoutPanel13.Controls.Add(this.LblSuccessSound, 0, 0); - this.tableLayoutPanel13.Controls.Add(this.changeSucBtn, 0, 1); - this.tableLayoutPanel13.Controls.Add(this.label25, 1, 0); - this.tableLayoutPanel13.Controls.Add(this.successSoundLabel, 1, 1); - this.tableLayoutPanel13.Name = "tableLayoutPanel13"; - // - // LblSuccessSound - // - resources.ApplyResources(this.LblSuccessSound, "LblSuccessSound"); - this.LblSuccessSound.Name = "LblSuccessSound"; - // - // changeSucBtn - // - resources.ApplyResources(this.changeSucBtn, "changeSucBtn"); - this.changeSucBtn.Name = "changeSucBtn"; - this.changeSucBtn.UseVisualStyleBackColor = true; - this.changeSucBtn.Click += new System.EventHandler(this.changeSucBtn_Click); - // - // label25 - // - resources.ApplyResources(this.label25, "label25"); - this.label25.Name = "label25"; - // - // successSoundLabel - // - resources.ApplyResources(this.successSoundLabel, "successSoundLabel"); - this.successSoundLabel.Name = "successSoundLabel"; - // - // label32 - // - resources.ApplyResources(this.label32, "label32"); - this.label32.Name = "label32"; - // - // label36 - // - resources.ApplyResources(this.label36, "label36"); - this.label36.Name = "label36"; - // - // label28 - // - resources.ApplyResources(this.label28, "label28"); - this.label28.Name = "label28"; - // - // tableLayoutPanel17 - // - resources.ApplyResources(this.tableLayoutPanel17, "tableLayoutPanel17"); - this.tableLayoutPanel17.Controls.Add(this.BtnTelegNoteInfo, 2, 0); - this.tableLayoutPanel17.Controls.Add(this.label31, 0, 0); - this.tableLayoutPanel17.Controls.Add(this.label33, 0, 1); - this.tableLayoutPanel17.Controls.Add(this.TxtNotification, 1, 1); - this.tableLayoutPanel17.Controls.Add(this.BtnTestNotification, 2, 1); - this.tableLayoutPanel17.Name = "tableLayoutPanel17"; - // - // BtnTelegNoteInfo - // - this.BtnTelegNoteInfo.AltImage = null; - this.BtnTelegNoteInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnTelegNoteInfo.Caption = null; - this.BtnTelegNoteInfo.Coloration = System.Drawing.Color.Empty; - this.BtnTelegNoteInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnTelegNoteInfo.Image"))); - resources.ApplyResources(this.BtnTelegNoteInfo, "BtnTelegNoteInfo"); - this.BtnTelegNoteInfo.Name = "BtnTelegNoteInfo"; - this.BtnTelegNoteInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnTelegNoteInfo.UseAltImage = false; - this.BtnTelegNoteInfo.Click += new System.EventHandler(this.BtnTelegNoteInfo_Click); - // - // label31 - // - resources.ApplyResources(this.label31, "label31"); - this.tableLayoutPanel17.SetColumnSpan(this.label31, 2); - this.label31.Name = "label31"; - // - // label33 - // - resources.ApplyResources(this.label33, "label33"); - this.label33.Name = "label33"; - // - // TxtNotification - // - resources.ApplyResources(this.TxtNotification, "TxtNotification"); - this.TxtNotification.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.TxtNotification.Name = "TxtNotification"; - this.TxtNotification.TextChanged += new System.EventHandler(this.TbNotification_TextChanged); - // - // BtnTestNotification - // - resources.ApplyResources(this.BtnTestNotification, "BtnTestNotification"); - this.BtnTestNotification.Name = "BtnTestNotification"; - this.BtnTestNotification.UseVisualStyleBackColor = true; - this.BtnTestNotification.Click += new System.EventHandler(this.BtnTestNotification_Click); - // - // label42 - // - resources.ApplyResources(this.label42, "label42"); - this.label42.Name = "label42"; - // - // SoundBrowserDialog - // - resources.ApplyResources(this.SoundBrowserDialog, "SoundBrowserDialog"); - // - // SettingsForm - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.BtnCancel; - this.Controls.Add(this.tableLayoutPanel1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "SettingsForm"; - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel1.PerformLayout(); - this.tableLayoutPanel2.ResumeLayout(false); - this.MainTabPage.ResumeLayout(false); - this.TpHardware.ResumeLayout(false); - this.TpHardware.PerformLayout(); - this.tableLayoutPanel3.ResumeLayout(false); - this.tableLayoutPanel3.PerformLayout(); - this.TpRasterImport.ResumeLayout(false); - this.TpRasterImport.PerformLayout(); - this.tableLayoutPanel4.ResumeLayout(false); - this.tableLayoutPanel4.PerformLayout(); - this.TpVectorImport.ResumeLayout(false); - this.TpVectorImport.PerformLayout(); - this.tableLayoutPanel18.ResumeLayout(false); - this.tableLayoutPanel18.PerformLayout(); - this.TpJogControl.ResumeLayout(false); - this.TpJogControl.PerformLayout(); - this.tableLayoutPanel5.ResumeLayout(false); - this.tableLayoutPanel5.PerformLayout(); - this.TpAutoCooling.ResumeLayout(false); - this.TpAutoCooling.PerformLayout(); - this.tableLayoutPanel6.ResumeLayout(false); - this.tableLayoutPanel6.PerformLayout(); - this.tableLayoutPanel7.ResumeLayout(false); - this.tableLayoutPanel7.PerformLayout(); - this.tableLayoutPanel8.ResumeLayout(false); - this.tableLayoutPanel8.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.TpGCodeSettings.ResumeLayout(false); - this.TpGCodeSettings.PerformLayout(); - this.tableLayoutPanel9.ResumeLayout(false); - this.tableLayoutPanel9.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.TpSoundSettings.ResumeLayout(false); - this.TpSoundSettings.PerformLayout(); - this.tableLayoutPanel16.ResumeLayout(false); - this.tableLayoutPanel16.PerformLayout(); - this.tableLayoutPanel10.ResumeLayout(false); - this.tableLayoutPanel10.PerformLayout(); - this.tableLayoutPanel11.ResumeLayout(false); - this.tableLayoutPanel11.PerformLayout(); - this.tableLayoutPanel12.ResumeLayout(false); - this.tableLayoutPanel12.PerformLayout(); - this.tableLayoutPanel14.ResumeLayout(false); - this.tableLayoutPanel14.PerformLayout(); - this.tableLayoutPanel15.ResumeLayout(false); - this.tableLayoutPanel15.PerformLayout(); - this.tableLayoutPanel13.ResumeLayout(false); - this.tableLayoutPanel13.PerformLayout(); - this.tableLayoutPanel17.ResumeLayout(false); - this.tableLayoutPanel17.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsForm)); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnCancel = new System.Windows.Forms.Button(); + this.BtnSave = new System.Windows.Forms.Button(); + this.MainTabPage = new System.Windows.Forms.TabControl(); + this.TpHardware = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.CBCore = new System.Windows.Forms.ComboBox(); + this.CbThreadingMode = new System.Windows.Forms.ComboBox(); + this.label4 = new System.Windows.Forms.Label(); + this.CBStreamingMode = new System.Windows.Forms.ComboBox(); + this.BtnStreamingMode = new LaserGRBL.UserControls.ImageButton(); + this.CBProtocol = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); + this.BtnProtocol = new LaserGRBL.UserControls.ImageButton(); + this.label6 = new System.Windows.Forms.Label(); + this.BtnThreadingModel = new LaserGRBL.UserControls.ImageButton(); + this.CbIssueDetector = new System.Windows.Forms.CheckBox(); + this.label7 = new System.Windows.Forms.Label(); + this.CbSoftReset = new System.Windows.Forms.CheckBox(); + this.label2 = new System.Windows.Forms.Label(); + this.CbHardReset = new System.Windows.Forms.CheckBox(); + this.label8 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.BtnFType = new LaserGRBL.UserControls.ImageButton(); + this.TpRasterImport = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); + this.label1 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.CbUnidirectional = new System.Windows.Forms.CheckBox(); + this.CBSupportPWM = new System.Windows.Forms.CheckBox(); + this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); + this.CbHiRes = new System.Windows.Forms.CheckBox(); + this.label22 = new System.Windows.Forms.Label(); + this.CbDisableSkip = new System.Windows.Forms.CheckBox(); + this.label39 = new System.Windows.Forms.Label(); + this.CbDisableBoundWarn = new System.Windows.Forms.CheckBox(); + this.label40 = new System.Windows.Forms.Label(); + this.TpVectorImport = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel18 = new System.Windows.Forms.TableLayoutPanel(); + this.label43 = new System.Windows.Forms.Label(); + this.CbSmartBezier = new System.Windows.Forms.CheckBox(); + this.imageButton1 = new LaserGRBL.UserControls.ImageButton(); + this.TpJogControl = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); + this.label10 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.CbEnableZJog = new System.Windows.Forms.CheckBox(); + this.CbContinuosJog = new System.Windows.Forms.CheckBox(); + this.CbClickNJog = new System.Windows.Forms.CheckBox(); + this.label41 = new System.Windows.Forms.Label(); + this.TpAutoCooling = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); + this.label20 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.CbAutoCooling = new System.Windows.Forms.CheckBox(); + this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); + this.label15 = new System.Windows.Forms.Label(); + this.CbOnMin = new System.Windows.Forms.ComboBox(); + this.CbOnSec = new System.Windows.Forms.ComboBox(); + this.label14 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); + this.tableLayoutPanel8 = new System.Windows.Forms.TableLayoutPanel(); + this.label17 = new System.Windows.Forms.Label(); + this.CbOffMin = new System.Windows.Forms.ComboBox(); + this.CbOffSec = new System.Windows.Forms.ComboBox(); + this.label18 = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label21 = new System.Windows.Forms.Label(); + this.LblWarnOrturAC = new System.Windows.Forms.Label(); + this.TpGCodeSettings = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel9 = new System.Windows.Forms.TableLayoutPanel(); + this.LblHeader = new System.Windows.Forms.Label(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.TBHeader = new System.Windows.Forms.TextBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.TBFooter = new System.Windows.Forms.TextBox(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.TBPasses = new System.Windows.Forms.TextBox(); + this.LblFooter = new System.Windows.Forms.Label(); + this.LblPasses = new System.Windows.Forms.Label(); + this.TpSoundSettings = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel16 = new System.Windows.Forms.TableLayoutPanel(); + this.CbPlaySuccess = new System.Windows.Forms.CheckBox(); + this.CbPlayWarning = new System.Windows.Forms.CheckBox(); + this.CbPlayFatal = new System.Windows.Forms.CheckBox(); + this.CbPlayConnect = new System.Windows.Forms.CheckBox(); + this.CbPlayDisconnect = new System.Windows.Forms.CheckBox(); + this.tableLayoutPanel10 = new System.Windows.Forms.TableLayoutPanel(); + this.CbTelegramNotification = new System.Windows.Forms.CheckBox(); + this.DisconnectFullLabel = new System.Windows.Forms.Label(); + this.ConnectFullLabel = new System.Windows.Forms.Label(); + this.ErrorFullLabel = new System.Windows.Forms.Label(); + this.WarningFullLabel = new System.Windows.Forms.Label(); + this.SuccesFullLabel = new System.Windows.Forms.Label(); + this.label23 = new System.Windows.Forms.Label(); + this.label24 = new System.Windows.Forms.Label(); + this.tableLayoutPanel11 = new System.Windows.Forms.TableLayoutPanel(); + this.label26 = new System.Windows.Forms.Label(); + this.changeWarBtn = new System.Windows.Forms.Button(); + this.label27 = new System.Windows.Forms.Label(); + this.warningSoundLabel = new System.Windows.Forms.Label(); + this.tableLayoutPanel12 = new System.Windows.Forms.TableLayoutPanel(); + this.label29 = new System.Windows.Forms.Label(); + this.changeFatBtn = new System.Windows.Forms.Button(); + this.label30 = new System.Windows.Forms.Label(); + this.fatalSoundLabel = new System.Windows.Forms.Label(); + this.tableLayoutPanel14 = new System.Windows.Forms.TableLayoutPanel(); + this.label34 = new System.Windows.Forms.Label(); + this.changeConBtn = new System.Windows.Forms.Button(); + this.label35 = new System.Windows.Forms.Label(); + this.connectSoundLabel = new System.Windows.Forms.Label(); + this.tableLayoutPanel15 = new System.Windows.Forms.TableLayoutPanel(); + this.label37 = new System.Windows.Forms.Label(); + this.changeDconBtn = new System.Windows.Forms.Button(); + this.label38 = new System.Windows.Forms.Label(); + this.disconnectSoundLabel = new System.Windows.Forms.Label(); + this.tableLayoutPanel13 = new System.Windows.Forms.TableLayoutPanel(); + this.LblSuccessSound = new System.Windows.Forms.Label(); + this.changeSucBtn = new System.Windows.Forms.Button(); + this.label25 = new System.Windows.Forms.Label(); + this.successSoundLabel = new System.Windows.Forms.Label(); + this.label32 = new System.Windows.Forms.Label(); + this.label36 = new System.Windows.Forms.Label(); + this.label28 = new System.Windows.Forms.Label(); + this.tableLayoutPanel17 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnTelegNoteInfo = new LaserGRBL.UserControls.ImageButton(); + this.label31 = new System.Windows.Forms.Label(); + this.label33 = new System.Windows.Forms.Label(); + this.TxtNotification = new System.Windows.Forms.TextBox(); + this.BtnTestNotification = new System.Windows.Forms.Button(); + this.label42 = new System.Windows.Forms.Label(); + this.TpPwmSettings = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel19 = new System.Windows.Forms.TableLayoutPanel(); + this.CBPwmSel = new System.Windows.Forms.ComboBox(); + this.label44 = new System.Windows.Forms.Label(); + this.CBFanIdx = new System.Windows.Forms.ComboBox(); + this.label45 = new System.Windows.Forms.Label(); + this.TBDwell = new System.Windows.Forms.TextBox(); + this.label46 = new System.Windows.Forms.Label(); + this.SoundBrowserDialog = new System.Windows.Forms.OpenFileDialog(); + this.tableLayoutPanel1.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); + this.MainTabPage.SuspendLayout(); + this.TpHardware.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); + this.TpRasterImport.SuspendLayout(); + this.tableLayoutPanel4.SuspendLayout(); + this.TpVectorImport.SuspendLayout(); + this.tableLayoutPanel18.SuspendLayout(); + this.TpJogControl.SuspendLayout(); + this.tableLayoutPanel5.SuspendLayout(); + this.TpAutoCooling.SuspendLayout(); + this.tableLayoutPanel6.SuspendLayout(); + this.tableLayoutPanel7.SuspendLayout(); + this.tableLayoutPanel8.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.TpGCodeSettings.SuspendLayout(); + this.tableLayoutPanel9.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.TpSoundSettings.SuspendLayout(); + this.tableLayoutPanel16.SuspendLayout(); + this.tableLayoutPanel10.SuspendLayout(); + this.tableLayoutPanel11.SuspendLayout(); + this.tableLayoutPanel12.SuspendLayout(); + this.tableLayoutPanel14.SuspendLayout(); + this.tableLayoutPanel15.SuspendLayout(); + this.tableLayoutPanel13.SuspendLayout(); + this.tableLayoutPanel17.SuspendLayout(); + this.TpPwmSettings.SuspendLayout(); + this.tableLayoutPanel19.SuspendLayout(); + this.SuspendLayout(); + // + // tableLayoutPanel1 + // + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); + this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.MainTabPage, 0, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + // + // tableLayoutPanel2 + // + resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); + this.tableLayoutPanel2.Controls.Add(this.BtnCancel, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.BtnSave, 2, 0); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + // + // BtnCancel + // + this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + resources.ApplyResources(this.BtnCancel, "BtnCancel"); + this.BtnCancel.Name = "BtnCancel"; + this.BtnCancel.UseVisualStyleBackColor = true; + this.BtnCancel.Click += new System.EventHandler(this.BtnCancel_Click); + // + // BtnSave + // + resources.ApplyResources(this.BtnSave, "BtnSave"); + this.BtnSave.Name = "BtnSave"; + this.BtnSave.UseVisualStyleBackColor = true; + this.BtnSave.Click += new System.EventHandler(this.BtnSave_Click); + // + // MainTabPage + // + this.MainTabPage.Controls.Add(this.TpHardware); + this.MainTabPage.Controls.Add(this.TpRasterImport); + this.MainTabPage.Controls.Add(this.TpVectorImport); + this.MainTabPage.Controls.Add(this.TpJogControl); + this.MainTabPage.Controls.Add(this.TpAutoCooling); + this.MainTabPage.Controls.Add(this.TpGCodeSettings); + this.MainTabPage.Controls.Add(this.TpSoundSettings); + this.MainTabPage.Controls.Add(this.TpPwmSettings); + resources.ApplyResources(this.MainTabPage, "MainTabPage"); + this.MainTabPage.Name = "MainTabPage"; + this.MainTabPage.SelectedIndex = 0; + // + // TpHardware + // + this.TpHardware.Controls.Add(this.tableLayoutPanel3); + resources.ApplyResources(this.TpHardware, "TpHardware"); + this.TpHardware.Name = "TpHardware"; + this.TpHardware.UseVisualStyleBackColor = true; + // + // tableLayoutPanel3 + // + resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3"); + this.tableLayoutPanel3.Controls.Add(this.CBCore, 1, 0); + this.tableLayoutPanel3.Controls.Add(this.CbThreadingMode, 1, 3); + this.tableLayoutPanel3.Controls.Add(this.label4, 2, 2); + this.tableLayoutPanel3.Controls.Add(this.CBStreamingMode, 1, 2); + this.tableLayoutPanel3.Controls.Add(this.BtnStreamingMode, 0, 2); + this.tableLayoutPanel3.Controls.Add(this.CBProtocol, 1, 1); + this.tableLayoutPanel3.Controls.Add(this.label3, 2, 1); + this.tableLayoutPanel3.Controls.Add(this.BtnProtocol, 0, 1); + this.tableLayoutPanel3.Controls.Add(this.label6, 2, 3); + this.tableLayoutPanel3.Controls.Add(this.BtnThreadingModel, 0, 3); + this.tableLayoutPanel3.Controls.Add(this.CbIssueDetector, 1, 4); + this.tableLayoutPanel3.Controls.Add(this.label7, 2, 4); + this.tableLayoutPanel3.Controls.Add(this.CbSoftReset, 1, 5); + this.tableLayoutPanel3.Controls.Add(this.label2, 2, 5); + this.tableLayoutPanel3.Controls.Add(this.CbHardReset, 1, 6); + this.tableLayoutPanel3.Controls.Add(this.label8, 2, 6); + this.tableLayoutPanel3.Controls.Add(this.label9, 2, 0); + this.tableLayoutPanel3.Controls.Add(this.BtnFType, 0, 0); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + // + // CBCore + // + resources.ApplyResources(this.CBCore, "CBCore"); + this.CBCore.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CBCore.FormattingEnabled = true; + this.CBCore.Name = "CBCore"; + // + // CbThreadingMode + // + resources.ApplyResources(this.CbThreadingMode, "CbThreadingMode"); + this.CbThreadingMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbThreadingMode.FormattingEnabled = true; + this.CbThreadingMode.Name = "CbThreadingMode"; + // + // label4 + // + resources.ApplyResources(this.label4, "label4"); + this.label4.Name = "label4"; + // + // CBStreamingMode + // + resources.ApplyResources(this.CBStreamingMode, "CBStreamingMode"); + this.CBStreamingMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CBStreamingMode.FormattingEnabled = true; + this.CBStreamingMode.Name = "CBStreamingMode"; + // + // BtnStreamingMode + // + this.BtnStreamingMode.AltImage = null; + this.BtnStreamingMode.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnStreamingMode.Caption = null; + this.BtnStreamingMode.Coloration = System.Drawing.Color.Empty; + this.BtnStreamingMode.Image = ((System.Drawing.Image)(resources.GetObject("BtnStreamingMode.Image"))); + resources.ApplyResources(this.BtnStreamingMode, "BtnStreamingMode"); + this.BtnStreamingMode.Name = "BtnStreamingMode"; + this.BtnStreamingMode.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnStreamingMode.UseAltImage = false; + this.BtnStreamingMode.Click += new System.EventHandler(this.BtnStreamingMode_Click); + // + // CBProtocol + // + resources.ApplyResources(this.CBProtocol, "CBProtocol"); + this.CBProtocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CBProtocol.FormattingEnabled = true; + this.CBProtocol.Name = "CBProtocol"; + // + // label3 + // + resources.ApplyResources(this.label3, "label3"); + this.label3.Name = "label3"; + // + // BtnProtocol + // + this.BtnProtocol.AltImage = null; + this.BtnProtocol.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnProtocol.Caption = null; + this.BtnProtocol.Coloration = System.Drawing.Color.Empty; + this.BtnProtocol.Image = ((System.Drawing.Image)(resources.GetObject("BtnProtocol.Image"))); + resources.ApplyResources(this.BtnProtocol, "BtnProtocol"); + this.BtnProtocol.Name = "BtnProtocol"; + this.BtnProtocol.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnProtocol.UseAltImage = false; + this.BtnProtocol.Click += new System.EventHandler(this.BtnProtocol_Click); + // + // label6 + // + resources.ApplyResources(this.label6, "label6"); + this.label6.Name = "label6"; + // + // BtnThreadingModel + // + this.BtnThreadingModel.AltImage = null; + this.BtnThreadingModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnThreadingModel.Caption = null; + this.BtnThreadingModel.Coloration = System.Drawing.Color.Empty; + this.BtnThreadingModel.Image = ((System.Drawing.Image)(resources.GetObject("BtnThreadingModel.Image"))); + resources.ApplyResources(this.BtnThreadingModel, "BtnThreadingModel"); + this.BtnThreadingModel.Name = "BtnThreadingModel"; + this.BtnThreadingModel.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnThreadingModel.UseAltImage = false; + this.BtnThreadingModel.Click += new System.EventHandler(this.BtnThreadingModel_Click); + // + // CbIssueDetector + // + resources.ApplyResources(this.CbIssueDetector, "CbIssueDetector"); + this.CbIssueDetector.Name = "CbIssueDetector"; + this.CbIssueDetector.UseVisualStyleBackColor = true; + // + // label7 + // + resources.ApplyResources(this.label7, "label7"); + this.label7.Name = "label7"; + // + // CbSoftReset + // + resources.ApplyResources(this.CbSoftReset, "CbSoftReset"); + this.CbSoftReset.Name = "CbSoftReset"; + this.CbSoftReset.UseVisualStyleBackColor = true; + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.Name = "label2"; + // + // CbHardReset + // + resources.ApplyResources(this.CbHardReset, "CbHardReset"); + this.CbHardReset.Name = "CbHardReset"; + this.CbHardReset.UseVisualStyleBackColor = true; + // + // label8 + // + resources.ApplyResources(this.label8, "label8"); + this.label8.Name = "label8"; + // + // label9 + // + resources.ApplyResources(this.label9, "label9"); + this.label9.Name = "label9"; + // + // BtnFType + // + this.BtnFType.AltImage = null; + this.BtnFType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnFType.Caption = null; + this.BtnFType.Coloration = System.Drawing.Color.Empty; + this.BtnFType.Image = ((System.Drawing.Image)(resources.GetObject("BtnFType.Image"))); + resources.ApplyResources(this.BtnFType, "BtnFType"); + this.BtnFType.Name = "BtnFType"; + this.BtnFType.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnFType.UseAltImage = false; + this.BtnFType.Click += new System.EventHandler(this.BtnFType_Click); + // + // TpRasterImport + // + this.TpRasterImport.Controls.Add(this.tableLayoutPanel4); + resources.ApplyResources(this.TpRasterImport, "TpRasterImport"); + this.TpRasterImport.Name = "TpRasterImport"; + this.TpRasterImport.UseVisualStyleBackColor = true; + // + // tableLayoutPanel4 + // + resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); + this.tableLayoutPanel4.Controls.Add(this.label1, 2, 0); + this.tableLayoutPanel4.Controls.Add(this.label5, 2, 1); + this.tableLayoutPanel4.Controls.Add(this.CbUnidirectional, 1, 1); + this.tableLayoutPanel4.Controls.Add(this.CBSupportPWM, 1, 0); + this.tableLayoutPanel4.Controls.Add(this.BtnModulationInfo, 0, 0); + this.tableLayoutPanel4.Controls.Add(this.CbHiRes, 1, 2); + this.tableLayoutPanel4.Controls.Add(this.label22, 2, 2); + this.tableLayoutPanel4.Controls.Add(this.CbDisableSkip, 1, 3); + this.tableLayoutPanel4.Controls.Add(this.label39, 2, 3); + this.tableLayoutPanel4.Controls.Add(this.CbDisableBoundWarn, 1, 4); + this.tableLayoutPanel4.Controls.Add(this.label40, 2, 4); + this.tableLayoutPanel4.Name = "tableLayoutPanel4"; + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // label5 + // + resources.ApplyResources(this.label5, "label5"); + this.label5.Name = "label5"; + // + // CbUnidirectional + // + resources.ApplyResources(this.CbUnidirectional, "CbUnidirectional"); + this.CbUnidirectional.Name = "CbUnidirectional"; + this.CbUnidirectional.UseVisualStyleBackColor = true; + // + // CBSupportPWM + // + resources.ApplyResources(this.CBSupportPWM, "CBSupportPWM"); + this.CBSupportPWM.Name = "CBSupportPWM"; + this.CBSupportPWM.UseVisualStyleBackColor = true; + // + // BtnModulationInfo + // + this.BtnModulationInfo.AltImage = null; + this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnModulationInfo.Caption = null; + this.BtnModulationInfo.Coloration = System.Drawing.Color.Empty; + this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); + resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); + this.BtnModulationInfo.Name = "BtnModulationInfo"; + this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnModulationInfo.UseAltImage = false; + this.BtnModulationInfo.Click += new System.EventHandler(this.BtnModulationInfo_Click); + // + // CbHiRes + // + resources.ApplyResources(this.CbHiRes, "CbHiRes"); + this.CbHiRes.Name = "CbHiRes"; + this.CbHiRes.UseVisualStyleBackColor = true; + // + // label22 + // + resources.ApplyResources(this.label22, "label22"); + this.label22.Name = "label22"; + // + // CbDisableSkip + // + resources.ApplyResources(this.CbDisableSkip, "CbDisableSkip"); + this.CbDisableSkip.Name = "CbDisableSkip"; + this.CbDisableSkip.UseVisualStyleBackColor = true; + // + // label39 + // + resources.ApplyResources(this.label39, "label39"); + this.label39.Name = "label39"; + // + // CbDisableBoundWarn + // + resources.ApplyResources(this.CbDisableBoundWarn, "CbDisableBoundWarn"); + this.CbDisableBoundWarn.Name = "CbDisableBoundWarn"; + this.CbDisableBoundWarn.UseVisualStyleBackColor = true; + // + // label40 + // + resources.ApplyResources(this.label40, "label40"); + this.label40.Name = "label40"; + // + // TpVectorImport + // + this.TpVectorImport.Controls.Add(this.tableLayoutPanel18); + resources.ApplyResources(this.TpVectorImport, "TpVectorImport"); + this.TpVectorImport.Name = "TpVectorImport"; + this.TpVectorImport.UseVisualStyleBackColor = true; + // + // tableLayoutPanel18 + // + resources.ApplyResources(this.tableLayoutPanel18, "tableLayoutPanel18"); + this.tableLayoutPanel18.Controls.Add(this.label43, 2, 0); + this.tableLayoutPanel18.Controls.Add(this.CbSmartBezier, 1, 0); + this.tableLayoutPanel18.Controls.Add(this.imageButton1, 0, 0); + this.tableLayoutPanel18.Name = "tableLayoutPanel18"; + // + // label43 + // + resources.ApplyResources(this.label43, "label43"); + this.label43.Name = "label43"; + // + // CbSmartBezier + // + resources.ApplyResources(this.CbSmartBezier, "CbSmartBezier"); + this.CbSmartBezier.Name = "CbSmartBezier"; + this.CbSmartBezier.UseVisualStyleBackColor = true; + // + // imageButton1 + // + this.imageButton1.AltImage = null; + this.imageButton1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.imageButton1.Caption = null; + this.imageButton1.Coloration = System.Drawing.Color.Empty; + this.imageButton1.Image = ((System.Drawing.Image)(resources.GetObject("imageButton1.Image"))); + resources.ApplyResources(this.imageButton1, "imageButton1"); + this.imageButton1.Name = "imageButton1"; + this.imageButton1.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.imageButton1.UseAltImage = false; + // + // TpJogControl + // + this.TpJogControl.Controls.Add(this.tableLayoutPanel5); + resources.ApplyResources(this.TpJogControl, "TpJogControl"); + this.TpJogControl.Name = "TpJogControl"; + this.TpJogControl.UseVisualStyleBackColor = true; + // + // tableLayoutPanel5 + // + resources.ApplyResources(this.tableLayoutPanel5, "tableLayoutPanel5"); + this.tableLayoutPanel5.Controls.Add(this.label10, 2, 0); + this.tableLayoutPanel5.Controls.Add(this.label11, 2, 1); + this.tableLayoutPanel5.Controls.Add(this.CbEnableZJog, 1, 1); + this.tableLayoutPanel5.Controls.Add(this.CbContinuosJog, 1, 0); + this.tableLayoutPanel5.Controls.Add(this.CbClickNJog, 1, 2); + this.tableLayoutPanel5.Controls.Add(this.label41, 2, 2); + this.tableLayoutPanel5.Name = "tableLayoutPanel5"; + // + // label10 + // + resources.ApplyResources(this.label10, "label10"); + this.label10.Name = "label10"; + // + // label11 + // + resources.ApplyResources(this.label11, "label11"); + this.label11.Name = "label11"; + // + // CbEnableZJog + // + resources.ApplyResources(this.CbEnableZJog, "CbEnableZJog"); + this.CbEnableZJog.Name = "CbEnableZJog"; + this.CbEnableZJog.UseVisualStyleBackColor = true; + // + // CbContinuosJog + // + resources.ApplyResources(this.CbContinuosJog, "CbContinuosJog"); + this.CbContinuosJog.Name = "CbContinuosJog"; + this.CbContinuosJog.UseVisualStyleBackColor = true; + // + // CbClickNJog + // + resources.ApplyResources(this.CbClickNJog, "CbClickNJog"); + this.CbClickNJog.Name = "CbClickNJog"; + this.CbClickNJog.UseVisualStyleBackColor = true; + // + // label41 + // + resources.ApplyResources(this.label41, "label41"); + this.label41.Name = "label41"; + // + // TpAutoCooling + // + this.TpAutoCooling.Controls.Add(this.tableLayoutPanel6); + resources.ApplyResources(this.TpAutoCooling, "TpAutoCooling"); + this.TpAutoCooling.Name = "TpAutoCooling"; + this.TpAutoCooling.UseVisualStyleBackColor = true; + // + // tableLayoutPanel6 + // + resources.ApplyResources(this.tableLayoutPanel6, "tableLayoutPanel6"); + this.tableLayoutPanel6.Controls.Add(this.label20, 2, 2); + this.tableLayoutPanel6.Controls.Add(this.label12, 2, 0); + this.tableLayoutPanel6.Controls.Add(this.label13, 2, 1); + this.tableLayoutPanel6.Controls.Add(this.CbAutoCooling, 1, 0); + this.tableLayoutPanel6.Controls.Add(this.tableLayoutPanel7, 1, 1); + this.tableLayoutPanel6.Controls.Add(this.tableLayoutPanel8, 1, 2); + this.tableLayoutPanel6.Controls.Add(this.pictureBox1, 1, 3); + this.tableLayoutPanel6.Controls.Add(this.label21, 2, 3); + this.tableLayoutPanel6.Controls.Add(this.LblWarnOrturAC, 2, 4); + this.tableLayoutPanel6.Name = "tableLayoutPanel6"; + // + // label20 + // + resources.ApplyResources(this.label20, "label20"); + this.label20.Name = "label20"; + // + // label12 + // + resources.ApplyResources(this.label12, "label12"); + this.label12.Name = "label12"; + // + // label13 + // + resources.ApplyResources(this.label13, "label13"); + this.label13.Name = "label13"; + // + // CbAutoCooling + // + resources.ApplyResources(this.CbAutoCooling, "CbAutoCooling"); + this.CbAutoCooling.Name = "CbAutoCooling"; + this.CbAutoCooling.UseVisualStyleBackColor = true; + // + // tableLayoutPanel7 + // + resources.ApplyResources(this.tableLayoutPanel7, "tableLayoutPanel7"); + this.tableLayoutPanel7.Controls.Add(this.label15, 2, 0); + this.tableLayoutPanel7.Controls.Add(this.CbOnMin, 1, 0); + this.tableLayoutPanel7.Controls.Add(this.CbOnSec, 3, 0); + this.tableLayoutPanel7.Controls.Add(this.label14, 0, 0); + this.tableLayoutPanel7.Controls.Add(this.label16, 4, 0); + this.tableLayoutPanel7.Name = "tableLayoutPanel7"; + // + // label15 + // + resources.ApplyResources(this.label15, "label15"); + this.label15.Name = "label15"; + // + // CbOnMin + // + resources.ApplyResources(this.CbOnMin, "CbOnMin"); + this.CbOnMin.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbOnMin.FormattingEnabled = true; + this.CbOnMin.Name = "CbOnMin"; + // + // CbOnSec + // + resources.ApplyResources(this.CbOnSec, "CbOnSec"); + this.CbOnSec.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbOnSec.FormattingEnabled = true; + this.CbOnSec.Name = "CbOnSec"; + // + // label14 + // + resources.ApplyResources(this.label14, "label14"); + this.label14.Name = "label14"; + // + // label16 + // + resources.ApplyResources(this.label16, "label16"); + this.label16.Name = "label16"; + // + // tableLayoutPanel8 + // + resources.ApplyResources(this.tableLayoutPanel8, "tableLayoutPanel8"); + this.tableLayoutPanel8.Controls.Add(this.label17, 2, 0); + this.tableLayoutPanel8.Controls.Add(this.CbOffMin, 1, 0); + this.tableLayoutPanel8.Controls.Add(this.CbOffSec, 3, 0); + this.tableLayoutPanel8.Controls.Add(this.label18, 0, 0); + this.tableLayoutPanel8.Controls.Add(this.label19, 4, 0); + this.tableLayoutPanel8.Name = "tableLayoutPanel8"; + // + // label17 + // + resources.ApplyResources(this.label17, "label17"); + this.label17.Name = "label17"; + // + // CbOffMin + // + resources.ApplyResources(this.CbOffMin, "CbOffMin"); + this.CbOffMin.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbOffMin.FormattingEnabled = true; + this.CbOffMin.Name = "CbOffMin"; + // + // CbOffSec + // + resources.ApplyResources(this.CbOffSec, "CbOffSec"); + this.CbOffSec.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CbOffSec.FormattingEnabled = true; + this.CbOffSec.Name = "CbOffSec"; + // + // label18 + // + resources.ApplyResources(this.label18, "label18"); + this.label18.Name = "label18"; + // + // label19 + // + resources.ApplyResources(this.label19, "label19"); + this.label19.Name = "label19"; + // + // pictureBox1 + // + resources.ApplyResources(this.pictureBox1, "pictureBox1"); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.TabStop = false; + // + // label21 + // + resources.ApplyResources(this.label21, "label21"); + this.label21.ForeColor = System.Drawing.Color.Red; + this.label21.Name = "label21"; + // + // LblWarnOrturAC + // + resources.ApplyResources(this.LblWarnOrturAC, "LblWarnOrturAC"); + this.LblWarnOrturAC.ForeColor = System.Drawing.Color.Red; + this.LblWarnOrturAC.Name = "LblWarnOrturAC"; + // + // TpGCodeSettings + // + this.TpGCodeSettings.Controls.Add(this.tableLayoutPanel9); + resources.ApplyResources(this.TpGCodeSettings, "TpGCodeSettings"); + this.TpGCodeSettings.Name = "TpGCodeSettings"; + this.TpGCodeSettings.UseVisualStyleBackColor = true; + // + // tableLayoutPanel9 + // + resources.ApplyResources(this.tableLayoutPanel9, "tableLayoutPanel9"); + this.tableLayoutPanel9.Controls.Add(this.LblHeader, 2, 0); + this.tableLayoutPanel9.Controls.Add(this.groupBox1, 1, 0); + this.tableLayoutPanel9.Controls.Add(this.groupBox2, 1, 2); + this.tableLayoutPanel9.Controls.Add(this.groupBox3, 1, 1); + this.tableLayoutPanel9.Controls.Add(this.LblFooter, 2, 2); + this.tableLayoutPanel9.Controls.Add(this.LblPasses, 2, 1); + this.tableLayoutPanel9.Name = "tableLayoutPanel9"; + // + // LblHeader + // + resources.ApplyResources(this.LblHeader, "LblHeader"); + this.LblHeader.Name = "LblHeader"; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.TBHeader); + resources.ApplyResources(this.groupBox1, "groupBox1"); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.TabStop = false; + // + // TBHeader + // + resources.ApplyResources(this.TBHeader, "TBHeader"); + this.TBHeader.Name = "TBHeader"; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.TBFooter); + resources.ApplyResources(this.groupBox2, "groupBox2"); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.TabStop = false; + // + // TBFooter + // + resources.ApplyResources(this.TBFooter, "TBFooter"); + this.TBFooter.Name = "TBFooter"; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.TBPasses); + resources.ApplyResources(this.groupBox3, "groupBox3"); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.TabStop = false; + // + // TBPasses + // + resources.ApplyResources(this.TBPasses, "TBPasses"); + this.TBPasses.Name = "TBPasses"; + // + // LblFooter + // + resources.ApplyResources(this.LblFooter, "LblFooter"); + this.LblFooter.Name = "LblFooter"; + // + // LblPasses + // + resources.ApplyResources(this.LblPasses, "LblPasses"); + this.LblPasses.Name = "LblPasses"; + // + // TpSoundSettings + // + this.TpSoundSettings.Controls.Add(this.tableLayoutPanel16); + this.TpSoundSettings.Controls.Add(this.tableLayoutPanel10); + resources.ApplyResources(this.TpSoundSettings, "TpSoundSettings"); + this.TpSoundSettings.Name = "TpSoundSettings"; + this.TpSoundSettings.UseVisualStyleBackColor = true; + // + // tableLayoutPanel16 + // + resources.ApplyResources(this.tableLayoutPanel16, "tableLayoutPanel16"); + this.tableLayoutPanel16.Controls.Add(this.CbPlaySuccess, 0, 0); + this.tableLayoutPanel16.Controls.Add(this.CbPlayWarning, 0, 1); + this.tableLayoutPanel16.Controls.Add(this.CbPlayFatal, 0, 2); + this.tableLayoutPanel16.Controls.Add(this.CbPlayConnect, 0, 3); + this.tableLayoutPanel16.Controls.Add(this.CbPlayDisconnect, 0, 4); + this.tableLayoutPanel16.ForeColor = System.Drawing.Color.Transparent; + this.tableLayoutPanel16.Name = "tableLayoutPanel16"; + // + // CbPlaySuccess + // + resources.ApplyResources(this.CbPlaySuccess, "CbPlaySuccess"); + this.CbPlaySuccess.Name = "CbPlaySuccess"; + this.CbPlaySuccess.UseVisualStyleBackColor = true; + // + // CbPlayWarning + // + resources.ApplyResources(this.CbPlayWarning, "CbPlayWarning"); + this.CbPlayWarning.Name = "CbPlayWarning"; + this.CbPlayWarning.UseVisualStyleBackColor = true; + // + // CbPlayFatal + // + resources.ApplyResources(this.CbPlayFatal, "CbPlayFatal"); + this.CbPlayFatal.Name = "CbPlayFatal"; + this.CbPlayFatal.UseVisualStyleBackColor = true; + // + // CbPlayConnect + // + resources.ApplyResources(this.CbPlayConnect, "CbPlayConnect"); + this.CbPlayConnect.Name = "CbPlayConnect"; + this.CbPlayConnect.UseVisualStyleBackColor = true; + // + // CbPlayDisconnect + // + resources.ApplyResources(this.CbPlayDisconnect, "CbPlayDisconnect"); + this.CbPlayDisconnect.Name = "CbPlayDisconnect"; + this.CbPlayDisconnect.UseVisualStyleBackColor = true; + // + // tableLayoutPanel10 + // + resources.ApplyResources(this.tableLayoutPanel10, "tableLayoutPanel10"); + this.tableLayoutPanel10.Controls.Add(this.CbTelegramNotification, 0, 6); + this.tableLayoutPanel10.Controls.Add(this.DisconnectFullLabel, 0, 4); + this.tableLayoutPanel10.Controls.Add(this.ConnectFullLabel, 0, 3); + this.tableLayoutPanel10.Controls.Add(this.ErrorFullLabel, 0, 2); + this.tableLayoutPanel10.Controls.Add(this.WarningFullLabel, 0, 1); + this.tableLayoutPanel10.Controls.Add(this.SuccesFullLabel, 0, 0); + this.tableLayoutPanel10.Controls.Add(this.label23, 2, 0); + this.tableLayoutPanel10.Controls.Add(this.label24, 2, 1); + this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel11, 1, 1); + this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel12, 1, 2); + this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel14, 1, 3); + this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel15, 1, 4); + this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel13, 1, 0); + this.tableLayoutPanel10.Controls.Add(this.label32, 2, 3); + this.tableLayoutPanel10.Controls.Add(this.label36, 2, 4); + this.tableLayoutPanel10.Controls.Add(this.label28, 2, 2); + this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel17, 1, 6); + this.tableLayoutPanel10.Controls.Add(this.label42, 2, 6); + this.tableLayoutPanel10.Name = "tableLayoutPanel10"; + // + // CbTelegramNotification + // + resources.ApplyResources(this.CbTelegramNotification, "CbTelegramNotification"); + this.CbTelegramNotification.Name = "CbTelegramNotification"; + this.CbTelegramNotification.UseVisualStyleBackColor = true; + this.CbTelegramNotification.CheckedChanged += new System.EventHandler(this.CbTelegramNotification_CheckedChanged); + // + // DisconnectFullLabel + // + resources.ApplyResources(this.DisconnectFullLabel, "DisconnectFullLabel"); + this.DisconnectFullLabel.Name = "DisconnectFullLabel"; + // + // ConnectFullLabel + // + resources.ApplyResources(this.ConnectFullLabel, "ConnectFullLabel"); + this.ConnectFullLabel.Name = "ConnectFullLabel"; + // + // ErrorFullLabel + // + resources.ApplyResources(this.ErrorFullLabel, "ErrorFullLabel"); + this.ErrorFullLabel.Name = "ErrorFullLabel"; + // + // WarningFullLabel + // + resources.ApplyResources(this.WarningFullLabel, "WarningFullLabel"); + this.WarningFullLabel.Name = "WarningFullLabel"; + // + // SuccesFullLabel + // + resources.ApplyResources(this.SuccesFullLabel, "SuccesFullLabel"); + this.SuccesFullLabel.Name = "SuccesFullLabel"; + // + // label23 + // + resources.ApplyResources(this.label23, "label23"); + this.label23.Name = "label23"; + // + // label24 + // + resources.ApplyResources(this.label24, "label24"); + this.label24.Name = "label24"; + // + // tableLayoutPanel11 + // + resources.ApplyResources(this.tableLayoutPanel11, "tableLayoutPanel11"); + this.tableLayoutPanel11.Controls.Add(this.label26, 0, 0); + this.tableLayoutPanel11.Controls.Add(this.changeWarBtn, 0, 1); + this.tableLayoutPanel11.Controls.Add(this.label27, 1, 0); + this.tableLayoutPanel11.Controls.Add(this.warningSoundLabel, 1, 1); + this.tableLayoutPanel11.Name = "tableLayoutPanel11"; + // + // label26 + // + resources.ApplyResources(this.label26, "label26"); + this.label26.Name = "label26"; + // + // changeWarBtn + // + resources.ApplyResources(this.changeWarBtn, "changeWarBtn"); + this.changeWarBtn.Name = "changeWarBtn"; + this.changeWarBtn.UseVisualStyleBackColor = true; + this.changeWarBtn.Click += new System.EventHandler(this.changeWarBtn_Click); + // + // label27 + // + resources.ApplyResources(this.label27, "label27"); + this.label27.Name = "label27"; + // + // warningSoundLabel + // + resources.ApplyResources(this.warningSoundLabel, "warningSoundLabel"); + this.warningSoundLabel.Name = "warningSoundLabel"; + // + // tableLayoutPanel12 + // + resources.ApplyResources(this.tableLayoutPanel12, "tableLayoutPanel12"); + this.tableLayoutPanel12.Controls.Add(this.label29, 0, 0); + this.tableLayoutPanel12.Controls.Add(this.changeFatBtn, 0, 1); + this.tableLayoutPanel12.Controls.Add(this.label30, 1, 0); + this.tableLayoutPanel12.Controls.Add(this.fatalSoundLabel, 1, 1); + this.tableLayoutPanel12.Name = "tableLayoutPanel12"; + // + // label29 + // + resources.ApplyResources(this.label29, "label29"); + this.label29.Name = "label29"; + // + // changeFatBtn + // + resources.ApplyResources(this.changeFatBtn, "changeFatBtn"); + this.changeFatBtn.Name = "changeFatBtn"; + this.changeFatBtn.UseVisualStyleBackColor = true; + this.changeFatBtn.Click += new System.EventHandler(this.changeFatBtn_Click); + // + // label30 + // + resources.ApplyResources(this.label30, "label30"); + this.label30.Name = "label30"; + // + // fatalSoundLabel + // + resources.ApplyResources(this.fatalSoundLabel, "fatalSoundLabel"); + this.fatalSoundLabel.Name = "fatalSoundLabel"; + // + // tableLayoutPanel14 + // + resources.ApplyResources(this.tableLayoutPanel14, "tableLayoutPanel14"); + this.tableLayoutPanel14.Controls.Add(this.label34, 0, 0); + this.tableLayoutPanel14.Controls.Add(this.changeConBtn, 0, 1); + this.tableLayoutPanel14.Controls.Add(this.label35, 1, 0); + this.tableLayoutPanel14.Controls.Add(this.connectSoundLabel, 1, 1); + this.tableLayoutPanel14.Name = "tableLayoutPanel14"; + // + // label34 + // + resources.ApplyResources(this.label34, "label34"); + this.label34.Name = "label34"; + // + // changeConBtn + // + resources.ApplyResources(this.changeConBtn, "changeConBtn"); + this.changeConBtn.Name = "changeConBtn"; + this.changeConBtn.UseVisualStyleBackColor = true; + this.changeConBtn.Click += new System.EventHandler(this.changeConBtn_Click); + // + // label35 + // + resources.ApplyResources(this.label35, "label35"); + this.label35.Name = "label35"; + // + // connectSoundLabel + // + resources.ApplyResources(this.connectSoundLabel, "connectSoundLabel"); + this.connectSoundLabel.Name = "connectSoundLabel"; + // + // tableLayoutPanel15 + // + resources.ApplyResources(this.tableLayoutPanel15, "tableLayoutPanel15"); + this.tableLayoutPanel15.Controls.Add(this.label37, 0, 0); + this.tableLayoutPanel15.Controls.Add(this.changeDconBtn, 0, 1); + this.tableLayoutPanel15.Controls.Add(this.label38, 1, 0); + this.tableLayoutPanel15.Controls.Add(this.disconnectSoundLabel, 1, 1); + this.tableLayoutPanel15.Name = "tableLayoutPanel15"; + // + // label37 + // + resources.ApplyResources(this.label37, "label37"); + this.label37.Name = "label37"; + // + // changeDconBtn + // + resources.ApplyResources(this.changeDconBtn, "changeDconBtn"); + this.changeDconBtn.Name = "changeDconBtn"; + this.changeDconBtn.UseVisualStyleBackColor = true; + this.changeDconBtn.Click += new System.EventHandler(this.changeDconBtn_Click); + // + // label38 + // + resources.ApplyResources(this.label38, "label38"); + this.label38.Name = "label38"; + // + // disconnectSoundLabel + // + resources.ApplyResources(this.disconnectSoundLabel, "disconnectSoundLabel"); + this.disconnectSoundLabel.Name = "disconnectSoundLabel"; + // + // tableLayoutPanel13 + // + resources.ApplyResources(this.tableLayoutPanel13, "tableLayoutPanel13"); + this.tableLayoutPanel13.Controls.Add(this.LblSuccessSound, 0, 0); + this.tableLayoutPanel13.Controls.Add(this.changeSucBtn, 0, 1); + this.tableLayoutPanel13.Controls.Add(this.label25, 1, 0); + this.tableLayoutPanel13.Controls.Add(this.successSoundLabel, 1, 1); + this.tableLayoutPanel13.Name = "tableLayoutPanel13"; + // + // LblSuccessSound + // + resources.ApplyResources(this.LblSuccessSound, "LblSuccessSound"); + this.LblSuccessSound.Name = "LblSuccessSound"; + // + // changeSucBtn + // + resources.ApplyResources(this.changeSucBtn, "changeSucBtn"); + this.changeSucBtn.Name = "changeSucBtn"; + this.changeSucBtn.UseVisualStyleBackColor = true; + this.changeSucBtn.Click += new System.EventHandler(this.changeSucBtn_Click); + // + // label25 + // + resources.ApplyResources(this.label25, "label25"); + this.label25.Name = "label25"; + // + // successSoundLabel + // + resources.ApplyResources(this.successSoundLabel, "successSoundLabel"); + this.successSoundLabel.Name = "successSoundLabel"; + // + // label32 + // + resources.ApplyResources(this.label32, "label32"); + this.label32.Name = "label32"; + // + // label36 + // + resources.ApplyResources(this.label36, "label36"); + this.label36.Name = "label36"; + // + // label28 + // + resources.ApplyResources(this.label28, "label28"); + this.label28.Name = "label28"; + // + // tableLayoutPanel17 + // + resources.ApplyResources(this.tableLayoutPanel17, "tableLayoutPanel17"); + this.tableLayoutPanel17.Controls.Add(this.BtnTelegNoteInfo, 2, 0); + this.tableLayoutPanel17.Controls.Add(this.label31, 0, 0); + this.tableLayoutPanel17.Controls.Add(this.label33, 0, 1); + this.tableLayoutPanel17.Controls.Add(this.TxtNotification, 1, 1); + this.tableLayoutPanel17.Controls.Add(this.BtnTestNotification, 2, 1); + this.tableLayoutPanel17.Name = "tableLayoutPanel17"; + // + // BtnTelegNoteInfo + // + this.BtnTelegNoteInfo.AltImage = null; + this.BtnTelegNoteInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnTelegNoteInfo.Caption = null; + this.BtnTelegNoteInfo.Coloration = System.Drawing.Color.Empty; + this.BtnTelegNoteInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnTelegNoteInfo.Image"))); + resources.ApplyResources(this.BtnTelegNoteInfo, "BtnTelegNoteInfo"); + this.BtnTelegNoteInfo.Name = "BtnTelegNoteInfo"; + this.BtnTelegNoteInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnTelegNoteInfo.UseAltImage = false; + this.BtnTelegNoteInfo.Click += new System.EventHandler(this.BtnTelegNoteInfo_Click); + // + // label31 + // + resources.ApplyResources(this.label31, "label31"); + this.tableLayoutPanel17.SetColumnSpan(this.label31, 2); + this.label31.Name = "label31"; + // + // label33 + // + resources.ApplyResources(this.label33, "label33"); + this.label33.Name = "label33"; + // + // TxtNotification + // + resources.ApplyResources(this.TxtNotification, "TxtNotification"); + this.TxtNotification.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.TxtNotification.Name = "TxtNotification"; + this.TxtNotification.TextChanged += new System.EventHandler(this.TbNotification_TextChanged); + // + // BtnTestNotification + // + resources.ApplyResources(this.BtnTestNotification, "BtnTestNotification"); + this.BtnTestNotification.Name = "BtnTestNotification"; + this.BtnTestNotification.UseVisualStyleBackColor = true; + this.BtnTestNotification.Click += new System.EventHandler(this.BtnTestNotification_Click); + // + // label42 + // + resources.ApplyResources(this.label42, "label42"); + this.label42.Name = "label42"; + // + // TpPwmSettings + // + this.TpPwmSettings.Controls.Add(this.tableLayoutPanel19); + resources.ApplyResources(this.TpPwmSettings, "TpPwmSettings"); + this.TpPwmSettings.Name = "TpPwmSettings"; + this.TpPwmSettings.UseVisualStyleBackColor = true; + // + // tableLayoutPanel19 + // + resources.ApplyResources(this.tableLayoutPanel19, "tableLayoutPanel19"); + this.tableLayoutPanel19.Controls.Add(this.CBPwmSel, 1, 0); + this.tableLayoutPanel19.Controls.Add(this.label44, 2, 0); + this.tableLayoutPanel19.Controls.Add(this.CBFanIdx, 1, 1); + this.tableLayoutPanel19.Controls.Add(this.label45, 2, 1); + this.tableLayoutPanel19.Controls.Add(this.TBDwell, 1, 2); + this.tableLayoutPanel19.Controls.Add(this.label46, 2, 2); + this.tableLayoutPanel19.Name = "tableLayoutPanel19"; + // + // CBPwmSel + // + resources.ApplyResources(this.CBPwmSel, "CBPwmSel"); + this.CBPwmSel.FormattingEnabled = true; + this.CBPwmSel.Name = "CBPwmSel"; + // + // label44 + // + resources.ApplyResources(this.label44, "label44"); + this.label44.Name = "label44"; + // + // CBFanIdx + // + resources.ApplyResources(this.CBFanIdx, "CBFanIdx"); + this.CBFanIdx.FormattingEnabled = true; + this.CBFanIdx.Name = "CBFanIdx"; + // + // label45 + // + resources.ApplyResources(this.label45, "label45"); + this.label45.Name = "label45"; + // + // TBDwell + // + resources.ApplyResources(this.TBDwell, "TBDwell"); + this.TBDwell.Name = "TBDwell"; + // + // label46 + // + resources.ApplyResources(this.label46, "label46"); + this.label46.Name = "label46"; + // + // SoundBrowserDialog + // + resources.ApplyResources(this.SoundBrowserDialog, "SoundBrowserDialog"); + // + // SettingsForm + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.BtnCancel; + this.Controls.Add(this.tableLayoutPanel1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "SettingsForm"; + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); + this.tableLayoutPanel2.ResumeLayout(false); + this.MainTabPage.ResumeLayout(false); + this.TpHardware.ResumeLayout(false); + this.TpHardware.PerformLayout(); + this.tableLayoutPanel3.ResumeLayout(false); + this.tableLayoutPanel3.PerformLayout(); + this.TpRasterImport.ResumeLayout(false); + this.TpRasterImport.PerformLayout(); + this.tableLayoutPanel4.ResumeLayout(false); + this.tableLayoutPanel4.PerformLayout(); + this.TpVectorImport.ResumeLayout(false); + this.TpVectorImport.PerformLayout(); + this.tableLayoutPanel18.ResumeLayout(false); + this.tableLayoutPanel18.PerformLayout(); + this.TpJogControl.ResumeLayout(false); + this.TpJogControl.PerformLayout(); + this.tableLayoutPanel5.ResumeLayout(false); + this.tableLayoutPanel5.PerformLayout(); + this.TpAutoCooling.ResumeLayout(false); + this.TpAutoCooling.PerformLayout(); + this.tableLayoutPanel6.ResumeLayout(false); + this.tableLayoutPanel6.PerformLayout(); + this.tableLayoutPanel7.ResumeLayout(false); + this.tableLayoutPanel7.PerformLayout(); + this.tableLayoutPanel8.ResumeLayout(false); + this.tableLayoutPanel8.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.TpGCodeSettings.ResumeLayout(false); + this.TpGCodeSettings.PerformLayout(); + this.tableLayoutPanel9.ResumeLayout(false); + this.tableLayoutPanel9.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + this.TpSoundSettings.ResumeLayout(false); + this.TpSoundSettings.PerformLayout(); + this.tableLayoutPanel16.ResumeLayout(false); + this.tableLayoutPanel16.PerformLayout(); + this.tableLayoutPanel10.ResumeLayout(false); + this.tableLayoutPanel10.PerformLayout(); + this.tableLayoutPanel11.ResumeLayout(false); + this.tableLayoutPanel11.PerformLayout(); + this.tableLayoutPanel12.ResumeLayout(false); + this.tableLayoutPanel12.PerformLayout(); + this.tableLayoutPanel14.ResumeLayout(false); + this.tableLayoutPanel14.PerformLayout(); + this.tableLayoutPanel15.ResumeLayout(false); + this.tableLayoutPanel15.PerformLayout(); + this.tableLayoutPanel13.ResumeLayout(false); + this.tableLayoutPanel13.PerformLayout(); + this.tableLayoutPanel17.ResumeLayout(false); + this.tableLayoutPanel17.PerformLayout(); + this.TpPwmSettings.ResumeLayout(false); + this.tableLayoutPanel19.ResumeLayout(false); + this.tableLayoutPanel19.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -1336,5 +1400,13 @@ private void InitializeComponent() private System.Windows.Forms.Label label43; private System.Windows.Forms.CheckBox CbSmartBezier; private UserControls.ImageButton imageButton1; - } + private System.Windows.Forms.TabPage TpPwmSettings; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel19; + private System.Windows.Forms.ComboBox CBPwmSel; + private System.Windows.Forms.Label label44; + private System.Windows.Forms.ComboBox CBFanIdx; + private System.Windows.Forms.Label label45; + private System.Windows.Forms.TextBox TBDwell; + private System.Windows.Forms.Label label46; + } } \ No newline at end of file diff --git a/LaserGRBL/SettingsForm.cs b/LaserGRBL/SettingsForm.cs index d803a41a1..1ba34f2dc 100644 --- a/LaserGRBL/SettingsForm.cs +++ b/LaserGRBL/SettingsForm.cs @@ -36,7 +36,14 @@ public SettingsForm(GrblCore core) InitStreamingCB(); InitThreadingCB(); - CBCore.SelectedItem = Settings.GetObject("Firmware Type", Firmware.Grbl); + Firmware fw = Settings.GetObject("Firmware Type", Firmware.Grbl); + CBCore.SelectedItem = fw; + + if (fw != Firmware.Marlin) + { + MainTabPage.TabPages.Remove(TpPwmSettings); + } + CBSupportPWM.Checked = Settings.GetObject("Support Hardware PWM", true); CBProtocol.SelectedItem = Settings.GetObject("ComWrapper Protocol", ComWrapper.WrapperType.UsbSerial); CBStreamingMode.SelectedItem = Settings.GetObject("Streaming Mode", GrblCore.StreamingMode.Buffered); @@ -94,7 +101,13 @@ public SettingsForm(GrblCore core) LblWarnOrturAC.Visible = false; InitAutoCoolingTab(); - } + + InitPwmTab(); + + CBPwmSel.SelectedItem = Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle); + CBFanIdx.SelectedItem = Settings.GetObject("Pwm FanId", 0); + TBDwell.Text = Settings.GetObject("Pwm FanDwell", "0"); + } private void InitAutoCoolingTab() { @@ -133,6 +146,18 @@ private void InitCoreCB() CBCore.EndUpdate(); } + private void InitPwmTab() + { + CBPwmSel.BeginUpdate(); + CBPwmSel.Items.Add(GrblCore.PwmMode.Spindle); + CBPwmSel.Items.Add(GrblCore.PwmMode.Fan); + CBPwmSel.EndUpdate(); + CBFanIdx.Items.Clear(); + for (int i = 0; i <= 5; i++) + CBFanIdx.Items.Add(i); + + } + private void InitThreadingCB() { CbThreadingMode.BeginUpdate(); @@ -213,6 +238,9 @@ private void BtnSave_Click(object sender, EventArgs e) Settings.SetObject("Raster Hi-Res", CbHiRes.Checked); Settings.SetObject($"Vector.UseSmartBezier", CbSmartBezier.Checked); + Settings.SetObject("Pwm Selection", CBPwmSel.SelectedItem); + Settings.SetObject("Pwm FanId", CBFanIdx.SelectedItem); + Settings.SetObject("Pwm FanDwell", TBDwell.Text); SettingsChanged?.Invoke(this, null); @@ -316,5 +344,5 @@ private void CbTelegramNotification_CheckedChanged(object sender, EventArgs e) { EnableTest(); } - } + } } diff --git a/LaserGRBL/SettingsForm.resx b/LaserGRBL/SettingsForm.resx index f16ca4a99..cce14b1fa 100644 --- a/LaserGRBL/SettingsForm.resx +++ b/LaserGRBL/SettingsForm.resx @@ -382,7 +382,7 @@ BtnStreamingMode - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -485,7 +485,7 @@ BtnProtocol - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -559,7 +559,7 @@ Set slower values if you are experiencing issues. BtnThreadingModel - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -828,7 +828,7 @@ If disabled all the issues are silently managed without warning. BtnFType - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -1067,7 +1067,7 @@ If not, please disable PWM support. BtnModulationInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel4 @@ -1444,7 +1444,7 @@ Disable this option if you prefer to use the old algorithm. imageButton1 - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel18 @@ -4342,7 +4342,7 @@ Check to enable. BtnTelegNoteInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.6.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel17 @@ -4600,6 +4600,235 @@ Obtain your personal code and write it here! 6 + + Single + + + 3 + + + Fill + + + 28, 4 + + + 142, 21 + + + 0 + + + CBPwmSel + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel19 + + + 0 + + + True + + + Fill + + + 177, 1 + + + 705, 39 + + + 1 + + + Select PWM command: +- Spindle: Use spindle M3/M5/M5 commads to drive the PWM. +- Fan: Use the M106/M107 commands to drive the PWM. + + + label44 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel19 + + + 1 + + + Top + + + 28, 44 + + + 142, 21 + + + 2 + + + CBFanIdx + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel19 + + + 2 + + + True + + + Fill + + + 177, 41 + + + 705, 27 + + + 3 + + + Fan Index: +Select the fan which drives the PWM for the laser + + + label45 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel19 + + + 3 + + + Top + + + 28, 72 + + + 142, 20 + + + 4 + + + TBDwell + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel19 + + + 4 + + + True + + + Fill + + + 177, 69 + + + 705, 270 + + + 5 + + + Laser start time [ms]: +sets the laser start time + + + label46 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel19 + + + 5 + + + Fill + + + 3, 3 + + + 3 + + + 886, 340 + + + 0 + + + tableLayoutPanel19 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TpPwmSettings + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="CBPwmSel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label44" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="CBFanIdx" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label45" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="TBDwell" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label46" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Absolute,23,Absolute,148,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> + + + 4, 22 + + + 3, 3, 3, 3 + + + 892, 346 + + + 7 + + + PWM Settings + + + TpPwmSettings + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MainTabPage + + + 7 + Fill diff --git a/LaserGRBL/StateBuilder.cs b/LaserGRBL/StateBuilder.cs index 3a1eb4c69..d2bdc5239 100644 --- a/LaserGRBL/StateBuilder.cs +++ b/LaserGRBL/StateBuilder.cs @@ -24,6 +24,7 @@ public partial class GrblCommand public class StatePositionBuilder : StateBuilder { bool supportPWM = Settings.GetObject("Support Hardware PWM", true); + Firmware mFwType = Settings.GetObject("Firmware Type", Firmware.Grbl); public class CumulativeElement : Element { @@ -184,7 +185,12 @@ private TimeSpan ComputeExecutionTime(GrblCommand cmd, GrblConf conf) else if (G1G2G3 && cmd.IsMovement && f != 0) return TimeSpan.FromMinutes((double)GetSegmentLenght(cmd) / (double)Math.Min(f, conf.MaxRateX)); else if (cmd.IsPause) - return cmd.P != null ? TimeSpan.FromSeconds((double)cmd.P.Number) : cmd.S != null ? TimeSpan.FromSeconds((double)cmd.S.Number) : TimeSpan.Zero; + if(mFwType == Firmware.Marlin) + { + return cmd.P != null ? TimeSpan.FromMilliseconds((double)cmd.P.Number) : cmd.S != null ? TimeSpan.FromSeconds((double)cmd.S.Number) : TimeSpan.Zero; + } + else + return cmd.P != null ? TimeSpan.FromSeconds((double)cmd.P.Number) : cmd.S != null ? TimeSpan.FromSeconds((double)cmd.S.Number) : TimeSpan.Zero; else return TimeSpan.Zero; } @@ -230,10 +236,10 @@ public bool ABS { get { return DistanceMode.Number == 90; } } public bool M3M4 - { get { return SpindleState.Number == 3 || SpindleState.Number == 4; } } + { get { return SpindleState.Number == 3 || SpindleState.Number == 4 || SpindleState.Number == 106; } } public bool LaserBurning - { get { return (!supportPWM || S.Number > 0) && (SpindleState.Number == 3 || (SpindleState.Number == 4 && MotionMode.Number != 0)); } } + { get { return (!supportPWM || S.Number > 0) && (SpindleState.Number == 3 || SpindleState.Number == 106 || (SpindleState.Number == 4 && MotionMode.Number != 0)); } } internal void Homing() { @@ -312,7 +318,7 @@ public void Update(Element e) protected ModalElement ToolLengthOffset = new ModalElement("G49", "G43.1"); protected ModalElement ProgramMode = new ModalElement("M0", "M1", "M2", "M30"); protected ModalElement CoolantState = new ModalElement("M9", "M7", "M8"); - protected ModalElement SpindleState = new ModalElement("M5", "M3", "M4"); + protected ModalElement SpindleState = new ModalElement("M5", "M3", "M4", "M106", "M107"); //private void UpdateModals(GrblCommand cmd) //update modals - BUILD IF NEEDED //{ diff --git a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs index 240e033e3..7a09cbcc0 100644 --- a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs +++ b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs @@ -51,254 +51,254 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SvgToGCodeForm)); - this.tableLayoutPanel9 = new System.Windows.Forms.TableLayoutPanel(); - this.GbSpeed = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); - this.LblBorderTracing = new System.Windows.Forms.Label(); - this.LblBorderTracingmm = new System.Windows.Forms.Label(); - this.IIBorderTracing = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.BtnPSHelper = new LaserGRBL.UserControls.ImageButton(); - this.GbLaser = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); - this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); - this.LblSmin = new System.Windows.Forms.Label(); - this.IIMinPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.label18 = new System.Windows.Forms.Label(); - this.BtnOnOffInfo = new LaserGRBL.UserControls.ImageButton(); - this.CBLaserON = new System.Windows.Forms.ComboBox(); - this.LblSmax = new System.Windows.Forms.Label(); - this.IIMaxPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.LblMinPerc = new System.Windows.Forms.Label(); - this.LblMaxPerc = new System.Windows.Forms.Label(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.BtnCancel = new System.Windows.Forms.Button(); - this.BtnCreate = new System.Windows.Forms.Button(); - this.TT = new System.Windows.Forms.ToolTip(this.components); - this.tableLayoutPanel9.SuspendLayout(); - this.GbSpeed.SuspendLayout(); - this.tableLayoutPanel6.SuspendLayout(); - this.GbLaser.SuspendLayout(); - this.tableLayoutPanel7.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); - this.SuspendLayout(); - // - // tableLayoutPanel9 - // - resources.ApplyResources(this.tableLayoutPanel9, "tableLayoutPanel9"); - this.tableLayoutPanel9.Controls.Add(this.GbSpeed, 0, 0); - this.tableLayoutPanel9.Controls.Add(this.GbLaser, 0, 1); - this.tableLayoutPanel9.Controls.Add(this.tableLayoutPanel1, 0, 3); - this.tableLayoutPanel9.Name = "tableLayoutPanel9"; - // - // GbSpeed - // - resources.ApplyResources(this.GbSpeed, "GbSpeed"); - this.GbSpeed.Controls.Add(this.tableLayoutPanel6); - this.GbSpeed.Name = "GbSpeed"; - this.GbSpeed.TabStop = false; - // - // tableLayoutPanel6 - // - resources.ApplyResources(this.tableLayoutPanel6, "tableLayoutPanel6"); - this.tableLayoutPanel6.Controls.Add(this.LblBorderTracing, 0, 0); - this.tableLayoutPanel6.Controls.Add(this.LblBorderTracingmm, 2, 0); - this.tableLayoutPanel6.Controls.Add(this.IIBorderTracing, 1, 0); - this.tableLayoutPanel6.Controls.Add(this.BtnPSHelper, 3, 0); - this.tableLayoutPanel6.Name = "tableLayoutPanel6"; - // - // LblBorderTracing - // - resources.ApplyResources(this.LblBorderTracing, "LblBorderTracing"); - this.LblBorderTracing.Name = "LblBorderTracing"; - // - // LblBorderTracingmm - // - resources.ApplyResources(this.LblBorderTracingmm, "LblBorderTracingmm"); - this.LblBorderTracingmm.Name = "LblBorderTracingmm"; - // - // IIBorderTracing - // - resources.ApplyResources(this.IIBorderTracing, "IIBorderTracing"); - this.IIBorderTracing.CurrentValue = 1000; - this.IIBorderTracing.ForcedText = null; - this.IIBorderTracing.ForceMinMax = false; - this.IIBorderTracing.MaxValue = 4000; - this.IIBorderTracing.MinValue = 1; - this.IIBorderTracing.Name = "IIBorderTracing"; - this.IIBorderTracing.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IIBorderTracing.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIBorderTracingCurrentValueChanged); - // - // BtnPSHelper - // - this.BtnPSHelper.AltImage = null; - resources.ApplyResources(this.BtnPSHelper, "BtnPSHelper"); - this.BtnPSHelper.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnPSHelper.Caption = null; - this.BtnPSHelper.Coloration = System.Drawing.Color.Empty; - this.BtnPSHelper.Image = ((System.Drawing.Image)(resources.GetObject("BtnPSHelper.Image"))); - this.BtnPSHelper.Name = "BtnPSHelper"; - this.BtnPSHelper.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnPSHelper, resources.GetString("BtnPSHelper.ToolTip")); - this.BtnPSHelper.UseAltImage = false; - this.BtnPSHelper.Click += new System.EventHandler(this.BtnPSHelper_Click); - // - // GbLaser - // - resources.ApplyResources(this.GbLaser, "GbLaser"); - this.GbLaser.Controls.Add(this.tableLayoutPanel7); - this.GbLaser.Name = "GbLaser"; - this.GbLaser.TabStop = false; - // - // tableLayoutPanel7 - // - resources.ApplyResources(this.tableLayoutPanel7, "tableLayoutPanel7"); - this.tableLayoutPanel7.Controls.Add(this.BtnModulationInfo, 3, 1); - this.tableLayoutPanel7.Controls.Add(this.LblSmin, 0, 1); - this.tableLayoutPanel7.Controls.Add(this.IIMinPower, 1, 1); - this.tableLayoutPanel7.Controls.Add(this.label18, 0, 0); - this.tableLayoutPanel7.Controls.Add(this.BtnOnOffInfo, 3, 0); - this.tableLayoutPanel7.Controls.Add(this.CBLaserON, 1, 0); - this.tableLayoutPanel7.Controls.Add(this.LblSmax, 0, 2); - this.tableLayoutPanel7.Controls.Add(this.IIMaxPower, 1, 2); - this.tableLayoutPanel7.Controls.Add(this.LblMinPerc, 2, 1); - this.tableLayoutPanel7.Controls.Add(this.LblMaxPerc, 2, 2); - this.tableLayoutPanel7.Name = "tableLayoutPanel7"; - // - // BtnModulationInfo - // - this.BtnModulationInfo.AltImage = null; - resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); - this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnModulationInfo.Caption = null; - this.BtnModulationInfo.Coloration = System.Drawing.Color.Empty; - this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); - this.BtnModulationInfo.Name = "BtnModulationInfo"; - this.tableLayoutPanel7.SetRowSpan(this.BtnModulationInfo, 2); - this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnModulationInfo, resources.GetString("BtnModulationInfo.ToolTip")); - this.BtnModulationInfo.UseAltImage = false; - this.BtnModulationInfo.Click += new System.EventHandler(this.BtnModulationInfo_Click); - // - // LblSmin - // - resources.ApplyResources(this.LblSmin, "LblSmin"); - this.LblSmin.Name = "LblSmin"; - // - // IIMinPower - // - resources.ApplyResources(this.IIMinPower, "IIMinPower"); - this.IIMinPower.ForcedText = null; - this.IIMinPower.ForceMinMax = false; - this.IIMinPower.MaxValue = 999; - this.IIMinPower.MinValue = 0; - this.IIMinPower.Name = "IIMinPower"; - this.IIMinPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IIMinPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMinPowerCurrentValueChanged); - // - // label18 - // - resources.ApplyResources(this.label18, "label18"); - this.label18.Name = "label18"; - // - // BtnOnOffInfo - // - this.BtnOnOffInfo.AltImage = null; - resources.ApplyResources(this.BtnOnOffInfo, "BtnOnOffInfo"); - this.BtnOnOffInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnOnOffInfo.Caption = null; - this.BtnOnOffInfo.Coloration = System.Drawing.Color.Empty; - this.BtnOnOffInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnOnOffInfo.Image"))); - this.BtnOnOffInfo.Name = "BtnOnOffInfo"; - this.BtnOnOffInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnOnOffInfo, resources.GetString("BtnOnOffInfo.ToolTip")); - this.BtnOnOffInfo.UseAltImage = false; - this.BtnOnOffInfo.Click += new System.EventHandler(this.BtnOnOffInfo_Click); - // - // CBLaserON - // - this.tableLayoutPanel7.SetColumnSpan(this.CBLaserON, 2); - resources.ApplyResources(this.CBLaserON, "CBLaserON"); - this.CBLaserON.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CBLaserON.FormattingEnabled = true; - this.CBLaserON.Name = "CBLaserON"; - this.CBLaserON.SelectedIndexChanged += new System.EventHandler(this.CBLaserON_SelectedIndexChanged); - // - // LblSmax - // - resources.ApplyResources(this.LblSmax, "LblSmax"); - this.LblSmax.Name = "LblSmax"; - // - // IIMaxPower - // - resources.ApplyResources(this.IIMaxPower, "IIMaxPower"); - this.IIMaxPower.CurrentValue = 1000; - this.IIMaxPower.ForcedText = null; - this.IIMaxPower.ForceMinMax = false; - this.IIMaxPower.MaxValue = 1000; - this.IIMaxPower.MinValue = 1; - this.IIMaxPower.Name = "IIMaxPower"; - this.IIMaxPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IIMaxPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMaxPowerCurrentValueChanged); - // - // LblMinPerc - // - resources.ApplyResources(this.LblMinPerc, "LblMinPerc"); - this.LblMinPerc.Name = "LblMinPerc"; - // - // LblMaxPerc - // - resources.ApplyResources(this.LblMaxPerc, "LblMaxPerc"); - this.LblMaxPerc.Name = "LblMaxPerc"; - // - // tableLayoutPanel1 - // - resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); - this.tableLayoutPanel1.Controls.Add(this.BtnCancel, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.BtnCreate, 2, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - // - // BtnCancel - // - this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - resources.ApplyResources(this.BtnCancel, "BtnCancel"); - this.BtnCancel.Name = "BtnCancel"; - this.BtnCancel.UseVisualStyleBackColor = true; - // - // BtnCreate - // - this.BtnCreate.DialogResult = System.Windows.Forms.DialogResult.OK; - resources.ApplyResources(this.BtnCreate, "BtnCreate"); - this.BtnCreate.Name = "BtnCreate"; - this.BtnCreate.UseVisualStyleBackColor = true; - // - // TT - // - this.TT.AutoPopDelay = 10000; - this.TT.InitialDelay = 500; - this.TT.ReshowDelay = 100; - // - // SvgToGCodeForm - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.tableLayoutPanel9); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "SvgToGCodeForm"; - this.tableLayoutPanel9.ResumeLayout(false); - this.tableLayoutPanel9.PerformLayout(); - this.GbSpeed.ResumeLayout(false); - this.GbSpeed.PerformLayout(); - this.tableLayoutPanel6.ResumeLayout(false); - this.tableLayoutPanel6.PerformLayout(); - this.GbLaser.ResumeLayout(false); - this.GbLaser.PerformLayout(); - this.tableLayoutPanel7.ResumeLayout(false); - this.tableLayoutPanel7.PerformLayout(); - this.tableLayoutPanel1.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SvgToGCodeForm)); + this.tableLayoutPanel9 = new System.Windows.Forms.TableLayoutPanel(); + this.GbSpeed = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); + this.LblBorderTracing = new System.Windows.Forms.Label(); + this.LblBorderTracingmm = new System.Windows.Forms.Label(); + this.GbLaser = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); + this.LblSmin = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); + this.CBLaserON = new System.Windows.Forms.ComboBox(); + this.LblSmax = new System.Windows.Forms.Label(); + this.LblMinPerc = new System.Windows.Forms.Label(); + this.LblMaxPerc = new System.Windows.Forms.Label(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnCancel = new System.Windows.Forms.Button(); + this.BtnCreate = new System.Windows.Forms.Button(); + this.TT = new System.Windows.Forms.ToolTip(this.components); + this.IIBorderTracing = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + this.BtnPSHelper = new LaserGRBL.UserControls.ImageButton(); + this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); + this.IIMinPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + this.BtnOnOffInfo = new LaserGRBL.UserControls.ImageButton(); + this.IIMaxPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + this.tableLayoutPanel9.SuspendLayout(); + this.GbSpeed.SuspendLayout(); + this.tableLayoutPanel6.SuspendLayout(); + this.GbLaser.SuspendLayout(); + this.tableLayoutPanel7.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + this.SuspendLayout(); + // + // tableLayoutPanel9 + // + resources.ApplyResources(this.tableLayoutPanel9, "tableLayoutPanel9"); + this.tableLayoutPanel9.Controls.Add(this.GbSpeed, 0, 0); + this.tableLayoutPanel9.Controls.Add(this.GbLaser, 0, 1); + this.tableLayoutPanel9.Controls.Add(this.tableLayoutPanel1, 0, 3); + this.tableLayoutPanel9.Name = "tableLayoutPanel9"; + // + // GbSpeed + // + resources.ApplyResources(this.GbSpeed, "GbSpeed"); + this.GbSpeed.Controls.Add(this.tableLayoutPanel6); + this.GbSpeed.Name = "GbSpeed"; + this.GbSpeed.TabStop = false; + // + // tableLayoutPanel6 + // + resources.ApplyResources(this.tableLayoutPanel6, "tableLayoutPanel6"); + this.tableLayoutPanel6.Controls.Add(this.LblBorderTracing, 0, 0); + this.tableLayoutPanel6.Controls.Add(this.LblBorderTracingmm, 2, 0); + this.tableLayoutPanel6.Controls.Add(this.IIBorderTracing, 1, 0); + this.tableLayoutPanel6.Controls.Add(this.BtnPSHelper, 3, 0); + this.tableLayoutPanel6.Name = "tableLayoutPanel6"; + // + // LblBorderTracing + // + resources.ApplyResources(this.LblBorderTracing, "LblBorderTracing"); + this.LblBorderTracing.Name = "LblBorderTracing"; + // + // LblBorderTracingmm + // + resources.ApplyResources(this.LblBorderTracingmm, "LblBorderTracingmm"); + this.LblBorderTracingmm.Name = "LblBorderTracingmm"; + // + // GbLaser + // + resources.ApplyResources(this.GbLaser, "GbLaser"); + this.GbLaser.Controls.Add(this.tableLayoutPanel7); + this.GbLaser.Name = "GbLaser"; + this.GbLaser.TabStop = false; + // + // tableLayoutPanel7 + // + resources.ApplyResources(this.tableLayoutPanel7, "tableLayoutPanel7"); + this.tableLayoutPanel7.Controls.Add(this.BtnModulationInfo, 3, 1); + this.tableLayoutPanel7.Controls.Add(this.LblSmin, 0, 1); + this.tableLayoutPanel7.Controls.Add(this.IIMinPower, 1, 1); + this.tableLayoutPanel7.Controls.Add(this.label18, 0, 0); + this.tableLayoutPanel7.Controls.Add(this.BtnOnOffInfo, 3, 0); + this.tableLayoutPanel7.Controls.Add(this.CBLaserON, 1, 0); + this.tableLayoutPanel7.Controls.Add(this.LblSmax, 0, 2); + this.tableLayoutPanel7.Controls.Add(this.IIMaxPower, 1, 2); + this.tableLayoutPanel7.Controls.Add(this.LblMinPerc, 2, 1); + this.tableLayoutPanel7.Controls.Add(this.LblMaxPerc, 2, 2); + this.tableLayoutPanel7.Name = "tableLayoutPanel7"; + // + // LblSmin + // + resources.ApplyResources(this.LblSmin, "LblSmin"); + this.LblSmin.Name = "LblSmin"; + // + // label18 + // + resources.ApplyResources(this.label18, "label18"); + this.label18.Name = "label18"; + // + // CBLaserON + // + this.tableLayoutPanel7.SetColumnSpan(this.CBLaserON, 2); + resources.ApplyResources(this.CBLaserON, "CBLaserON"); + this.CBLaserON.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CBLaserON.FormattingEnabled = true; + this.CBLaserON.Name = "CBLaserON"; + this.CBLaserON.SelectedIndexChanged += new System.EventHandler(this.CBLaserON_SelectedIndexChanged); + // + // LblSmax + // + resources.ApplyResources(this.LblSmax, "LblSmax"); + this.LblSmax.Name = "LblSmax"; + // + // LblMinPerc + // + resources.ApplyResources(this.LblMinPerc, "LblMinPerc"); + this.LblMinPerc.Name = "LblMinPerc"; + // + // LblMaxPerc + // + resources.ApplyResources(this.LblMaxPerc, "LblMaxPerc"); + this.LblMaxPerc.Name = "LblMaxPerc"; + // + // tableLayoutPanel1 + // + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); + this.tableLayoutPanel1.Controls.Add(this.BtnCancel, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.BtnCreate, 2, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + // + // BtnCancel + // + this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + resources.ApplyResources(this.BtnCancel, "BtnCancel"); + this.BtnCancel.Name = "BtnCancel"; + this.BtnCancel.UseVisualStyleBackColor = true; + // + // BtnCreate + // + this.BtnCreate.DialogResult = System.Windows.Forms.DialogResult.OK; + resources.ApplyResources(this.BtnCreate, "BtnCreate"); + this.BtnCreate.Name = "BtnCreate"; + this.BtnCreate.UseVisualStyleBackColor = true; + // + // TT + // + this.TT.AutoPopDelay = 10000; + this.TT.InitialDelay = 500; + this.TT.ReshowDelay = 100; + // + // IIBorderTracing + // + resources.ApplyResources(this.IIBorderTracing, "IIBorderTracing"); + this.IIBorderTracing.CurrentValue = 1000; + this.IIBorderTracing.ForcedText = null; + this.IIBorderTracing.ForceMinMax = false; + this.IIBorderTracing.MaxValue = 4000; + this.IIBorderTracing.MinValue = 1; + this.IIBorderTracing.Name = "IIBorderTracing"; + this.IIBorderTracing.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IIBorderTracing.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIBorderTracingCurrentValueChanged); + // + // BtnPSHelper + // + this.BtnPSHelper.AltImage = null; + resources.ApplyResources(this.BtnPSHelper, "BtnPSHelper"); + this.BtnPSHelper.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnPSHelper.Caption = null; + this.BtnPSHelper.Coloration = System.Drawing.Color.Empty; + this.BtnPSHelper.Image = ((System.Drawing.Image)(resources.GetObject("BtnPSHelper.Image"))); + this.BtnPSHelper.Name = "BtnPSHelper"; + this.BtnPSHelper.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnPSHelper, resources.GetString("BtnPSHelper.ToolTip")); + this.BtnPSHelper.UseAltImage = false; + this.BtnPSHelper.Click += new System.EventHandler(this.BtnPSHelper_Click); + // + // BtnModulationInfo + // + this.BtnModulationInfo.AltImage = null; + resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); + this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnModulationInfo.Caption = null; + this.BtnModulationInfo.Coloration = System.Drawing.Color.Empty; + this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); + this.BtnModulationInfo.Name = "BtnModulationInfo"; + this.tableLayoutPanel7.SetRowSpan(this.BtnModulationInfo, 2); + this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnModulationInfo, resources.GetString("BtnModulationInfo.ToolTip")); + this.BtnModulationInfo.UseAltImage = false; + this.BtnModulationInfo.Click += new System.EventHandler(this.BtnModulationInfo_Click); + // + // IIMinPower + // + resources.ApplyResources(this.IIMinPower, "IIMinPower"); + this.IIMinPower.ForcedText = null; + this.IIMinPower.ForceMinMax = false; + this.IIMinPower.MaxValue = 999; + this.IIMinPower.MinValue = 0; + this.IIMinPower.Name = "IIMinPower"; + this.IIMinPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IIMinPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMinPowerCurrentValueChanged); + // + // BtnOnOffInfo + // + this.BtnOnOffInfo.AltImage = null; + resources.ApplyResources(this.BtnOnOffInfo, "BtnOnOffInfo"); + this.BtnOnOffInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnOnOffInfo.Caption = null; + this.BtnOnOffInfo.Coloration = System.Drawing.Color.Empty; + this.BtnOnOffInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnOnOffInfo.Image"))); + this.BtnOnOffInfo.Name = "BtnOnOffInfo"; + this.BtnOnOffInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnOnOffInfo, resources.GetString("BtnOnOffInfo.ToolTip")); + this.BtnOnOffInfo.UseAltImage = false; + this.BtnOnOffInfo.Click += new System.EventHandler(this.BtnOnOffInfo_Click); + // + // IIMaxPower + // + resources.ApplyResources(this.IIMaxPower, "IIMaxPower"); + this.IIMaxPower.CurrentValue = 1000; + this.IIMaxPower.ForcedText = null; + this.IIMaxPower.ForceMinMax = false; + this.IIMaxPower.MaxValue = 1000; + this.IIMaxPower.MinValue = 1; + this.IIMaxPower.Name = "IIMaxPower"; + this.IIMaxPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IIMaxPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMaxPowerCurrentValueChanged); + // + // SvgToGCodeForm + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.tableLayoutPanel9); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "SvgToGCodeForm"; + this.tableLayoutPanel9.ResumeLayout(false); + this.tableLayoutPanel9.PerformLayout(); + this.GbSpeed.ResumeLayout(false); + this.GbSpeed.PerformLayout(); + this.tableLayoutPanel6.ResumeLayout(false); + this.tableLayoutPanel6.PerformLayout(); + this.GbLaser.ResumeLayout(false); + this.GbLaser.PerformLayout(); + this.tableLayoutPanel7.ResumeLayout(false); + this.tableLayoutPanel7.PerformLayout(); + this.tableLayoutPanel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.cs b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.cs index cdd369d17..653e371cb 100644 --- a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.cs +++ b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.cs @@ -19,7 +19,7 @@ public partial class SvgToGCodeForm : Form GrblCore mCore; bool supportPWM = Settings.GetObject("Support Hardware PWM", true); - public ComboboxItem[] LaserOptions = new ComboboxItem[] { new ComboboxItem("M3 - Constant Power", "M3"), new ComboboxItem("M4 - Dynamic Power", "M4") }; + public ComboboxItem[] LaserOptions = new ComboboxItem[] { new ComboboxItem("M3 - Constant Power", "M3"), new ComboboxItem("M4 - Dynamic Power", "M4"), new ComboboxItem("M106 - Dynamic Power", "M106") }; public class ComboboxItem { public string Text { get; set; } @@ -64,7 +64,14 @@ private SvgToGCodeForm(GrblCore core, string filename, bool append) AssignMinMaxLimit(); CBLaserON.Items.Add(LaserOptions[0]); - CBLaserON.Items.Add(LaserOptions[1]); + if (Settings.GetObject("Firmware Type", Firmware.Grbl) == Firmware.Marlin && Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle) == GrblCore.PwmMode.Fan) + { + CBLaserON.Items.Add(LaserOptions[2]); + } + else + { + CBLaserON.Items.Add(LaserOptions[1]); + } } private void AssignMinMaxLimit() @@ -82,9 +89,12 @@ public void ShowDialogForm(Form parent) if (LaserOn == "M3" || !mCore.Configuration.LaserMode) CBLaserON.SelectedItem = LaserOptions[0]; else - CBLaserON.SelectedItem = LaserOptions[1]; - - string LaserOff = "M5"; //Settings.GetObject("GrayScaleConversion.Gcode.LaserOptions.LaserOff", "M5"); + { + if (Settings.GetObject("Firmware Type", Firmware.Grbl) == Firmware.Marlin && Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle) == GrblCore.PwmMode.Fan) + CBLaserON.SelectedItem = LaserOptions[2]; + else + CBLaserON.SelectedItem = LaserOptions[1]; + } IIMinPower.CurrentValue = Settings.GetObject("GrayScaleConversion.Gcode.LaserOptions.PowerMin", 0); IIMaxPower.CurrentValue = Settings.GetObject("GrayScaleConversion.Gcode.LaserOptions.PowerMax", (int)mCore.Configuration.MaxPWM); diff --git a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx index 62731b9af..d02500860 100644 --- a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx +++ b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx @@ -229,7 +229,7 @@ IIBorderTracing - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.5.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -277,7 +277,7 @@ BtnPSHelper - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.5.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel6 @@ -394,7 +394,7 @@ Click for more information... BtnModulationInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.5.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -451,7 +451,7 @@ Click for more information... IIMinPower - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.5.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -530,7 +530,7 @@ Click for more information... BtnOnOffInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.5.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -611,7 +611,7 @@ Click for more information... IIMaxPower - LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.5.1.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.NumericInput.IntegerInputRanged, LaserGRBL, Version=4.7.2.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel7 @@ -880,6 +880,9 @@ Click for more information... 274, 180 + + NoControl + 4, 4, 4, 4 diff --git a/LaserGRBL/SvgConverter/gcodeRelated.cs b/LaserGRBL/SvgConverter/gcodeRelated.cs index 116c60093..baa3e5841 100644 --- a/LaserGRBL/SvgConverter/gcodeRelated.cs +++ b/LaserGRBL/SvgConverter/gcodeRelated.cs @@ -59,6 +59,10 @@ public static class gcode private static int rapidnum = 0; private static bool SupportPWM = true; + private static int dwelltime = 0; + private static int fanId = 0; + private static GrblCore.PwmMode pwmMode = GrblCore.PwmMode.Spindle; + public static void setup(GrblCore core) { SupportPWM = Settings.GetObject("Support Hardware PWM", true); //If Support PWM use S command instead of M3-M4 / M5 @@ -78,10 +82,23 @@ public static void setup(GrblCore core) gcodeSpindleSpeed /= 255.0f; gcodeSpindleCmdOn = Settings.GetObject("GrayScaleConversion.Gcode.LaserOptions.LaserOn", "M3"); gcodeSpindleCmdOff = Settings.GetObject("GrayScaleConversion.Gcode.LaserOptions.LaserOff", "M5"); - SupportPWM = Settings.GetObject("Support Hardware PWM", true); //If Support PWM use S command instead of M3-M4 / M5 lastMovewasG0 = true; lastx = -1; lasty = -1; lastz = 0; lasts = -1 ; lastg = -1; + + if(firmwareType == Firmware.Marlin) + { + pwmMode = Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle); ; + fanId = Settings.GetObject("Pwm FanId", 0); + try + { + dwelltime = Int32.Parse(Settings.GetObject("Pwm FanDwell", "0")); + } + catch (FormatException) + { + dwelltime = 0; + } + } } public static bool reduceGCode @@ -158,36 +175,81 @@ public static void SpindleOn(StringBuilder gcodeString, string cmt = "") { if (cmt.Length > 0) cmt = string.Format(" ({0})", cmt); + if ((firmwareType == Firmware.Marlin) && (pwmMode == GrblCore.PwmMode.Fan)) + { + gcodeString.AppendFormat("G4 P0\r\n"); + } + if (SupportPWM) - gcodeString.AppendFormat("S{0}{1}\r\n", gcodeSpindleSpeed, cmt); //only set SMax + { + if (firmwareType == Firmware.Marlin) + { + if (pwmMode == GrblCore.PwmMode.Fan) + { + gcodeString.AppendFormat("{0} S{1} P{2}{3}\r\n", gcodeSpindleCmdOn, gcodeSpindleSpeed, fanId, cmt); + } + else + { + gcodeString.AppendFormat("{0} S{1}{2}\r\n", gcodeSpindleCmdOn, gcodeSpindleSpeed, cmt); + } + } + else + { + gcodeString.AppendFormat("S{0}{1}\r\n", gcodeSpindleSpeed, cmt); + } + } else - gcodeString.AppendFormat("{0}{1}\r\n", gcodeSpindleCmdOn, cmt); //only set M3/M4 + { + gcodeString.AppendFormat("{0}{1}\r\n", gcodeSpindleCmdOn, cmt); //only set M5 + } + + if ((firmwareType == Firmware.Marlin) && (pwmMode == GrblCore.PwmMode.Fan)) + { + gcodeString.AppendFormat("G4 P{0}\r\n", dwelltime); + } } public static void SpindleOff(StringBuilder gcodeString, string cmt = "") { if (cmt.Length > 0) cmt = string.Format(" ({0})", cmt); - + + if ((firmwareType == Firmware.Marlin) && (pwmMode == GrblCore.PwmMode.Fan)) + { + gcodeString.AppendFormat("G4 P0\r\n"); + } + if (SupportPWM) - gcodeString.AppendFormat("S0{0}\r\n", cmt); //only set S0 + { + if (firmwareType == Firmware.Marlin) + { + if (pwmMode == GrblCore.PwmMode.Fan) + { + gcodeString.AppendFormat("{0} S0 P{1}{2}\r\n", gcodeSpindleCmdOn, fanId, cmt); + } + else + { + gcodeString.AppendFormat("{0} S0{1}\r\n", gcodeSpindleCmdOn, cmt); + } + } + else + { + gcodeString.AppendFormat("S0{0}\r\n", cmt); + } + } else + { gcodeString.AppendFormat("{0}{1}\r\n", gcodeSpindleCmdOff, cmt); //only set M5 + } } internal static void PutInitialCommand(StringBuilder gcodeString) { - if (SupportPWM) - gcodeString.AppendFormat("{0} S0\r\n", gcodeSpindleCmdOn); //turn ON with zero power - else - gcodeString.AppendFormat("{0} S{1}\r\n", gcodeSpindleCmdOff, gcodeSpindleSpeed); //turn OFF and set MaxPower + SpindleOff(gcodeString); } internal static void PutFinalCommand(StringBuilder gcodeString) { - if (SupportPWM) - gcodeString.AppendFormat("M5 S0\r\n"); //turn OFF and zero power - else - gcodeString.AppendFormat("M5 S0\r\n"); //turn OFF and zero power + SpindleOff(gcodeString); } public static void PenDown(StringBuilder gcodeString, string cmto = "") @@ -509,7 +571,7 @@ private static void Move(StringBuilder gcodeString, int gnr, float x, float y, f { // For Marlin, we must change this line to : // if (lastg != gnr || firmwareType == Firmware.Marlin) { gcodeTmp.AppendFormat("G{0}", frmtCode(gnr)); isneeded = true; } - if (lastg != gnr) { gcodeTmp.AppendFormat("G{0}", frmtCode(gnr)); isneeded = true; } + if (lastg != gnr || firmwareType == Firmware.Marlin) { gcodeTmp.AppendFormat("G{0}", frmtCode(gnr)); isneeded = true; } if (lastx != x) { gcodeTmp.AppendFormat("X{0}", frmtNum(x)); isneeded = true; } if (lasty != y) { gcodeTmp.AppendFormat("Y{0}", frmtNum(y)); isneeded = true; } diff --git a/LaserGRBL/WiFiDiscovery/IPAddressHelper.cs b/LaserGRBL/WiFiDiscovery/IPAddressHelper.cs index 31b2029ab..e7282acbc 100644 --- a/LaserGRBL/WiFiDiscovery/IPAddressHelper.cs +++ b/LaserGRBL/WiFiDiscovery/IPAddressHelper.cs @@ -262,8 +262,6 @@ public static UInt32 ToUInt32(this IPAddress ip) } public static void ScanIP(Action callback, Action progress, CancellationToken ct, int port, IPAddress paramIP = null) { - int count = 0; - if (callback == null) throw new ArgumentNullException(string.Format("Callback needed")); if (progress == null) From 50177bfd0e19379965857c7661472a6986822b9d Mon Sep 17 00:00:00 2001 From: Philipp von den Hoff Date: Fri, 11 Mar 2022 22:45:39 +0100 Subject: [PATCH 02/10] move spindle gcode generation to GrblCore --- LaserGRBL/Core/GrblCore.cs | 37 +++- LaserGRBL/Core/MarlinCore.cs | 23 ++ LaserGRBL/GrblFile.cs | 201 ++++++------------ .../ConvertSizeAndOptionForm.Designer.cs | 168 +++++++-------- .../ConvertSizeAndOptionForm.resx | 3 - LaserGRBL/SvgConverter/gcodeRelated.cs | 99 ++++----- 6 files changed, 242 insertions(+), 289 deletions(-) diff --git a/LaserGRBL/Core/GrblCore.cs b/LaserGRBL/Core/GrblCore.cs index ac6f2a547..6f09c4bc0 100644 --- a/LaserGRBL/Core/GrblCore.cs +++ b/LaserGRBL/Core/GrblCore.cs @@ -85,11 +85,28 @@ public enum DetectedIssue } public enum PwmMode - { + { Spindle = 0, Fan = 1, } + public enum SpindleState + { + ON = 0, + OFF = 1, + } + + public class SpindleConfig + { + public string lOn; + public string lOff; + public bool pwm; + public Firmware firmwareType; + public int dwelltime; + public int fanId; + public GrblCore.PwmMode pwmMode; + } + public enum MacStatus { Disconnected, Connecting, Idle, Run, Hold, Door, Home, Alarm, Check, Jog, Queue, Cooling } @@ -313,7 +330,9 @@ public int OrturFWVersionNumber private HotKeysManager mHotKeyManager; public UsageStats.UsageCounters UsageCounters; - + + protected SpindleConfig mSpindleConfig; + public GrblCore(System.Windows.Forms.Control syncroObject, PreviewForm cbform, JogForm jogform) { @@ -2681,7 +2700,19 @@ private static IEnumerable StringToGCode(string input) } } - public virtual bool UIShowGrblConfig => true; + public void configureSpindle(SpindleConfig SpindleConfig) + { + mSpindleConfig = SpindleConfig; + } + + public virtual List getSpindleGcode(SpindleState state , int power) + { + List LaserCmd = new List(); + LaserCmd.Add(String.Format("{0} S{1}", state == SpindleState.ON ? mSpindleConfig.lOn : mSpindleConfig.lOff, power)); + return LaserCmd; + } + + public virtual bool UIShowGrblConfig => true; public virtual bool UIShowUnlockButtons => true; public bool IsOrturBoard { get => GrblVersion != null && GrblVersion.IsOrtur; } diff --git a/LaserGRBL/Core/MarlinCore.cs b/LaserGRBL/Core/MarlinCore.cs index d62c474ed..d97da12f2 100644 --- a/LaserGRBL/Core/MarlinCore.cs +++ b/LaserGRBL/Core/MarlinCore.cs @@ -71,6 +71,29 @@ internal override void SendHomingCommand() EnqueueCommand(new GrblCommand("G28")); } + public override List getSpindleGcode(SpindleState state, int power) + { + List LaserCmd = new List(); + if (mSpindleConfig.pwmMode == GrblCore.PwmMode.Fan) + { + LaserCmd.Add(String.Format("G4 P0")); + if(state == SpindleState.ON) + LaserCmd.Add(String.Format("{0} S{1} P{2}", mSpindleConfig.lOn , power, mSpindleConfig.fanId)); //laser on and power to zero + else + LaserCmd.Add(String.Format("{0} P{2}", mSpindleConfig.lOff, mSpindleConfig.fanId)); //laser on and power to zero + if (state == SpindleState.ON && power > 0) + LaserCmd.Add(String.Format("G4 P{0}", mSpindleConfig.dwelltime)); + } + else + { + if (state == SpindleState.ON) + LaserCmd.Add(String.Format("{0} S{1}", mSpindleConfig.lOn , power)); + else + LaserCmd.Add(String.Format("{0}", mSpindleConfig.lOn)); + } + return LaserCmd; + } + internal override void GrblHoming() { if (CanDoHoming) EnqueueCommand(new GrblCommand("G28")); } diff --git a/LaserGRBL/GrblFile.cs b/LaserGRBL/GrblFile.cs index f0e6279d3..e2fc4032b 100644 --- a/LaserGRBL/GrblFile.cs +++ b/LaserGRBL/GrblFile.cs @@ -147,6 +147,15 @@ public void LoadImportedSVG(string filename, bool append, GrblCore core) RiseOnFileLoaded(filename, elapsed); } + private List gCodeListToGrblCommad(List gCode) + { + List list = new List(); + foreach (String cmd in gCode) + list.Add(new GrblCommand(cmd)); + return list; + } + + private abstract class ColorSegment { @@ -305,6 +314,17 @@ public void LoadImagePotrace(Bitmap bmp, string filename, bool UseSpotRemoval, i bmp.RotateFlip(RotateFlipType.RotateNoneFlipY); long start = Tools.HiResTimer.TotalMilliseconds; + GrblCore.SpindleConfig SpindleConfig = new GrblCore.SpindleConfig(); + SpindleConfig.firmwareType = c.firmwareType; + SpindleConfig.dwelltime = c.dwelltime; + SpindleConfig.fanId = c.fanId; + SpindleConfig.lOff = c.lOff; + SpindleConfig.lOn = c.lOn; + SpindleConfig.pwm = c.pwm; + SpindleConfig.pwmMode = c.pwmMode; + core.configureSpindle(SpindleConfig); + + if (!append) list.Clear(); @@ -338,22 +358,10 @@ public void LoadImagePotrace(Bitmap bmp, string filename, bool UseSpotRemoval, i using (Bitmap resampled = RasterConverter.ImageTransform.ResizeImage(ptb, new Size((int)(bmp.Width * c.fres / c.res) + 1, (int)(bmp.Height * c.fres / c.res) + 1), true, InterpolationMode.HighQualityBicubic)) { - if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) - { - list.Add(new GrblCommand(String.Format("G4 P0"))); - } if (c.pwm) - if (c.firmwareType == Firmware.Marlin) - { - if (c.pwmMode == GrblCore.PwmMode.Fan) - list.Add(new GrblCommand(String.Format("{0} S0 P{1}", c.lOn, c.fanId))); //laser on and power to zero - else - list.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero - } - else - list.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero + list.AddRange(gCodeListToGrblCommad(core.getSpindleGcode(GrblCore.SpindleState.ON, 0))); //laser on and power to zero else - list.Add(new GrblCommand(String.Format($"{c.lOff} S{core.Configuration.MaxPWM}"))); //laser off and power to max power + list.AddRange(gCodeListToGrblCommad(core.getSpindleGcode(GrblCore.SpindleState.OFF, Decimal.ToInt32(core.Configuration.MaxPWM)))); //laser off and power to max power //set speed to markspeed // For marlin, need to specify G1 each time : @@ -361,10 +369,10 @@ public void LoadImagePotrace(Bitmap bmp, string filename, bool UseSpotRemoval, i list.Add(new GrblCommand(String.Format("F{0}", c.markSpeed))); c.vectorfilling = true; - ImageLine2Line(resampled, c); + ImageLine2Line(resampled, c, core); //laser off - list.Add(new GrblCommand(c.lOff)); + list.AddRange(gCodeListToGrblCommad(core.getSpindleGcode(GrblCore.SpindleState.OFF, 0))); //laser off and power to max power } } } @@ -372,69 +380,19 @@ public void LoadImagePotrace(Bitmap bmp, string filename, bool UseSpotRemoval, i bool supportPWM = Settings.GetObject("Support Hardware PWM", true); - if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) - { - list.Add(new GrblCommand(String.Format("G4 P0"))); - } if (supportPWM) - { - if (c.firmwareType == Firmware.Marlin) - { - if (c.pwmMode == GrblCore.PwmMode.Fan) - list.Add(new GrblCommand(String.Format("{0} S0 P{1}", c.lOn, c.fanId))); //laser on and power to zero - else - list.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero - } - else - list.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero - } + list.AddRange(gCodeListToGrblCommad(core.getSpindleGcode(GrblCore.SpindleState.ON, 0))); //laser on and power to zero else - list.Add(new GrblCommand($"{c.lOff} S{core.Configuration.MaxPWM}")); //laser off and power to maxPower - - List LaserOn = new List(); - List LaserOff = new List(); - if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) - { - LaserOn.Add(String.Format("G4 P0")); - LaserOff.Add(String.Format("G4 P0")); - } - if (supportPWM) - { - if (c.firmwareType == Firmware.Marlin) - { - if (c.pwmMode == GrblCore.PwmMode.Fan) - { - LaserOn.Add(String.Format("{0} S{1} P{2}", c.lOn, c.maxPower, c.fanId)); - LaserOff.Add(String.Format("{0} S0 P{1}", c.lOn, c.fanId)); - } - else - { - LaserOn.Add(String.Format("{0} S{1}", c.lOn, c.maxPower)); - LaserOff.Add(String.Format("{0} S0", c.lOn)); - } - } - else - { - LaserOn.Add(String.Format("{0} S{1}", c.lOn, c.maxPower)); - LaserOff.Add(String.Format("{0} S0", c.lOn)); - } - } - else - { - LaserOn.Add(c.lOn); - LaserOff.Add(c.lOff); - } - - if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) - { - LaserOn.Add(String.Format("G4 P{0}", c.dwelltime)); - } + list.AddRange(gCodeListToGrblCommad(core.getSpindleGcode(GrblCore.SpindleState.OFF, Decimal.ToInt32(core.Configuration.MaxPWM)))); //laser off and power to max power //trace raster filling if (flist != null) { List gc = new List(); - gc.AddRange(Potrace.Export2GCode(flist, c.oX, c.oY, c.res, LaserOn, LaserOff, bmp.Size, skipcmd)); + if (supportPWM) + gc.AddRange(Potrace.Export2GCode(flist, c.oX, c.oY, c.res, core.getSpindleGcode(GrblCore.SpindleState.ON, c.maxPower), core.getSpindleGcode(GrblCore.SpindleState.ON, 0), bmp.Size, skipcmd)); + else + gc.AddRange(Potrace.Export2GCode(flist, c.oX, c.oY, c.res, core.getSpindleGcode(GrblCore.SpindleState.ON, c.maxPower), core.getSpindleGcode(GrblCore.SpindleState.OFF, 0), bmp.Size, skipcmd)); list.Add(new GrblCommand(String.Format("F{0}", c.markSpeed))); foreach (string code in gc) @@ -452,7 +410,10 @@ public void LoadImagePotrace(Bitmap bmp, string filename, bool UseSpotRemoval, i plist.Reverse(); //la lista viene fornita da potrace con prima esterni e poi interni, ma per il taglio รจ meglio il contrario List gc = new List(); - gc.AddRange(Potrace.Export2GCode(plist, c.oX, c.oY, c.res, LaserOn, LaserOff, bmp.Size, skipcmd)); + if (supportPWM) + gc.AddRange(Potrace.Export2GCode(plist, c.oX, c.oY, c.res, core.getSpindleGcode(GrblCore.SpindleState.ON, c.maxPower), core.getSpindleGcode(GrblCore.SpindleState.ON, 0), bmp.Size, skipcmd)); + else + gc.AddRange(Potrace.Export2GCode(plist, c.oX, c.oY, c.res, core.getSpindleGcode(GrblCore.SpindleState.ON, c.maxPower), core.getSpindleGcode(GrblCore.SpindleState.OFF, 0), bmp.Size, skipcmd)); // For marlin, need to specify G1 each time : //list.Add(new GrblCommand(String.Format("G1 F{0}", c.borderSpeed))); @@ -528,6 +489,16 @@ public void LoadImageL2L(Bitmap bmp, string filename, L2LConf c, bool append, Gr if (!append) list.Clear(); + GrblCore.SpindleConfig SpindleConfig = new GrblCore.SpindleConfig(); + SpindleConfig.firmwareType = c.firmwareType; + SpindleConfig.dwelltime = c.dwelltime; + SpindleConfig.fanId = c.fanId; + SpindleConfig.lOff = c.lOff; + SpindleConfig.lOn = c.lOn; + SpindleConfig.pwm = c.pwm; + SpindleConfig.pwmMode = c.pwmMode; + core.configureSpindle(SpindleConfig); + mRange.ResetRange(); //absolute @@ -535,39 +506,19 @@ public void LoadImageL2L(Bitmap bmp, string filename, L2LConf c, bool append, Gr //move fast to offset (or slow if disable G0) and set mark speed list.Add(new GrblCommand(String.Format("{0} X{1} Y{2} F{3}", skipcmd, formatnumber(c.oX), formatnumber(c.oY), c.markSpeed))); - if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) - { - list.Add(new GrblCommand(String.Format("G4 P0"))); - } if (c.pwm) - { - if (c.firmwareType == Firmware.Marlin) - { - if (c.pwmMode == GrblCore.PwmMode.Fan) - list.Add(new GrblCommand(String.Format("{0} S0 P{1}", c.lOn, c.fanId))); //laser on and power to zero - else - list.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero - } - else - { - list.Add(new GrblCommand("S0")); - } - } + list.AddRange(gCodeListToGrblCommad(core.getSpindleGcode(GrblCore.SpindleState.ON, 0))); //laser on and power to zero else - list.Add(new GrblCommand($"{c.lOff} S{core.Configuration.MaxPWM}")); //laser off and power to maxpower + list.AddRange(gCodeListToGrblCommad(core.getSpindleGcode(GrblCore.SpindleState.OFF, Decimal.ToInt32(core.Configuration.MaxPWM)))); //laser off and power to maxpower //set speed to markspeed // For marlin, need to specify G1 each time : //list.Add(new GrblCommand(String.Format("G1 F{0}", c.markSpeed))); //list.Add(new GrblCommand(String.Format("F{0}", c.markSpeed))); //replaced by the first move to offset and set speed - ImageLine2Line(bmp, c); + ImageLine2Line(bmp, c, core); //laser off - if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) - { - list.Add(new GrblCommand(String.Format("G4 P0"))); - } - list.Add(new GrblCommand(c.lOff)); + list.AddRange(gCodeListToGrblCommad(core.getSpindleGcode(GrblCore.SpindleState.OFF, Decimal.ToInt32(core.Configuration.MaxPWM)))); //move fast to origin //list.Add(new GrblCommand("G0 X0 Y0")); //moved to custom footer @@ -580,7 +531,7 @@ public void LoadImageL2L(Bitmap bmp, string filename, L2LConf c, bool append, Gr // For Marlin, as we sen M106 command, we need to know last color send //private int lastColorSend = 0; - private void ImageLine2Line(Bitmap bmp, L2LConf c) + private void ImageLine2Line(Bitmap bmp, L2LConf c, GrblCore core) { bool fast = true; List segments = GetSegments(bmp, c); @@ -595,62 +546,38 @@ private void ImageLine2Line(Bitmap bmp, L2LConf c) if (seg.IsSeparator && !fast) //fast = previous segment contains S0 color { - if ((c.firmwareType == Firmware.Marlin) && (c.pwmMode == GrblCore.PwmMode.Fan)) - { - temp.Add(new GrblCommand(String.Format("G4 P0"))); - } if (c.pwm) { - if (c.firmwareType == Firmware.Marlin) - { - if(c.pwmMode == GrblCore.PwmMode.Fan) - temp.Add(new GrblCommand(String.Format("{0} S0 P{1}", c.lOn, c.fanId))); //laser on and power to zero - else - temp.Add(new GrblCommand(String.Format("{0} S0", c.lOn))); //laser on and power to zero - } - else - { - temp.Add(new GrblCommand("S0")); - } + temp.AddRange(gCodeListToGrblCommad(core.getSpindleGcode(GrblCore.SpindleState.ON, 0))); } else - { - temp.Add(new GrblCommand(c.lOff)); //laser off + { + temp.AddRange(gCodeListToGrblCommad(core.getSpindleGcode(GrblCore.SpindleState.OFF, Decimal.ToInt32(core.Configuration.MaxPWM)))); //laser off } } fast = seg.Fast(c); - // For marlin firmware, we must defined laser power before moving (unsing M106 or M107) - // So we have to speficy gcode (G0 or G1) each time.... - if (c.firmwareType == Firmware.Marlin) - { + // For marlin firmware, we must defined laser power before moving (unsing M106 or M107) + // So we have to speficy gcode (G0 or G1) each time.... + if (c.firmwareType == Firmware.Marlin) + { // Add M106 only if color has changed if (lastColorSend != seg.mColor) { - if (c.pwmMode == GrblCore.PwmMode.Fan) - { - temp.Add(new GrblCommand(String.Format("G4 P0"))); - temp.Add(new GrblCommand(String.Format("{0} S{1} P{2}", c.lOn, fast ? 0 : seg.mColor, c.fanId))); - temp.Add(new GrblCommand(String.Format("G4 P{0}", c.dwelltime))); - } - else - { - temp.Add(new GrblCommand(String.Format("{0} S{1}", c.lOn, fast ? 0 : seg.mColor))); - } + temp.AddRange(gCodeListToGrblCommad(core.getSpindleGcode(GrblCore.SpindleState.ON, fast ? 0 : seg.mColor))); lastColorSend = seg.mColor; - } - temp.Add(new GrblCommand(String.Format("{0} {1}", fast ? "G0" : "G1", seg.ToGCodeNumber(ref cumX, ref cumY, c)))); - } - else - { - if (changeGMode) + temp.Add(new GrblCommand(String.Format("{0} {1}", fast ? "G0" : "G1", seg.ToGCodeNumber(ref cumX, ref cumY, c)))); + } + else + { + if (changeGMode) temp.Add(new GrblCommand(String.Format("{0} {1}", fast ? skipcmd : "G1", seg.ToGCodeNumber(ref cumX, ref cumY, c)))); else temp.Add(new GrblCommand(seg.ToGCodeNumber(ref cumX, ref cumY, c))); - } - } + } + } temp = OptimizeLine2Line(temp, c); list.AddRange(temp); diff --git a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs index 7a09cbcc0..61e4b35af 100644 --- a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs +++ b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.Designer.cs @@ -58,24 +58,24 @@ private void InitializeComponent() this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); this.LblBorderTracing = new System.Windows.Forms.Label(); this.LblBorderTracingmm = new System.Windows.Forms.Label(); + this.IIBorderTracing = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); + this.BtnPSHelper = new LaserGRBL.UserControls.ImageButton(); this.GbLaser = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); + this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); this.LblSmin = new System.Windows.Forms.Label(); + this.IIMinPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); this.label18 = new System.Windows.Forms.Label(); + this.BtnOnOffInfo = new LaserGRBL.UserControls.ImageButton(); this.CBLaserON = new System.Windows.Forms.ComboBox(); this.LblSmax = new System.Windows.Forms.Label(); + this.IIMaxPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); this.LblMinPerc = new System.Windows.Forms.Label(); this.LblMaxPerc = new System.Windows.Forms.Label(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.BtnCancel = new System.Windows.Forms.Button(); this.BtnCreate = new System.Windows.Forms.Button(); this.TT = new System.Windows.Forms.ToolTip(this.components); - this.IIBorderTracing = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.BtnPSHelper = new LaserGRBL.UserControls.ImageButton(); - this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); - this.IIMinPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); - this.BtnOnOffInfo = new LaserGRBL.UserControls.ImageButton(); - this.IIMaxPower = new LaserGRBL.UserControls.NumericInput.IntegerInputRanged(); this.tableLayoutPanel9.SuspendLayout(); this.GbSpeed.SuspendLayout(); this.tableLayoutPanel6.SuspendLayout(); @@ -118,6 +118,32 @@ private void InitializeComponent() resources.ApplyResources(this.LblBorderTracingmm, "LblBorderTracingmm"); this.LblBorderTracingmm.Name = "LblBorderTracingmm"; // + // IIBorderTracing + // + resources.ApplyResources(this.IIBorderTracing, "IIBorderTracing"); + this.IIBorderTracing.CurrentValue = 1000; + this.IIBorderTracing.ForcedText = null; + this.IIBorderTracing.ForceMinMax = false; + this.IIBorderTracing.MaxValue = 4000; + this.IIBorderTracing.MinValue = 1; + this.IIBorderTracing.Name = "IIBorderTracing"; + this.IIBorderTracing.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IIBorderTracing.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIBorderTracingCurrentValueChanged); + // + // BtnPSHelper + // + this.BtnPSHelper.AltImage = null; + resources.ApplyResources(this.BtnPSHelper, "BtnPSHelper"); + this.BtnPSHelper.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnPSHelper.Caption = null; + this.BtnPSHelper.Coloration = System.Drawing.Color.Empty; + this.BtnPSHelper.Image = ((System.Drawing.Image)(resources.GetObject("BtnPSHelper.Image"))); + this.BtnPSHelper.Name = "BtnPSHelper"; + this.BtnPSHelper.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnPSHelper, resources.GetString("BtnPSHelper.ToolTip")); + this.BtnPSHelper.UseAltImage = false; + this.BtnPSHelper.Click += new System.EventHandler(this.BtnPSHelper_Click); + // // GbLaser // resources.ApplyResources(this.GbLaser, "GbLaser"); @@ -140,16 +166,56 @@ private void InitializeComponent() this.tableLayoutPanel7.Controls.Add(this.LblMaxPerc, 2, 2); this.tableLayoutPanel7.Name = "tableLayoutPanel7"; // + // BtnModulationInfo + // + this.BtnModulationInfo.AltImage = null; + resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); + this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnModulationInfo.Caption = null; + this.BtnModulationInfo.Coloration = System.Drawing.Color.Empty; + this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); + this.BtnModulationInfo.Name = "BtnModulationInfo"; + this.tableLayoutPanel7.SetRowSpan(this.BtnModulationInfo, 2); + this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnModulationInfo, resources.GetString("BtnModulationInfo.ToolTip")); + this.BtnModulationInfo.UseAltImage = false; + this.BtnModulationInfo.Click += new System.EventHandler(this.BtnModulationInfo_Click); + // // LblSmin // resources.ApplyResources(this.LblSmin, "LblSmin"); this.LblSmin.Name = "LblSmin"; // + // IIMinPower + // + resources.ApplyResources(this.IIMinPower, "IIMinPower"); + this.IIMinPower.ForcedText = null; + this.IIMinPower.ForceMinMax = false; + this.IIMinPower.MaxValue = 999; + this.IIMinPower.MinValue = 0; + this.IIMinPower.Name = "IIMinPower"; + this.IIMinPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IIMinPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMinPowerCurrentValueChanged); + // // label18 // resources.ApplyResources(this.label18, "label18"); this.label18.Name = "label18"; // + // BtnOnOffInfo + // + this.BtnOnOffInfo.AltImage = null; + resources.ApplyResources(this.BtnOnOffInfo, "BtnOnOffInfo"); + this.BtnOnOffInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnOnOffInfo.Caption = null; + this.BtnOnOffInfo.Coloration = System.Drawing.Color.Empty; + this.BtnOnOffInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnOnOffInfo.Image"))); + this.BtnOnOffInfo.Name = "BtnOnOffInfo"; + this.BtnOnOffInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.TT.SetToolTip(this.BtnOnOffInfo, resources.GetString("BtnOnOffInfo.ToolTip")); + this.BtnOnOffInfo.UseAltImage = false; + this.BtnOnOffInfo.Click += new System.EventHandler(this.BtnOnOffInfo_Click); + // // CBLaserON // this.tableLayoutPanel7.SetColumnSpan(this.CBLaserON, 2); @@ -164,6 +230,18 @@ private void InitializeComponent() resources.ApplyResources(this.LblSmax, "LblSmax"); this.LblSmax.Name = "LblSmax"; // + // IIMaxPower + // + resources.ApplyResources(this.IIMaxPower, "IIMaxPower"); + this.IIMaxPower.CurrentValue = 1000; + this.IIMaxPower.ForcedText = null; + this.IIMaxPower.ForceMinMax = false; + this.IIMaxPower.MaxValue = 1000; + this.IIMaxPower.MinValue = 1; + this.IIMaxPower.Name = "IIMaxPower"; + this.IIMaxPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; + this.IIMaxPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMaxPowerCurrentValueChanged); + // // LblMinPerc // resources.ApplyResources(this.LblMinPerc, "LblMinPerc"); @@ -201,84 +279,6 @@ private void InitializeComponent() this.TT.InitialDelay = 500; this.TT.ReshowDelay = 100; // - // IIBorderTracing - // - resources.ApplyResources(this.IIBorderTracing, "IIBorderTracing"); - this.IIBorderTracing.CurrentValue = 1000; - this.IIBorderTracing.ForcedText = null; - this.IIBorderTracing.ForceMinMax = false; - this.IIBorderTracing.MaxValue = 4000; - this.IIBorderTracing.MinValue = 1; - this.IIBorderTracing.Name = "IIBorderTracing"; - this.IIBorderTracing.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IIBorderTracing.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIBorderTracingCurrentValueChanged); - // - // BtnPSHelper - // - this.BtnPSHelper.AltImage = null; - resources.ApplyResources(this.BtnPSHelper, "BtnPSHelper"); - this.BtnPSHelper.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnPSHelper.Caption = null; - this.BtnPSHelper.Coloration = System.Drawing.Color.Empty; - this.BtnPSHelper.Image = ((System.Drawing.Image)(resources.GetObject("BtnPSHelper.Image"))); - this.BtnPSHelper.Name = "BtnPSHelper"; - this.BtnPSHelper.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnPSHelper, resources.GetString("BtnPSHelper.ToolTip")); - this.BtnPSHelper.UseAltImage = false; - this.BtnPSHelper.Click += new System.EventHandler(this.BtnPSHelper_Click); - // - // BtnModulationInfo - // - this.BtnModulationInfo.AltImage = null; - resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); - this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnModulationInfo.Caption = null; - this.BtnModulationInfo.Coloration = System.Drawing.Color.Empty; - this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); - this.BtnModulationInfo.Name = "BtnModulationInfo"; - this.tableLayoutPanel7.SetRowSpan(this.BtnModulationInfo, 2); - this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnModulationInfo, resources.GetString("BtnModulationInfo.ToolTip")); - this.BtnModulationInfo.UseAltImage = false; - this.BtnModulationInfo.Click += new System.EventHandler(this.BtnModulationInfo_Click); - // - // IIMinPower - // - resources.ApplyResources(this.IIMinPower, "IIMinPower"); - this.IIMinPower.ForcedText = null; - this.IIMinPower.ForceMinMax = false; - this.IIMinPower.MaxValue = 999; - this.IIMinPower.MinValue = 0; - this.IIMinPower.Name = "IIMinPower"; - this.IIMinPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IIMinPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMinPowerCurrentValueChanged); - // - // BtnOnOffInfo - // - this.BtnOnOffInfo.AltImage = null; - resources.ApplyResources(this.BtnOnOffInfo, "BtnOnOffInfo"); - this.BtnOnOffInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnOnOffInfo.Caption = null; - this.BtnOnOffInfo.Coloration = System.Drawing.Color.Empty; - this.BtnOnOffInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnOnOffInfo.Image"))); - this.BtnOnOffInfo.Name = "BtnOnOffInfo"; - this.BtnOnOffInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.TT.SetToolTip(this.BtnOnOffInfo, resources.GetString("BtnOnOffInfo.ToolTip")); - this.BtnOnOffInfo.UseAltImage = false; - this.BtnOnOffInfo.Click += new System.EventHandler(this.BtnOnOffInfo_Click); - // - // IIMaxPower - // - resources.ApplyResources(this.IIMaxPower, "IIMaxPower"); - this.IIMaxPower.CurrentValue = 1000; - this.IIMaxPower.ForcedText = null; - this.IIMaxPower.ForceMinMax = false; - this.IIMaxPower.MaxValue = 1000; - this.IIMaxPower.MinValue = 1; - this.IIMaxPower.Name = "IIMaxPower"; - this.IIMaxPower.NormalBorderColor = System.Drawing.SystemColors.ActiveBorder; - this.IIMaxPower.CurrentValueChanged += new LaserGRBL.UserControls.NumericInput.IntegerInputBase.CurrentValueChangedEventHandler(this.IIMaxPowerCurrentValueChanged); - // // SvgToGCodeForm // resources.ApplyResources(this, "$this"); diff --git a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx index d02500860..b184cc0bf 100644 --- a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx +++ b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.resx @@ -880,9 +880,6 @@ Click for more information... 274, 180 - - NoControl - 4, 4, 4, 4 diff --git a/LaserGRBL/SvgConverter/gcodeRelated.cs b/LaserGRBL/SvgConverter/gcodeRelated.cs index baa3e5841..9d317d132 100644 --- a/LaserGRBL/SvgConverter/gcodeRelated.cs +++ b/LaserGRBL/SvgConverter/gcodeRelated.cs @@ -28,6 +28,7 @@ You should have received a copy of the GNU General Public License using System.Text.RegularExpressions; using System.Windows; using System.Windows.Forms; +using System.Collections.Generic; namespace LaserGRBL.SvgConverter { @@ -63,6 +64,11 @@ public static class gcode private static int fanId = 0; private static GrblCore.PwmMode pwmMode = GrblCore.PwmMode.Spindle; + private static List SpindleOnGCode = new List(); + private static List SpindleOffGCode = new List(); + private static List InitGCode = new List(); + private static List FinalGCode = new List(); + public static void setup(GrblCore core) { SupportPWM = Settings.GetObject("Support Hardware PWM", true); //If Support PWM use S command instead of M3-M4 / M5 @@ -99,6 +105,29 @@ public static void setup(GrblCore core) dwelltime = 0; } } + + GrblCore.SpindleConfig SpindleConfig = new GrblCore.SpindleConfig(); + SpindleConfig.firmwareType = firmwareType; + SpindleConfig.dwelltime = dwelltime; + SpindleConfig.fanId = fanId; + SpindleConfig.lOff = gcodeSpindleCmdOff; + SpindleConfig.lOn = gcodeSpindleCmdOn; + SpindleConfig.pwm = SupportPWM; + SpindleConfig.pwmMode = pwmMode; + core.configureSpindle(SpindleConfig); + SpindleOnGCode = core.getSpindleGcode(GrblCore.SpindleState.ON, (int)gcodeSpindleSpeed); + if (SupportPWM) + { + SpindleOffGCode = core.getSpindleGcode(GrblCore.SpindleState.ON, 0); + InitGCode = core.getSpindleGcode(GrblCore.SpindleState.ON, 0); + } + else + { + SpindleOffGCode = core.getSpindleGcode(GrblCore.SpindleState.OFF, (int)gcodeSpindleSpeed); + InitGCode = core.getSpindleGcode(GrblCore.SpindleState.OFF, (int)gcodeSpindleSpeed); + } + + FinalGCode = core.getSpindleGcode(GrblCore.SpindleState.OFF, 0); } public static bool reduceGCode @@ -174,82 +203,28 @@ public static string getStringValue(char code, string tmp) public static void SpindleOn(StringBuilder gcodeString, string cmt = "") { if (cmt.Length > 0) cmt = string.Format(" ({0})", cmt); - - if ((firmwareType == Firmware.Marlin) && (pwmMode == GrblCore.PwmMode.Fan)) - { - gcodeString.AppendFormat("G4 P0\r\n"); - } - - if (SupportPWM) - { - if (firmwareType == Firmware.Marlin) - { - if (pwmMode == GrblCore.PwmMode.Fan) - { - gcodeString.AppendFormat("{0} S{1} P{2}{3}\r\n", gcodeSpindleCmdOn, gcodeSpindleSpeed, fanId, cmt); - } - else - { - gcodeString.AppendFormat("{0} S{1}{2}\r\n", gcodeSpindleCmdOn, gcodeSpindleSpeed, cmt); - } - } - else - { - gcodeString.AppendFormat("S{0}{1}\r\n", gcodeSpindleSpeed, cmt); - } - } - else - { - gcodeString.AppendFormat("{0}{1}\r\n", gcodeSpindleCmdOn, cmt); //only set M5 - } - - if ((firmwareType == Firmware.Marlin) && (pwmMode == GrblCore.PwmMode.Fan)) - { - gcodeString.AppendFormat("G4 P{0}\r\n", dwelltime); - } + foreach (String cmd in SpindleOnGCode) + gcodeString.AppendFormat("{0}{1}\r\n", cmd, cmt); } public static void SpindleOff(StringBuilder gcodeString, string cmt = "") { if (cmt.Length > 0) cmt = string.Format(" ({0})", cmt); - if ((firmwareType == Firmware.Marlin) && (pwmMode == GrblCore.PwmMode.Fan)) - { - gcodeString.AppendFormat("G4 P0\r\n"); - } - - if (SupportPWM) - { - if (firmwareType == Firmware.Marlin) - { - if (pwmMode == GrblCore.PwmMode.Fan) - { - gcodeString.AppendFormat("{0} S0 P{1}{2}\r\n", gcodeSpindleCmdOn, fanId, cmt); - } - else - { - gcodeString.AppendFormat("{0} S0{1}\r\n", gcodeSpindleCmdOn, cmt); - } - } - else - { - gcodeString.AppendFormat("S0{0}\r\n", cmt); - } - } - else - { - gcodeString.AppendFormat("{0}{1}\r\n", gcodeSpindleCmdOff, cmt); //only set M5 - } + foreach (String cmd in SpindleOffGCode) + gcodeString.AppendFormat("{0}{1}\r\n", cmd, cmt); } internal static void PutInitialCommand(StringBuilder gcodeString) { - SpindleOff(gcodeString); + foreach (String cmd in InitGCode) + gcodeString.AppendFormat("{0}\r\n", cmd); } internal static void PutFinalCommand(StringBuilder gcodeString) { - SpindleOff(gcodeString); + foreach (String cmd in FinalGCode) + gcodeString.AppendFormat("{0}\r\n", cmd); } public static void PenDown(StringBuilder gcodeString, string cmto = "") From 2a27e24b746abdb6228f050a70a6c4a9a1fb66fd Mon Sep 17 00:00:00 2001 From: Philipp von den Hoff Date: Fri, 11 Mar 2022 22:55:31 +0100 Subject: [PATCH 03/10] Fix tabs --- LaserGRBL/Core/GrblCore.cs | 6 +++--- LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.cs | 10 +++++----- LaserGRBL/SettingsForm.cs | 4 ++-- LaserGRBL/SvgConverter/gcodeRelated.cs | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/LaserGRBL/Core/GrblCore.cs b/LaserGRBL/Core/GrblCore.cs index 6f09c4bc0..ed2a37dfe 100644 --- a/LaserGRBL/Core/GrblCore.cs +++ b/LaserGRBL/Core/GrblCore.cs @@ -1008,10 +1008,10 @@ public void AbortProgram() { GrblCommand stop = null; if(Settings.GetObject("Firmware Type", Firmware.Grbl) == Firmware.Marlin && Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle) == GrblCore.PwmMode.Fan) - { + { stop = new GrblCommand("M107"); } - else + else { stop = new GrblCommand("M5"); } @@ -2701,7 +2701,7 @@ private static IEnumerable StringToGCode(string input) } public void configureSpindle(SpindleConfig SpindleConfig) - { + { mSpindleConfig = SpindleConfig; } diff --git a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.cs b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.cs index a2c07dd20..85a121dc3 100644 --- a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.cs +++ b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.cs @@ -111,8 +111,8 @@ public void ShowDialog(Form parent, ImageProcessor processor) IP.LaserOn = "M106"; IP.LaserOff = "M107"; } - else - { + else + { CBLaserON.SelectedItem = LaserOptions[1]; IP.LaserOn = "M4"; IP.LaserOff = "M5"; @@ -250,11 +250,11 @@ private void CBLaserON_SelectedIndexChanged(object sender, EventArgs e) IP.LaserOn = "M3"; if(IP.LaserOn == "M106") - { + { IP.LaserOff = "M107"; } - else - { + else + { IP.LaserOff = "M5"; } } diff --git a/LaserGRBL/SettingsForm.cs b/LaserGRBL/SettingsForm.cs index 1ba34f2dc..b204c35fb 100644 --- a/LaserGRBL/SettingsForm.cs +++ b/LaserGRBL/SettingsForm.cs @@ -40,7 +40,7 @@ public SettingsForm(GrblCore core) CBCore.SelectedItem = fw; if (fw != Firmware.Marlin) - { + { MainTabPage.TabPages.Remove(TpPwmSettings); } @@ -147,7 +147,7 @@ private void InitCoreCB() } private void InitPwmTab() - { + { CBPwmSel.BeginUpdate(); CBPwmSel.Items.Add(GrblCore.PwmMode.Spindle); CBPwmSel.Items.Add(GrblCore.PwmMode.Fan); diff --git a/LaserGRBL/SvgConverter/gcodeRelated.cs b/LaserGRBL/SvgConverter/gcodeRelated.cs index 9d317d132..fd442915e 100644 --- a/LaserGRBL/SvgConverter/gcodeRelated.cs +++ b/LaserGRBL/SvgConverter/gcodeRelated.cs @@ -93,7 +93,7 @@ public static void setup(GrblCore core) lastx = -1; lasty = -1; lastz = 0; lasts = -1 ; lastg = -1; if(firmwareType == Firmware.Marlin) - { + { pwmMode = Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle); ; fanId = Settings.GetObject("Pwm FanId", 0); try From 456be4b96801e11f7c74eb5635319f888cba91c4 Mon Sep 17 00:00:00 2001 From: Philipp von den Hoff Date: Sat, 12 Mar 2022 09:44:52 +0100 Subject: [PATCH 04/10] remove dynamic Laser mode for marlin && fan pwm --- .../ConvertSizeAndOptionForm.cs | 27 +++++++++---------- .../SvgConverter/ConvertSizeAndOptionForm.cs | 26 +++++++++++------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.cs b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.cs index 85a121dc3..ed8b1d6f2 100644 --- a/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.cs +++ b/LaserGRBL/RasterConverter/ConvertSizeAndOptionForm.cs @@ -21,7 +21,7 @@ public partial class ConvertSizeAndOptionForm : Form GrblCore mCore; bool supportPWM = Settings.GetObject("Support Hardware PWM", true); - public ComboboxItem[] LaserOptions = new ComboboxItem[] { new ComboboxItem("M3 - Constant Power", "M3"), new ComboboxItem("M4 - Dynamic Power", "M4"), new ComboboxItem("M106 - Fan Dynamic Power", "M106") }; + public ComboboxItem[] LaserOptions = new ComboboxItem[] { new ComboboxItem("M3 - Constant Power", "M3"), new ComboboxItem("M4 - Dynamic Power", "M4"), new ComboboxItem("M106 - Fan Constant Power", "M106") }; public class ComboboxItem { public string Text { get; set; } @@ -48,13 +48,13 @@ public ConvertSizeAndOptionForm(GrblCore core) LblMaxPerc.Visible = LblMinPerc.Visible = LblSmin.Visible = LblSmax.Visible = IIMaxPower.Visible = IIMinPower.Visible = BtnModulationInfo.Visible = supportPWM; AssignMinMaxLimit(); - CBLaserON.Items.Add(LaserOptions[0]); if (Settings.GetObject("Firmware Type", Firmware.Grbl) == Firmware.Marlin && Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle) == GrblCore.PwmMode.Fan) { CBLaserON.Items.Add(LaserOptions[2]); } else { + CBLaserON.Items.Add(LaserOptions[0]); CBLaserON.Items.Add(LaserOptions[1]); } } @@ -98,25 +98,22 @@ public void ShowDialog(Form parent, ImageProcessor processor) IP.LaserOn = Settings.GetObject("GrayScaleConversion.Gcode.LaserOptions.LaserOn", "M3"); - if (IP.LaserOn == "M3" || !mCore.Configuration.LaserMode) + if (Settings.GetObject("Firmware Type", Firmware.Grbl) == Firmware.Marlin && Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle) == GrblCore.PwmMode.Fan) + { + CBLaserON.SelectedItem = LaserOptions[2]; + IP.LaserOn = "M106"; + IP.LaserOff = "M107"; + } + else if (IP.LaserOn == "M3" || !mCore.Configuration.LaserMode) { CBLaserON.SelectedItem = LaserOptions[0]; IP.LaserOff = "M5"; } else { - if (Settings.GetObject("Firmware Type", Firmware.Grbl) == Firmware.Marlin && Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle) == GrblCore.PwmMode.Fan) - { - CBLaserON.SelectedItem = LaserOptions[2]; - IP.LaserOn = "M106"; - IP.LaserOff = "M107"; - } - else - { - CBLaserON.SelectedItem = LaserOptions[1]; - IP.LaserOn = "M4"; - IP.LaserOff = "M5"; - } + CBLaserON.SelectedItem = LaserOptions[1]; + IP.LaserOn = "M4"; + IP.LaserOff = "M5"; } IIMinPower.CurrentValue = IP.MinPower = Settings.GetObject("GrayScaleConversion.Gcode.LaserOptions.PowerMin", 0); diff --git a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.cs b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.cs index 653e371cb..8f3124cc3 100644 --- a/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.cs +++ b/LaserGRBL/SvgConverter/ConvertSizeAndOptionForm.cs @@ -19,7 +19,7 @@ public partial class SvgToGCodeForm : Form GrblCore mCore; bool supportPWM = Settings.GetObject("Support Hardware PWM", true); - public ComboboxItem[] LaserOptions = new ComboboxItem[] { new ComboboxItem("M3 - Constant Power", "M3"), new ComboboxItem("M4 - Dynamic Power", "M4"), new ComboboxItem("M106 - Dynamic Power", "M106") }; + public ComboboxItem[] LaserOptions = new ComboboxItem[] { new ComboboxItem("M3 - Constant Power", "M3"), new ComboboxItem("M4 - Dynamic Power", "M4"), new ComboboxItem("M106 - Fan Constant Power", "M106") }; public class ComboboxItem { public string Text { get; set; } @@ -44,7 +44,16 @@ internal static void CreateAndShowDialog(GrblCore core, string filename, Form pa Settings.SetObject("GrayScaleConversion.VectorizeOptions.BorderSpeed", f.IIBorderTracing.CurrentValue); Settings.SetObject("GrayScaleConversion.Gcode.LaserOptions.PowerMax", f.IIMaxPower.CurrentValue); Settings.SetObject("GrayScaleConversion.Gcode.LaserOptions.PowerMin", f.IIMinPower.CurrentValue); - Settings.SetObject("GrayScaleConversion.Gcode.LaserOptions.LaserOn", (f.CBLaserON.SelectedItem as ComboboxItem).Value); + if ((f.CBLaserON.SelectedItem as ComboboxItem).Value == "M106") + { + Settings.SetObject("GrayScaleConversion.Gcode.LaserOptions.LaserOn", (f.CBLaserON.SelectedItem as ComboboxItem).Value); + Settings.SetObject("GrayScaleConversion.Gcode.LaserOptions.LaserOff", "M107"); + } + else + { + Settings.SetObject("GrayScaleConversion.Gcode.LaserOptions.LaserOn", (f.CBLaserON.SelectedItem as ComboboxItem).Value); + Settings.SetObject("GrayScaleConversion.Gcode.LaserOptions.LaserOff", "M5"); + } core.LoadedFile.LoadImportedSVG(filename, append, core); } @@ -62,14 +71,13 @@ private SvgToGCodeForm(GrblCore core, string filename, bool append) LblSmin.Visible = LblSmax.Visible = IIMaxPower.Visible = IIMinPower.Visible = BtnModulationInfo.Visible = supportPWM; AssignMinMaxLimit(); - - CBLaserON.Items.Add(LaserOptions[0]); if (Settings.GetObject("Firmware Type", Firmware.Grbl) == Firmware.Marlin && Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle) == GrblCore.PwmMode.Fan) { CBLaserON.Items.Add(LaserOptions[2]); } else { + CBLaserON.Items.Add(LaserOptions[0]); CBLaserON.Items.Add(LaserOptions[1]); } } @@ -85,15 +93,13 @@ public void ShowDialogForm(Form parent) IIBorderTracing.CurrentValue = Settings.GetObject("GrayScaleConversion.VectorizeOptions.BorderSpeed", 1000); string LaserOn = Settings.GetObject("GrayScaleConversion.Gcode.LaserOptions.LaserOn", "M3"); - - if (LaserOn == "M3" || !mCore.Configuration.LaserMode) + if (Settings.GetObject("Firmware Type", Firmware.Grbl) == Firmware.Marlin && Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle) == GrblCore.PwmMode.Fan) + CBLaserON.SelectedItem = LaserOptions[2]; + else if (LaserOn == "M3" || !mCore.Configuration.LaserMode) CBLaserON.SelectedItem = LaserOptions[0]; else { - if (Settings.GetObject("Firmware Type", Firmware.Grbl) == Firmware.Marlin && Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle) == GrblCore.PwmMode.Fan) - CBLaserON.SelectedItem = LaserOptions[2]; - else - CBLaserON.SelectedItem = LaserOptions[1]; + CBLaserON.SelectedItem = LaserOptions[1]; } IIMinPower.CurrentValue = Settings.GetObject("GrayScaleConversion.Gcode.LaserOptions.PowerMin", 0); From 538ada0ba3bb0af47126164487d44512a10fdcfc Mon Sep 17 00:00:00 2001 From: Philipp von den Hoff Date: Sat, 12 Mar 2022 11:08:30 +0100 Subject: [PATCH 05/10] fix string index --- LaserGRBL/Core/MarlinCore.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LaserGRBL/Core/MarlinCore.cs b/LaserGRBL/Core/MarlinCore.cs index d97da12f2..b7578c28e 100644 --- a/LaserGRBL/Core/MarlinCore.cs +++ b/LaserGRBL/Core/MarlinCore.cs @@ -80,7 +80,7 @@ public override List getSpindleGcode(SpindleState state, int power) if(state == SpindleState.ON) LaserCmd.Add(String.Format("{0} S{1} P{2}", mSpindleConfig.lOn , power, mSpindleConfig.fanId)); //laser on and power to zero else - LaserCmd.Add(String.Format("{0} P{2}", mSpindleConfig.lOff, mSpindleConfig.fanId)); //laser on and power to zero + LaserCmd.Add(String.Format("{0} P{1}", mSpindleConfig.lOff, mSpindleConfig.fanId)); //laser on and power to zero if (state == SpindleState.ON && power > 0) LaserCmd.Add(String.Format("G4 P{0}", mSpindleConfig.dwelltime)); } From cdcc6f36aa5a4dcfd81a15aef48c94a5714a727a Mon Sep 17 00:00:00 2001 From: Philipp von den Hoff Date: Tue, 15 Mar 2022 21:14:17 +0100 Subject: [PATCH 06/10] Added stop button --- LaserGRBL/Core/GrblCore.cs | 4 ++-- LaserGRBL/Core/MarlinCore.cs | 22 +++++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/LaserGRBL/Core/GrblCore.cs b/LaserGRBL/Core/GrblCore.cs index ed2a37dfe..18daefc6c 100644 --- a/LaserGRBL/Core/GrblCore.cs +++ b/LaserGRBL/Core/GrblCore.cs @@ -279,7 +279,7 @@ public int OrturFWVersionNumber private System.Windows.Forms.Control syncro; protected ComWrapper.IComWrapper com; private GrblFile file; - private System.Collections.Generic.Queue mQueue; //vera coda di quelli da mandare + protected System.Collections.Generic.Queue mQueue; //vera coda di quelli da mandare private GrblCommand mRetryQueue; //coda[1] di quelli in attesa di risposta private System.Collections.Generic.Queue mPending; //coda di quelli in attesa di risposta private System.Collections.Generic.List mSent; //lista di quelli mandati @@ -1242,7 +1242,7 @@ public void CycleStartResume(bool auto) } } - public void FeedHold(bool auto) + public virtual void FeedHold(bool auto) { if (CanFeedHold) { diff --git a/LaserGRBL/Core/MarlinCore.cs b/LaserGRBL/Core/MarlinCore.cs index b7578c28e..f9c58ceb5 100644 --- a/LaserGRBL/Core/MarlinCore.cs +++ b/LaserGRBL/Core/MarlinCore.cs @@ -116,7 +116,27 @@ protected override void DetectHang() } } - protected override void ManageReceivedLine(string rline) + public override void FeedHold(bool auto) + { + if (CanFeedHold) + { + mHoldByUserRequest = !auto; + GrblCommand stop = null; + if (Settings.GetObject("Firmware Type", Firmware.Grbl) == Firmware.Marlin && Settings.GetObject("Pwm Selection", GrblCore.PwmMode.Spindle) == GrblCore.PwmMode.Fan) + { + stop = new GrblCommand("M107"); + } + else + { + stop = new GrblCommand("M5"); + } + mQueue.Clear(); //flush the queue of item to send + mQueue.Enqueue(stop); //shut down laser + mQueue.Enqueue(new GrblCommand("M112")); + } + } + + protected override void ManageReceivedLine(string rline) { if (IsMarlinRealTimeStatusMessage(rline)) ManageMarlinRealTimeStatus(rline); From 8636954800788473e4b87e6797eb9415586a7322 Mon Sep 17 00:00:00 2001 From: Philipp von den Hoff Date: Wed, 30 Mar 2022 08:43:59 +0200 Subject: [PATCH 07/10] rename label variables --- LaserGRBL/SettingsForm.Designer.cs | 230 ++++++++++++++--------------- LaserGRBL/SettingsForm.resx | 80 +++++----- 2 files changed, 161 insertions(+), 149 deletions(-) diff --git a/LaserGRBL/SettingsForm.Designer.cs b/LaserGRBL/SettingsForm.Designer.cs index 26215db14..165a6a26a 100644 --- a/LaserGRBL/SettingsForm.Designer.cs +++ b/LaserGRBL/SettingsForm.Designer.cs @@ -40,12 +40,9 @@ private void InitializeComponent() this.CbThreadingMode = new System.Windows.Forms.ComboBox(); this.label4 = new System.Windows.Forms.Label(); this.CBStreamingMode = new System.Windows.Forms.ComboBox(); - this.BtnStreamingMode = new LaserGRBL.UserControls.ImageButton(); this.CBProtocol = new System.Windows.Forms.ComboBox(); this.label3 = new System.Windows.Forms.Label(); - this.BtnProtocol = new LaserGRBL.UserControls.ImageButton(); this.label6 = new System.Windows.Forms.Label(); - this.BtnThreadingModel = new LaserGRBL.UserControls.ImageButton(); this.CbIssueDetector = new System.Windows.Forms.CheckBox(); this.label7 = new System.Windows.Forms.Label(); this.CbSoftReset = new System.Windows.Forms.CheckBox(); @@ -53,14 +50,12 @@ private void InitializeComponent() this.CbHardReset = new System.Windows.Forms.CheckBox(); this.label8 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); - this.BtnFType = new LaserGRBL.UserControls.ImageButton(); this.TpRasterImport = new System.Windows.Forms.TabPage(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); this.label1 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.CbUnidirectional = new System.Windows.Forms.CheckBox(); this.CBSupportPWM = new System.Windows.Forms.CheckBox(); - this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); this.CbHiRes = new System.Windows.Forms.CheckBox(); this.label22 = new System.Windows.Forms.Label(); this.CbDisableSkip = new System.Windows.Forms.CheckBox(); @@ -71,7 +66,6 @@ private void InitializeComponent() this.tableLayoutPanel18 = new System.Windows.Forms.TableLayoutPanel(); this.label43 = new System.Windows.Forms.Label(); this.CbSmartBezier = new System.Windows.Forms.CheckBox(); - this.imageButton1 = new LaserGRBL.UserControls.ImageButton(); this.TpJogControl = new System.Windows.Forms.TabPage(); this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); this.label10 = new System.Windows.Forms.Label(); @@ -157,7 +151,6 @@ private void InitializeComponent() this.label36 = new System.Windows.Forms.Label(); this.label28 = new System.Windows.Forms.Label(); this.tableLayoutPanel17 = new System.Windows.Forms.TableLayoutPanel(); - this.BtnTelegNoteInfo = new LaserGRBL.UserControls.ImageButton(); this.label31 = new System.Windows.Forms.Label(); this.label33 = new System.Windows.Forms.Label(); this.TxtNotification = new System.Windows.Forms.TextBox(); @@ -166,12 +159,19 @@ private void InitializeComponent() this.TpPwmSettings = new System.Windows.Forms.TabPage(); this.tableLayoutPanel19 = new System.Windows.Forms.TableLayoutPanel(); this.CBPwmSel = new System.Windows.Forms.ComboBox(); - this.label44 = new System.Windows.Forms.Label(); + this.label_select_pwm_cmd = new System.Windows.Forms.Label(); this.CBFanIdx = new System.Windows.Forms.ComboBox(); - this.label45 = new System.Windows.Forms.Label(); + this.label_fan_index = new System.Windows.Forms.Label(); this.TBDwell = new System.Windows.Forms.TextBox(); - this.label46 = new System.Windows.Forms.Label(); + this.label_dwell_time = new System.Windows.Forms.Label(); this.SoundBrowserDialog = new System.Windows.Forms.OpenFileDialog(); + this.BtnStreamingMode = new LaserGRBL.UserControls.ImageButton(); + this.BtnProtocol = new LaserGRBL.UserControls.ImageButton(); + this.BtnThreadingModel = new LaserGRBL.UserControls.ImageButton(); + this.BtnFType = new LaserGRBL.UserControls.ImageButton(); + this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); + this.imageButton1 = new LaserGRBL.UserControls.ImageButton(); + this.BtnTelegNoteInfo = new LaserGRBL.UserControls.ImageButton(); this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.MainTabPage.SuspendLayout(); @@ -305,19 +305,6 @@ private void InitializeComponent() this.CBStreamingMode.FormattingEnabled = true; this.CBStreamingMode.Name = "CBStreamingMode"; // - // BtnStreamingMode - // - this.BtnStreamingMode.AltImage = null; - this.BtnStreamingMode.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnStreamingMode.Caption = null; - this.BtnStreamingMode.Coloration = System.Drawing.Color.Empty; - this.BtnStreamingMode.Image = ((System.Drawing.Image)(resources.GetObject("BtnStreamingMode.Image"))); - resources.ApplyResources(this.BtnStreamingMode, "BtnStreamingMode"); - this.BtnStreamingMode.Name = "BtnStreamingMode"; - this.BtnStreamingMode.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnStreamingMode.UseAltImage = false; - this.BtnStreamingMode.Click += new System.EventHandler(this.BtnStreamingMode_Click); - // // CBProtocol // resources.ApplyResources(this.CBProtocol, "CBProtocol"); @@ -330,37 +317,11 @@ private void InitializeComponent() resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; // - // BtnProtocol - // - this.BtnProtocol.AltImage = null; - this.BtnProtocol.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnProtocol.Caption = null; - this.BtnProtocol.Coloration = System.Drawing.Color.Empty; - this.BtnProtocol.Image = ((System.Drawing.Image)(resources.GetObject("BtnProtocol.Image"))); - resources.ApplyResources(this.BtnProtocol, "BtnProtocol"); - this.BtnProtocol.Name = "BtnProtocol"; - this.BtnProtocol.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnProtocol.UseAltImage = false; - this.BtnProtocol.Click += new System.EventHandler(this.BtnProtocol_Click); - // // label6 // resources.ApplyResources(this.label6, "label6"); this.label6.Name = "label6"; // - // BtnThreadingModel - // - this.BtnThreadingModel.AltImage = null; - this.BtnThreadingModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnThreadingModel.Caption = null; - this.BtnThreadingModel.Coloration = System.Drawing.Color.Empty; - this.BtnThreadingModel.Image = ((System.Drawing.Image)(resources.GetObject("BtnThreadingModel.Image"))); - resources.ApplyResources(this.BtnThreadingModel, "BtnThreadingModel"); - this.BtnThreadingModel.Name = "BtnThreadingModel"; - this.BtnThreadingModel.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnThreadingModel.UseAltImage = false; - this.BtnThreadingModel.Click += new System.EventHandler(this.BtnThreadingModel_Click); - // // CbIssueDetector // resources.ApplyResources(this.CbIssueDetector, "CbIssueDetector"); @@ -399,19 +360,6 @@ private void InitializeComponent() resources.ApplyResources(this.label9, "label9"); this.label9.Name = "label9"; // - // BtnFType - // - this.BtnFType.AltImage = null; - this.BtnFType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnFType.Caption = null; - this.BtnFType.Coloration = System.Drawing.Color.Empty; - this.BtnFType.Image = ((System.Drawing.Image)(resources.GetObject("BtnFType.Image"))); - resources.ApplyResources(this.BtnFType, "BtnFType"); - this.BtnFType.Name = "BtnFType"; - this.BtnFType.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnFType.UseAltImage = false; - this.BtnFType.Click += new System.EventHandler(this.BtnFType_Click); - // // TpRasterImport // this.TpRasterImport.Controls.Add(this.tableLayoutPanel4); @@ -457,19 +405,6 @@ private void InitializeComponent() this.CBSupportPWM.Name = "CBSupportPWM"; this.CBSupportPWM.UseVisualStyleBackColor = true; // - // BtnModulationInfo - // - this.BtnModulationInfo.AltImage = null; - this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnModulationInfo.Caption = null; - this.BtnModulationInfo.Coloration = System.Drawing.Color.Empty; - this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); - resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); - this.BtnModulationInfo.Name = "BtnModulationInfo"; - this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnModulationInfo.UseAltImage = false; - this.BtnModulationInfo.Click += new System.EventHandler(this.BtnModulationInfo_Click); - // // CbHiRes // resources.ApplyResources(this.CbHiRes, "CbHiRes"); @@ -529,18 +464,6 @@ private void InitializeComponent() this.CbSmartBezier.Name = "CbSmartBezier"; this.CbSmartBezier.UseVisualStyleBackColor = true; // - // imageButton1 - // - this.imageButton1.AltImage = null; - this.imageButton1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.imageButton1.Caption = null; - this.imageButton1.Coloration = System.Drawing.Color.Empty; - this.imageButton1.Image = ((System.Drawing.Image)(resources.GetObject("imageButton1.Image"))); - resources.ApplyResources(this.imageButton1, "imageButton1"); - this.imageButton1.Name = "imageButton1"; - this.imageButton1.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.imageButton1.UseAltImage = false; - // // TpJogControl // this.TpJogControl.Controls.Add(this.tableLayoutPanel5); @@ -1093,19 +1016,6 @@ private void InitializeComponent() this.tableLayoutPanel17.Controls.Add(this.BtnTestNotification, 2, 1); this.tableLayoutPanel17.Name = "tableLayoutPanel17"; // - // BtnTelegNoteInfo - // - this.BtnTelegNoteInfo.AltImage = null; - this.BtnTelegNoteInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnTelegNoteInfo.Caption = null; - this.BtnTelegNoteInfo.Coloration = System.Drawing.Color.Empty; - this.BtnTelegNoteInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnTelegNoteInfo.Image"))); - resources.ApplyResources(this.BtnTelegNoteInfo, "BtnTelegNoteInfo"); - this.BtnTelegNoteInfo.Name = "BtnTelegNoteInfo"; - this.BtnTelegNoteInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnTelegNoteInfo.UseAltImage = false; - this.BtnTelegNoteInfo.Click += new System.EventHandler(this.BtnTelegNoteInfo_Click); - // // label31 // resources.ApplyResources(this.label31, "label31"); @@ -1147,11 +1057,11 @@ private void InitializeComponent() // resources.ApplyResources(this.tableLayoutPanel19, "tableLayoutPanel19"); this.tableLayoutPanel19.Controls.Add(this.CBPwmSel, 1, 0); - this.tableLayoutPanel19.Controls.Add(this.label44, 2, 0); + this.tableLayoutPanel19.Controls.Add(this.label_select_pwm_cmd, 2, 0); this.tableLayoutPanel19.Controls.Add(this.CBFanIdx, 1, 1); - this.tableLayoutPanel19.Controls.Add(this.label45, 2, 1); + this.tableLayoutPanel19.Controls.Add(this.label_fan_index, 2, 1); this.tableLayoutPanel19.Controls.Add(this.TBDwell, 1, 2); - this.tableLayoutPanel19.Controls.Add(this.label46, 2, 2); + this.tableLayoutPanel19.Controls.Add(this.label_dwell_time, 2, 2); this.tableLayoutPanel19.Name = "tableLayoutPanel19"; // // CBPwmSel @@ -1160,10 +1070,10 @@ private void InitializeComponent() this.CBPwmSel.FormattingEnabled = true; this.CBPwmSel.Name = "CBPwmSel"; // - // label44 + // label_select_pwm_cmd // - resources.ApplyResources(this.label44, "label44"); - this.label44.Name = "label44"; + resources.ApplyResources(this.label_select_pwm_cmd, "label_select_pwm_cmd"); + this.label_select_pwm_cmd.Name = "label_select_pwm_cmd"; // // CBFanIdx // @@ -1171,25 +1081,115 @@ private void InitializeComponent() this.CBFanIdx.FormattingEnabled = true; this.CBFanIdx.Name = "CBFanIdx"; // - // label45 + // label_fan_index // - resources.ApplyResources(this.label45, "label45"); - this.label45.Name = "label45"; + resources.ApplyResources(this.label_fan_index, "label_fan_index"); + this.label_fan_index.Name = "label_fan_index"; // // TBDwell // resources.ApplyResources(this.TBDwell, "TBDwell"); this.TBDwell.Name = "TBDwell"; // - // label46 + // label_dwell_time // - resources.ApplyResources(this.label46, "label46"); - this.label46.Name = "label46"; + resources.ApplyResources(this.label_dwell_time, "label_dwell_time"); + this.label_dwell_time.Name = "label_dwell_time"; // // SoundBrowserDialog // resources.ApplyResources(this.SoundBrowserDialog, "SoundBrowserDialog"); // + // BtnStreamingMode + // + this.BtnStreamingMode.AltImage = null; + this.BtnStreamingMode.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnStreamingMode.Caption = null; + this.BtnStreamingMode.Coloration = System.Drawing.Color.Empty; + this.BtnStreamingMode.Image = ((System.Drawing.Image)(resources.GetObject("BtnStreamingMode.Image"))); + resources.ApplyResources(this.BtnStreamingMode, "BtnStreamingMode"); + this.BtnStreamingMode.Name = "BtnStreamingMode"; + this.BtnStreamingMode.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnStreamingMode.UseAltImage = false; + this.BtnStreamingMode.Click += new System.EventHandler(this.BtnStreamingMode_Click); + // + // BtnProtocol + // + this.BtnProtocol.AltImage = null; + this.BtnProtocol.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnProtocol.Caption = null; + this.BtnProtocol.Coloration = System.Drawing.Color.Empty; + this.BtnProtocol.Image = ((System.Drawing.Image)(resources.GetObject("BtnProtocol.Image"))); + resources.ApplyResources(this.BtnProtocol, "BtnProtocol"); + this.BtnProtocol.Name = "BtnProtocol"; + this.BtnProtocol.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnProtocol.UseAltImage = false; + this.BtnProtocol.Click += new System.EventHandler(this.BtnProtocol_Click); + // + // BtnThreadingModel + // + this.BtnThreadingModel.AltImage = null; + this.BtnThreadingModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnThreadingModel.Caption = null; + this.BtnThreadingModel.Coloration = System.Drawing.Color.Empty; + this.BtnThreadingModel.Image = ((System.Drawing.Image)(resources.GetObject("BtnThreadingModel.Image"))); + resources.ApplyResources(this.BtnThreadingModel, "BtnThreadingModel"); + this.BtnThreadingModel.Name = "BtnThreadingModel"; + this.BtnThreadingModel.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnThreadingModel.UseAltImage = false; + this.BtnThreadingModel.Click += new System.EventHandler(this.BtnThreadingModel_Click); + // + // BtnFType + // + this.BtnFType.AltImage = null; + this.BtnFType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnFType.Caption = null; + this.BtnFType.Coloration = System.Drawing.Color.Empty; + this.BtnFType.Image = ((System.Drawing.Image)(resources.GetObject("BtnFType.Image"))); + resources.ApplyResources(this.BtnFType, "BtnFType"); + this.BtnFType.Name = "BtnFType"; + this.BtnFType.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnFType.UseAltImage = false; + this.BtnFType.Click += new System.EventHandler(this.BtnFType_Click); + // + // BtnModulationInfo + // + this.BtnModulationInfo.AltImage = null; + this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnModulationInfo.Caption = null; + this.BtnModulationInfo.Coloration = System.Drawing.Color.Empty; + this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); + resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); + this.BtnModulationInfo.Name = "BtnModulationInfo"; + this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnModulationInfo.UseAltImage = false; + this.BtnModulationInfo.Click += new System.EventHandler(this.BtnModulationInfo_Click); + // + // imageButton1 + // + this.imageButton1.AltImage = null; + this.imageButton1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.imageButton1.Caption = null; + this.imageButton1.Coloration = System.Drawing.Color.Empty; + this.imageButton1.Image = ((System.Drawing.Image)(resources.GetObject("imageButton1.Image"))); + resources.ApplyResources(this.imageButton1, "imageButton1"); + this.imageButton1.Name = "imageButton1"; + this.imageButton1.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.imageButton1.UseAltImage = false; + // + // BtnTelegNoteInfo + // + this.BtnTelegNoteInfo.AltImage = null; + this.BtnTelegNoteInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnTelegNoteInfo.Caption = null; + this.BtnTelegNoteInfo.Coloration = System.Drawing.Color.Empty; + this.BtnTelegNoteInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnTelegNoteInfo.Image"))); + resources.ApplyResources(this.BtnTelegNoteInfo, "BtnTelegNoteInfo"); + this.BtnTelegNoteInfo.Name = "BtnTelegNoteInfo"; + this.BtnTelegNoteInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnTelegNoteInfo.UseAltImage = false; + this.BtnTelegNoteInfo.Click += new System.EventHandler(this.BtnTelegNoteInfo_Click); + // // SettingsForm // resources.ApplyResources(this, "$this"); @@ -1403,10 +1403,10 @@ private void InitializeComponent() private System.Windows.Forms.TabPage TpPwmSettings; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel19; private System.Windows.Forms.ComboBox CBPwmSel; - private System.Windows.Forms.Label label44; + private System.Windows.Forms.Label label_select_pwm_cmd; private System.Windows.Forms.ComboBox CBFanIdx; - private System.Windows.Forms.Label label45; + private System.Windows.Forms.Label label_fan_index; private System.Windows.Forms.TextBox TBDwell; - private System.Windows.Forms.Label label46; + private System.Windows.Forms.Label label_dwell_time; } } \ No newline at end of file diff --git a/LaserGRBL/SettingsForm.resx b/LaserGRBL/SettingsForm.resx index cce14b1fa..8e727f753 100644 --- a/LaserGRBL/SettingsForm.resx +++ b/LaserGRBL/SettingsForm.resx @@ -4630,36 +4630,39 @@ Obtain your personal code and write it here! 0 - + True - + Fill - + + NoControl + + 177, 1 - + 705, 39 - + 1 - + Select PWM command: - Spindle: Use spindle M3/M5/M5 commads to drive the PWM. - Fan: Use the M106/M107 commands to drive the PWM. - - label44 + + label_select_pwm_cmd - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tableLayoutPanel19 - + 1 @@ -4686,35 +4689,38 @@ Obtain your personal code and write it here! 2 - + True - + Fill - + + NoControl + + 177, 41 - + 705, 27 - + 3 - + Fan Index: Select the fan which drives the PWM for the laser - - label45 + + label_fan_index - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tableLayoutPanel19 - + 3 @@ -4741,35 +4747,38 @@ Select the fan which drives the PWM for the laser 4 - + True - + Fill - + + NoControl + + 177, 69 - + 705, 270 - + 5 - + Laser start time [ms]: sets the laser start time - - label46 + + label_dwell_time - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tableLayoutPanel19 - + 5 @@ -4800,7 +4809,7 @@ sets the laser start time 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="CBPwmSel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label44" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="CBFanIdx" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label45" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="TBDwell" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label46" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Absolute,23,Absolute,148,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="CBPwmSel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label_select_pwm_cmd" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="CBFanIdx" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label_fan_index" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="TBDwell" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label_dwell_time" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Absolute,23,Absolute,148,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> 4, 22 @@ -8410,6 +8419,9 @@ sets the laser start time AAAAAAAAAAAAAAAAAAAAAAAA + + NoControl + CenterParent From 0ca5ea3c322a5181bc974f85809a0a8115344300 Mon Sep 17 00:00:00 2001 From: Philipp von den Hoff Date: Wed, 30 Mar 2022 09:08:44 +0200 Subject: [PATCH 08/10] rename table layout for merge --- LaserGRBL/SettingsForm.Designer.cs | 30 +++++++++++------------ LaserGRBL/SettingsForm.resx | 38 +++++++++++++++--------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/LaserGRBL/SettingsForm.Designer.cs b/LaserGRBL/SettingsForm.Designer.cs index 165a6a26a..c464ed4c2 100644 --- a/LaserGRBL/SettingsForm.Designer.cs +++ b/LaserGRBL/SettingsForm.Designer.cs @@ -157,7 +157,7 @@ private void InitializeComponent() this.BtnTestNotification = new System.Windows.Forms.Button(); this.label42 = new System.Windows.Forms.Label(); this.TpPwmSettings = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel19 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanelPwmSettings = new System.Windows.Forms.TableLayoutPanel(); this.CBPwmSel = new System.Windows.Forms.ComboBox(); this.label_select_pwm_cmd = new System.Windows.Forms.Label(); this.CBFanIdx = new System.Windows.Forms.ComboBox(); @@ -203,7 +203,7 @@ private void InitializeComponent() this.tableLayoutPanel13.SuspendLayout(); this.tableLayoutPanel17.SuspendLayout(); this.TpPwmSettings.SuspendLayout(); - this.tableLayoutPanel19.SuspendLayout(); + this.tableLayoutPanelPwmSettings.SuspendLayout(); this.SuspendLayout(); // // tableLayoutPanel1 @@ -1048,21 +1048,21 @@ private void InitializeComponent() // // TpPwmSettings // - this.TpPwmSettings.Controls.Add(this.tableLayoutPanel19); + this.TpPwmSettings.Controls.Add(this.tableLayoutPanelPwmSettings); resources.ApplyResources(this.TpPwmSettings, "TpPwmSettings"); this.TpPwmSettings.Name = "TpPwmSettings"; this.TpPwmSettings.UseVisualStyleBackColor = true; // - // tableLayoutPanel19 + // tableLayoutPanelPwmSettings // - resources.ApplyResources(this.tableLayoutPanel19, "tableLayoutPanel19"); - this.tableLayoutPanel19.Controls.Add(this.CBPwmSel, 1, 0); - this.tableLayoutPanel19.Controls.Add(this.label_select_pwm_cmd, 2, 0); - this.tableLayoutPanel19.Controls.Add(this.CBFanIdx, 1, 1); - this.tableLayoutPanel19.Controls.Add(this.label_fan_index, 2, 1); - this.tableLayoutPanel19.Controls.Add(this.TBDwell, 1, 2); - this.tableLayoutPanel19.Controls.Add(this.label_dwell_time, 2, 2); - this.tableLayoutPanel19.Name = "tableLayoutPanel19"; + resources.ApplyResources(this.tableLayoutPanelPwmSettings, "tableLayoutPanelPwmSettings"); + this.tableLayoutPanelPwmSettings.Controls.Add(this.CBPwmSel, 1, 0); + this.tableLayoutPanelPwmSettings.Controls.Add(this.label_select_pwm_cmd, 2, 0); + this.tableLayoutPanelPwmSettings.Controls.Add(this.CBFanIdx, 1, 1); + this.tableLayoutPanelPwmSettings.Controls.Add(this.label_fan_index, 2, 1); + this.tableLayoutPanelPwmSettings.Controls.Add(this.TBDwell, 1, 2); + this.tableLayoutPanelPwmSettings.Controls.Add(this.label_dwell_time, 2, 2); + this.tableLayoutPanelPwmSettings.Name = "tableLayoutPanelPwmSettings"; // // CBPwmSel // @@ -1256,8 +1256,8 @@ private void InitializeComponent() this.tableLayoutPanel17.ResumeLayout(false); this.tableLayoutPanel17.PerformLayout(); this.TpPwmSettings.ResumeLayout(false); - this.tableLayoutPanel19.ResumeLayout(false); - this.tableLayoutPanel19.PerformLayout(); + this.tableLayoutPanelPwmSettings.ResumeLayout(false); + this.tableLayoutPanelPwmSettings.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -1401,7 +1401,7 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CbSmartBezier; private UserControls.ImageButton imageButton1; private System.Windows.Forms.TabPage TpPwmSettings; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel19; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanelPwmSettings; private System.Windows.Forms.ComboBox CBPwmSel; private System.Windows.Forms.Label label_select_pwm_cmd; private System.Windows.Forms.ComboBox CBFanIdx; diff --git a/LaserGRBL/SettingsForm.resx b/LaserGRBL/SettingsForm.resx index 8e727f753..0e1be6638 100644 --- a/LaserGRBL/SettingsForm.resx +++ b/LaserGRBL/SettingsForm.resx @@ -4600,10 +4600,10 @@ Obtain your personal code and write it here! 6 - + Single - + 3 @@ -4625,7 +4625,7 @@ Obtain your personal code and write it here! System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tableLayoutPanel19 + tableLayoutPanelPwmSettings 0 @@ -4660,7 +4660,7 @@ Obtain your personal code and write it here! System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tableLayoutPanel19 + tableLayoutPanelPwmSettings 1 @@ -4684,7 +4684,7 @@ Obtain your personal code and write it here! System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tableLayoutPanel19 + tableLayoutPanelPwmSettings 2 @@ -4718,7 +4718,7 @@ Select the fan which drives the PWM for the laser System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tableLayoutPanel19 + tableLayoutPanelPwmSettings 3 @@ -4742,7 +4742,7 @@ Select the fan which drives the PWM for the laser System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tableLayoutPanel19 + tableLayoutPanelPwmSettings 4 @@ -4776,39 +4776,39 @@ sets the laser start time System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tableLayoutPanel19 + tableLayoutPanelPwmSettings 5 - + Fill - + 3, 3 - + 3 - + 886, 340 - + 0 - - tableLayoutPanel19 + + tableLayoutPanelPwmSettings - + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TpPwmSettings - + 0 - + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="CBPwmSel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label_select_pwm_cmd" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="CBFanIdx" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label_fan_index" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="TBDwell" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label_dwell_time" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Absolute,23,Absolute,148,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> From d2d45d1bb5c432bfa75bb0a41fb472950d68446d Mon Sep 17 00:00:00 2001 From: Philipp von den Hoff Date: Sun, 2 Oct 2022 19:59:08 +0200 Subject: [PATCH 09/10] Fix busy bug --- LaserGRBL/Core/MarlinCore.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/LaserGRBL/Core/MarlinCore.cs b/LaserGRBL/Core/MarlinCore.cs index f9c58ceb5..de4d9b6d3 100644 --- a/LaserGRBL/Core/MarlinCore.cs +++ b/LaserGRBL/Core/MarlinCore.cs @@ -48,6 +48,10 @@ protected override void ParseMachineStatus(string data) if (data.Contains("ok")) var = MacStatus.Idle; + if (data.Contains("echo:busy:") || data.Contains("echo: busy:")) + { + var = MacStatus.Run; + } //try { var = (MacStatus)Enum.Parse(typeof(MacStatus), data); } //catch (Exception ex) { Logger.LogException("ParseMachineStatus", ex); } @@ -140,6 +144,11 @@ protected override void ManageReceivedLine(string rline) { if (IsMarlinRealTimeStatusMessage(rline)) ManageMarlinRealTimeStatus(rline); + else if(rline.Contains("echo:busy:") || rline.Contains("echo: busy:")) + { + SetStatus(MacStatus.Run); + debugLastStatusDelay.Start(); + } else base.ManageReceivedLine(rline); } From 0ae3bd01d047cb2e427c13ffc4e95be2083ef990 Mon Sep 17 00:00:00 2001 From: Philipp von den Hoff Date: Sun, 2 Oct 2022 23:02:03 +0200 Subject: [PATCH 10/10] Fix merge --- LaserGRBL/SettingsForm.Designer.cs | 237 +++++++++++----------- LaserGRBL/SettingsForm.resx | 302 +++++++++++++++++++++++++---- 2 files changed, 382 insertions(+), 157 deletions(-) diff --git a/LaserGRBL/SettingsForm.Designer.cs b/LaserGRBL/SettingsForm.Designer.cs index 8a4d0e45a..eb1cb20cc 100644 --- a/LaserGRBL/SettingsForm.Designer.cs +++ b/LaserGRBL/SettingsForm.Designer.cs @@ -40,9 +40,12 @@ private void InitializeComponent() this.CbThreadingMode = new System.Windows.Forms.ComboBox(); this.label4 = new System.Windows.Forms.Label(); this.CBStreamingMode = new System.Windows.Forms.ComboBox(); + this.BtnStreamingMode = new LaserGRBL.UserControls.ImageButton(); this.CBProtocol = new System.Windows.Forms.ComboBox(); this.label3 = new System.Windows.Forms.Label(); + this.BtnProtocol = new LaserGRBL.UserControls.ImageButton(); this.label6 = new System.Windows.Forms.Label(); + this.BtnThreadingModel = new LaserGRBL.UserControls.ImageButton(); this.CbIssueDetector = new System.Windows.Forms.CheckBox(); this.label7 = new System.Windows.Forms.Label(); this.CbSoftReset = new System.Windows.Forms.CheckBox(); @@ -50,12 +53,16 @@ private void InitializeComponent() this.CbHardReset = new System.Windows.Forms.CheckBox(); this.label8 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); + this.BtnFType = new LaserGRBL.UserControls.ImageButton(); + this.CbQueryDI = new System.Windows.Forms.CheckBox(); + this.label46 = new System.Windows.Forms.Label(); this.TpRasterImport = new System.Windows.Forms.TabPage(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); this.label1 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.CbUnidirectional = new System.Windows.Forms.CheckBox(); this.CBSupportPWM = new System.Windows.Forms.CheckBox(); + this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); this.CbHiRes = new System.Windows.Forms.CheckBox(); this.label22 = new System.Windows.Forms.Label(); this.CbDisableSkip = new System.Windows.Forms.CheckBox(); @@ -66,6 +73,7 @@ private void InitializeComponent() this.tableLayoutPanel18 = new System.Windows.Forms.TableLayoutPanel(); this.label43 = new System.Windows.Forms.Label(); this.CbSmartBezier = new System.Windows.Forms.CheckBox(); + this.imageButton1 = new LaserGRBL.UserControls.ImageButton(); this.TpJogControl = new System.Windows.Forms.TabPage(); this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); this.label10 = new System.Windows.Forms.Label(); @@ -152,6 +160,7 @@ private void InitializeComponent() this.label28 = new System.Windows.Forms.Label(); this.tableLayoutPanel17 = new System.Windows.Forms.TableLayoutPanel(); this.label44 = new System.Windows.Forms.Label(); + this.BtnTelegNoteInfo = new LaserGRBL.UserControls.ImageButton(); this.label31 = new System.Windows.Forms.Label(); this.label33 = new System.Windows.Forms.Label(); this.TxtNotification = new System.Windows.Forms.TextBox(); @@ -159,6 +168,7 @@ private void InitializeComponent() this.tableLayoutPanel19 = new System.Windows.Forms.TableLayoutPanel(); this.UdTelegramNotificationThreshold = new System.Windows.Forms.NumericUpDown(); this.label45 = new System.Windows.Forms.Label(); + this.label42 = new System.Windows.Forms.Label(); this.TpPwmSettings = new System.Windows.Forms.TabPage(); this.tableLayoutPanelPwmSettings = new System.Windows.Forms.TableLayoutPanel(); this.CBPwmSel = new System.Windows.Forms.ComboBox(); @@ -167,17 +177,7 @@ private void InitializeComponent() this.label_fan_index = new System.Windows.Forms.Label(); this.TBDwell = new System.Windows.Forms.TextBox(); this.label_dwell_time = new System.Windows.Forms.Label(); - this.label42 = new System.Windows.Forms.Label(); this.SoundBrowserDialog = new System.Windows.Forms.OpenFileDialog(); - this.CbQueryDI = new System.Windows.Forms.CheckBox(); - this.label46 = new System.Windows.Forms.Label(); - this.BtnStreamingMode = new LaserGRBL.UserControls.ImageButton(); - this.BtnProtocol = new LaserGRBL.UserControls.ImageButton(); - this.BtnThreadingModel = new LaserGRBL.UserControls.ImageButton(); - this.BtnFType = new LaserGRBL.UserControls.ImageButton(); - this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton(); - this.imageButton1 = new LaserGRBL.UserControls.ImageButton(); - this.BtnTelegNoteInfo = new LaserGRBL.UserControls.ImageButton(); this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.MainTabPage.SuspendLayout(); @@ -315,6 +315,19 @@ private void InitializeComponent() this.CBStreamingMode.FormattingEnabled = true; this.CBStreamingMode.Name = "CBStreamingMode"; // + // BtnStreamingMode + // + this.BtnStreamingMode.AltImage = null; + this.BtnStreamingMode.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnStreamingMode.Caption = null; + this.BtnStreamingMode.Coloration = System.Drawing.Color.Empty; + this.BtnStreamingMode.Image = ((System.Drawing.Image)(resources.GetObject("BtnStreamingMode.Image"))); + resources.ApplyResources(this.BtnStreamingMode, "BtnStreamingMode"); + this.BtnStreamingMode.Name = "BtnStreamingMode"; + this.BtnStreamingMode.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnStreamingMode.UseAltImage = false; + this.BtnStreamingMode.Click += new System.EventHandler(this.BtnStreamingMode_Click); + // // CBProtocol // resources.ApplyResources(this.CBProtocol, "CBProtocol"); @@ -327,11 +340,37 @@ private void InitializeComponent() resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; // + // BtnProtocol + // + this.BtnProtocol.AltImage = null; + this.BtnProtocol.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnProtocol.Caption = null; + this.BtnProtocol.Coloration = System.Drawing.Color.Empty; + this.BtnProtocol.Image = ((System.Drawing.Image)(resources.GetObject("BtnProtocol.Image"))); + resources.ApplyResources(this.BtnProtocol, "BtnProtocol"); + this.BtnProtocol.Name = "BtnProtocol"; + this.BtnProtocol.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnProtocol.UseAltImage = false; + this.BtnProtocol.Click += new System.EventHandler(this.BtnProtocol_Click); + // // label6 // resources.ApplyResources(this.label6, "label6"); this.label6.Name = "label6"; // + // BtnThreadingModel + // + this.BtnThreadingModel.AltImage = null; + this.BtnThreadingModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnThreadingModel.Caption = null; + this.BtnThreadingModel.Coloration = System.Drawing.Color.Empty; + this.BtnThreadingModel.Image = ((System.Drawing.Image)(resources.GetObject("BtnThreadingModel.Image"))); + resources.ApplyResources(this.BtnThreadingModel, "BtnThreadingModel"); + this.BtnThreadingModel.Name = "BtnThreadingModel"; + this.BtnThreadingModel.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnThreadingModel.UseAltImage = false; + this.BtnThreadingModel.Click += new System.EventHandler(this.BtnThreadingModel_Click); + // // CbIssueDetector // resources.ApplyResources(this.CbIssueDetector, "CbIssueDetector"); @@ -370,6 +409,30 @@ private void InitializeComponent() resources.ApplyResources(this.label9, "label9"); this.label9.Name = "label9"; // + // BtnFType + // + this.BtnFType.AltImage = null; + this.BtnFType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnFType.Caption = null; + this.BtnFType.Coloration = System.Drawing.Color.Empty; + this.BtnFType.Image = ((System.Drawing.Image)(resources.GetObject("BtnFType.Image"))); + resources.ApplyResources(this.BtnFType, "BtnFType"); + this.BtnFType.Name = "BtnFType"; + this.BtnFType.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnFType.UseAltImage = false; + this.BtnFType.Click += new System.EventHandler(this.BtnFType_Click); + // + // CbQueryDI + // + resources.ApplyResources(this.CbQueryDI, "CbQueryDI"); + this.CbQueryDI.Name = "CbQueryDI"; + this.CbQueryDI.UseVisualStyleBackColor = true; + // + // label46 + // + resources.ApplyResources(this.label46, "label46"); + this.label46.Name = "label46"; + // // TpRasterImport // this.TpRasterImport.Controls.Add(this.tableLayoutPanel4); @@ -415,6 +478,19 @@ private void InitializeComponent() this.CBSupportPWM.Name = "CBSupportPWM"; this.CBSupportPWM.UseVisualStyleBackColor = true; // + // BtnModulationInfo + // + this.BtnModulationInfo.AltImage = null; + this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnModulationInfo.Caption = null; + this.BtnModulationInfo.Coloration = System.Drawing.Color.Empty; + this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); + resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); + this.BtnModulationInfo.Name = "BtnModulationInfo"; + this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnModulationInfo.UseAltImage = false; + this.BtnModulationInfo.Click += new System.EventHandler(this.BtnModulationInfo_Click); + // // CbHiRes // resources.ApplyResources(this.CbHiRes, "CbHiRes"); @@ -474,6 +550,18 @@ private void InitializeComponent() this.CbSmartBezier.Name = "CbSmartBezier"; this.CbSmartBezier.UseVisualStyleBackColor = true; // + // imageButton1 + // + this.imageButton1.AltImage = null; + this.imageButton1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.imageButton1.Caption = null; + this.imageButton1.Coloration = System.Drawing.Color.Empty; + this.imageButton1.Image = ((System.Drawing.Image)(resources.GetObject("imageButton1.Image"))); + resources.ApplyResources(this.imageButton1, "imageButton1"); + this.imageButton1.Name = "imageButton1"; + this.imageButton1.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.imageButton1.UseAltImage = false; + // // TpJogControl // this.TpJogControl.Controls.Add(this.tableLayoutPanel5); @@ -1028,6 +1116,24 @@ private void InitializeComponent() this.tableLayoutPanel17.Controls.Add(this.tableLayoutPanel19, 2, 2); this.tableLayoutPanel17.Name = "tableLayoutPanel17"; // + // label44 + // + resources.ApplyResources(this.label44, "label44"); + this.label44.Name = "label44"; + // + // BtnTelegNoteInfo + // + this.BtnTelegNoteInfo.AltImage = null; + this.BtnTelegNoteInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.BtnTelegNoteInfo.Caption = null; + this.BtnTelegNoteInfo.Coloration = System.Drawing.Color.Empty; + this.BtnTelegNoteInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnTelegNoteInfo.Image"))); + resources.ApplyResources(this.BtnTelegNoteInfo, "BtnTelegNoteInfo"); + this.BtnTelegNoteInfo.Name = "BtnTelegNoteInfo"; + this.BtnTelegNoteInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; + this.BtnTelegNoteInfo.UseAltImage = false; + this.BtnTelegNoteInfo.Click += new System.EventHandler(this.BtnTelegNoteInfo_Click); + // // label31 // resources.ApplyResources(this.label31, "label31"); @@ -1075,6 +1181,11 @@ private void InitializeComponent() resources.ApplyResources(this.label45, "label45"); this.label45.Name = "label45"; // + // label42 + // + resources.ApplyResources(this.label42, "label42"); + this.label42.Name = "label42"; + // // TpPwmSettings // this.TpPwmSettings.Controls.Add(this.tableLayoutPanelPwmSettings); @@ -1125,116 +1236,10 @@ private void InitializeComponent() resources.ApplyResources(this.label_dwell_time, "label_dwell_time"); this.label_dwell_time.Name = "label_dwell_time"; // - // label42 - // - resources.ApplyResources(this.label42, "label42"); - this.label42.Name = "label42"; - // // SoundBrowserDialog // resources.ApplyResources(this.SoundBrowserDialog, "SoundBrowserDialog"); // - // CbQueryDI - // - resources.ApplyResources(this.CbQueryDI, "CbQueryDI"); - this.CbQueryDI.Name = "CbQueryDI"; - this.CbQueryDI.UseVisualStyleBackColor = true; - // - // label46 - // - resources.ApplyResources(this.label46, "label46"); - this.label46.Name = "label46"; - // - // BtnStreamingMode - // - this.BtnStreamingMode.AltImage = null; - this.BtnStreamingMode.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnStreamingMode.Caption = null; - this.BtnStreamingMode.Coloration = System.Drawing.Color.Empty; - this.BtnStreamingMode.Image = ((System.Drawing.Image)(resources.GetObject("BtnStreamingMode.Image"))); - resources.ApplyResources(this.BtnStreamingMode, "BtnStreamingMode"); - this.BtnStreamingMode.Name = "BtnStreamingMode"; - this.BtnStreamingMode.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnStreamingMode.UseAltImage = false; - this.BtnStreamingMode.Click += new System.EventHandler(this.BtnStreamingMode_Click); - // - // BtnProtocol - // - this.BtnProtocol.AltImage = null; - this.BtnProtocol.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnProtocol.Caption = null; - this.BtnProtocol.Coloration = System.Drawing.Color.Empty; - this.BtnProtocol.Image = ((System.Drawing.Image)(resources.GetObject("BtnProtocol.Image"))); - resources.ApplyResources(this.BtnProtocol, "BtnProtocol"); - this.BtnProtocol.Name = "BtnProtocol"; - this.BtnProtocol.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnProtocol.UseAltImage = false; - this.BtnProtocol.Click += new System.EventHandler(this.BtnProtocol_Click); - // - // BtnThreadingModel - // - this.BtnThreadingModel.AltImage = null; - this.BtnThreadingModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnThreadingModel.Caption = null; - this.BtnThreadingModel.Coloration = System.Drawing.Color.Empty; - this.BtnThreadingModel.Image = ((System.Drawing.Image)(resources.GetObject("BtnThreadingModel.Image"))); - resources.ApplyResources(this.BtnThreadingModel, "BtnThreadingModel"); - this.BtnThreadingModel.Name = "BtnThreadingModel"; - this.BtnThreadingModel.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnThreadingModel.UseAltImage = false; - this.BtnThreadingModel.Click += new System.EventHandler(this.BtnThreadingModel_Click); - // - // BtnFType - // - this.BtnFType.AltImage = null; - this.BtnFType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnFType.Caption = null; - this.BtnFType.Coloration = System.Drawing.Color.Empty; - this.BtnFType.Image = ((System.Drawing.Image)(resources.GetObject("BtnFType.Image"))); - resources.ApplyResources(this.BtnFType, "BtnFType"); - this.BtnFType.Name = "BtnFType"; - this.BtnFType.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnFType.UseAltImage = false; - this.BtnFType.Click += new System.EventHandler(this.BtnFType_Click); - // - // BtnModulationInfo - // - this.BtnModulationInfo.AltImage = null; - this.BtnModulationInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnModulationInfo.Caption = null; - this.BtnModulationInfo.Coloration = System.Drawing.Color.Empty; - this.BtnModulationInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnModulationInfo.Image"))); - resources.ApplyResources(this.BtnModulationInfo, "BtnModulationInfo"); - this.BtnModulationInfo.Name = "BtnModulationInfo"; - this.BtnModulationInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnModulationInfo.UseAltImage = false; - this.BtnModulationInfo.Click += new System.EventHandler(this.BtnModulationInfo_Click); - // - // imageButton1 - // - this.imageButton1.AltImage = null; - this.imageButton1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.imageButton1.Caption = null; - this.imageButton1.Coloration = System.Drawing.Color.Empty; - this.imageButton1.Image = ((System.Drawing.Image)(resources.GetObject("imageButton1.Image"))); - resources.ApplyResources(this.imageButton1, "imageButton1"); - this.imageButton1.Name = "imageButton1"; - this.imageButton1.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.imageButton1.UseAltImage = false; - // - // BtnTelegNoteInfo - // - this.BtnTelegNoteInfo.AltImage = null; - this.BtnTelegNoteInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.BtnTelegNoteInfo.Caption = null; - this.BtnTelegNoteInfo.Coloration = System.Drawing.Color.Empty; - this.BtnTelegNoteInfo.Image = ((System.Drawing.Image)(resources.GetObject("BtnTelegNoteInfo.Image"))); - resources.ApplyResources(this.BtnTelegNoteInfo, "BtnTelegNoteInfo"); - this.BtnTelegNoteInfo.Name = "BtnTelegNoteInfo"; - this.BtnTelegNoteInfo.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize; - this.BtnTelegNoteInfo.UseAltImage = false; - this.BtnTelegNoteInfo.Click += new System.EventHandler(this.BtnTelegNoteInfo_Click); - // // SettingsForm // resources.ApplyResources(this, "$this"); diff --git a/LaserGRBL/SettingsForm.resx b/LaserGRBL/SettingsForm.resx index 0accf318b..1d0b5cf2d 100644 --- a/LaserGRBL/SettingsForm.resx +++ b/LaserGRBL/SettingsForm.resx @@ -382,7 +382,7 @@ BtnStreamingMode - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.4.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.9.4.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -485,7 +485,7 @@ BtnProtocol - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.4.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.9.4.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -559,7 +559,7 @@ Set slower values if you are experiencing issues. BtnThreadingModel - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.4.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.9.4.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -828,7 +828,7 @@ If disabled all the issues are silently managed without warning. BtnFType - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.4.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.9.4.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel3 @@ -1128,7 +1128,7 @@ If not, please disable PWM support. BtnModulationInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.4.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.9.4.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel4 @@ -1348,7 +1348,7 @@ Set this flag if you don't whant this safety control. 5 - 886, 359 + 886, 388 1 @@ -1375,7 +1375,7 @@ Set this flag if you don't whant this safety control. 3, 3, 3, 3 - 892, 365 + 892, 394 1 @@ -1505,7 +1505,7 @@ Disable this option if you prefer to use the old algorithm. imageButton1 - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.4.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.9.4.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel18 @@ -1523,7 +1523,7 @@ Disable this option if you prefer to use the old algorithm. 2 - 886, 359 + 886, 388 2 @@ -1550,7 +1550,7 @@ Disable this option if you prefer to use the old algorithm. 3, 3, 3, 3 - 892, 365 + 892, 394 6 @@ -1805,7 +1805,7 @@ NOTE: "Continuous Jog" only work with Grbl v1.1 or later, and require table size 4 - 886, 359 + 886, 388 2 @@ -1832,7 +1832,7 @@ NOTE: "Continuous Jog" only work with Grbl v1.1 or later, and require table size 3, 3, 3, 3 - 892, 365 + 892, 394 2 @@ -2528,7 +2528,7 @@ Please do not use Automatic Cooling with Ortur engraver until a new firmware is 6 - 886, 359 + 886, 388 3 @@ -2555,7 +2555,7 @@ Please do not use Automatic Cooling with Ortur engraver until a new firmware is 3, 3, 3, 3 - 892, 365 + 892, 394 3 @@ -2878,7 +2878,7 @@ Here you can use the same syntax of custom buttons. 4 - 892, 365 + 892, 394 3 @@ -2902,7 +2902,7 @@ Here you can use the same syntax of custom buttons. 4, 22 - 892, 365 + 892, 394 4 @@ -4375,29 +4375,14 @@ Check to enable. 3 - - Left - - - True - - - Microsoft Sans Serif, 9.75pt, style=Bold - - - NoControl - - 3, 60 + 3, 52 - 222, 16 + 100, 23 - 33 - - - Don't notify if job time less then + 0 label44 @@ -4439,7 +4424,7 @@ Check to enable. BtnTelegNoteInfo - LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.8.4.0, Culture=neutral, PublicKeyToken=null + LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=4.9.4.0, Culture=neutral, PublicKeyToken=null tableLayoutPanel17 @@ -4694,7 +4679,7 @@ Check to enable. 16 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label44" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="BtnTelegNoteInfo" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label31" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="label33" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="TxtNotification" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="BtnTestNotification" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="tableLayoutPanel19" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label44" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="BtnTelegNoteInfo" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="label31" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="label33" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="TxtNotification" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="BtnTestNotification" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="tableLayoutPanel19" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> Left @@ -4740,7 +4725,7 @@ Obtain your personal code and write it here! 8 - 886, 359 + 886, 388 4 @@ -4767,7 +4752,7 @@ Obtain your personal code and write it here! 3, 3, 3, 3 - 892, 365 + 892, 394 5 @@ -4787,6 +4772,244 @@ Obtain your personal code and write it here! 6 + + Single + + + 3 + + + Fill + + + 28, 4 + + + 142, 21 + + + 0 + + + CBPwmSel + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelPwmSettings + + + 0 + + + True + + + Fill + + + NoControl + + + 177, 1 + + + 705, 39 + + + 1 + + + Select PWM command: +- Spindle: Use spindle M3/M5/M5 commads to drive the PWM. +- Fan: Use the M106/M107 commands to drive the PWM. + + + label_select_pwm_cmd + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelPwmSettings + + + 1 + + + Top + + + 28, 44 + + + 142, 21 + + + 2 + + + CBFanIdx + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelPwmSettings + + + 2 + + + True + + + Fill + + + NoControl + + + 177, 41 + + + 705, 27 + + + 3 + + + Fan Index: +Select the fan which drives the PWM for the laser + + + label_fan_index + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelPwmSettings + + + 3 + + + Top + + + 28, 72 + + + 142, 20 + + + 4 + + + TBDwell + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelPwmSettings + + + 4 + + + True + + + Fill + + + NoControl + + + 177, 69 + + + 705, 318 + + + 5 + + + Laser start time [ms]: +sets the laser start time + + + label_dwell_time + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanelPwmSettings + + + 5 + + + Fill + + + 3, 3 + + + 3 + + + 886, 388 + + + 0 + + + tableLayoutPanelPwmSettings + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TpPwmSettings + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="CBPwmSel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label_select_pwm_cmd" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="CBFanIdx" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label_fan_index" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="TBDwell" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label_dwell_time" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Absolute,23,Absolute,148,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> + + + 4, 22 + + + 3, 3, 3, 3 + + + 892, 394 + + + 7 + + + PWM Settings + + + TpPwmSettings + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MainTabPage + + + 7 + Fill @@ -8371,9 +8594,6 @@ Obtain your personal code and write it here! AAAAAAAAAAAAAAAAAAAAAAAA - - NoControl - CenterParent