diff --git a/LaserGRBL/MainForm.Designer.cs b/LaserGRBL/MainForm.Designer.cs
index 3e4fa0a58..14ecae46c 100644
--- a/LaserGRBL/MainForm.Designer.cs
+++ b/LaserGRBL/MainForm.Designer.cs
@@ -76,6 +76,8 @@ private void InitializeComponent()
this.MNDanish = new System.Windows.Forms.ToolStripMenuItem();
this.MNBrazilian = new System.Windows.Forms.ToolStripMenuItem();
this.russianToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.MNEsp8266 = new System.Windows.Forms.ToolStripMenuItem();
+ this.MNGrblEmulator = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
this.helpOnLineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.autoUpdateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -83,8 +85,6 @@ private void InitializeComponent()
this.openSessionLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripSeparator();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.MNEsp8266 = new System.Windows.Forms.ToolStripMenuItem();
- this.MNGrblEmulator = new System.Windows.Forms.ToolStripMenuItem();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
@@ -219,8 +219,8 @@ private void InitializeComponent()
this.MMn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.grblToolStripMenuItem,
this.fileToolStripMenuItem,
- this.linguaToolStripMenuItem,
this.MNEsp8266,
+ this.linguaToolStripMenuItem,
this.toolStripMenuItem4});
resources.ApplyResources(this.MMn, "MMn");
this.MMn.Name = "MMn";
@@ -413,6 +413,19 @@ private void InitializeComponent()
this.russianToolStripMenuItem.Name = "russianToolStripMenuItem";
this.russianToolStripMenuItem.Click += new System.EventHandler(this.russianToolStripMenuItem_Click);
//
+ // MNEsp8266
+ //
+ this.MNEsp8266.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.MNGrblEmulator});
+ this.MNEsp8266.Name = "MNEsp8266";
+ resources.ApplyResources(this.MNEsp8266, "MNEsp8266");
+ //
+ // MNGrblEmulator
+ //
+ this.MNGrblEmulator.Name = "MNGrblEmulator";
+ resources.ApplyResources(this.MNGrblEmulator, "MNGrblEmulator");
+ this.MNGrblEmulator.Click += new System.EventHandler(this.MNGrblEmulator_Click);
+ //
// toolStripMenuItem4
//
this.toolStripMenuItem4.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -462,19 +475,6 @@ private void InitializeComponent()
resources.ApplyResources(this.aboutToolStripMenuItem, "aboutToolStripMenuItem");
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
//
- // MNEsp8266
- //
- this.MNEsp8266.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.MNGrblEmulator});
- this.MNEsp8266.Name = "MNEsp8266";
- resources.ApplyResources(this.MNEsp8266, "MNEsp8266");
- //
- // MNGrblEmulator
- //
- this.MNGrblEmulator.Name = "MNGrblEmulator";
- resources.ApplyResources(this.MNGrblEmulator, "MNGrblEmulator");
- this.MNGrblEmulator.Click += new System.EventHandler(this.MNGrblEmulator_Click);
- //
// MainForm
//
resources.ApplyResources(this, "$this");
diff --git a/LaserGRBL/MainForm.resx b/LaserGRBL/MainForm.resx
index 577e9ac61..e4701e677 100644
--- a/LaserGRBL/MainForm.resx
+++ b/LaserGRBL/MainForm.resx
@@ -148,7 +148,7 @@
ConnectionForm
- LaserGRBL.ConnectLogForm, LaserGRBL, Version=2.6.13.30720, Culture=neutral, PublicKeyToken=null
+ LaserGRBL.ConnectLogForm, LaserGRBL, Version=2.7.0.32068, Culture=neutral, PublicKeyToken=null
splitContainer1.Panel1
@@ -175,7 +175,7 @@
JogForm
- LaserGRBL.JogForm, LaserGRBL, Version=2.6.13.30720, Culture=neutral, PublicKeyToken=null
+ LaserGRBL.JogForm, LaserGRBL, Version=2.7.0.32068, Culture=neutral, PublicKeyToken=null
splitContainer1.Panel1
@@ -217,7 +217,7 @@
PreviewForm
- LaserGRBL.PreviewForm, LaserGRBL, Version=2.6.13.30720, Culture=neutral, PublicKeyToken=null
+ LaserGRBL.PreviewForm, LaserGRBL, Version=2.7.0.32068, Culture=neutral, PublicKeyToken=null
splitContainer1.Panel2
@@ -261,33 +261,6 @@
194, 17
-
- 0, 556
-
-
- 1, 0, 19, 0
-
-
- 883, 24
-
-
- 1
-
-
- statusStrip1
-
-
- StatusBar
-
-
- System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 1
-
37, 19
@@ -369,72 +342,39 @@
Disconnected
-
- 295, 17
-
-
- 118, 17
-
-
- 41, 20
-
-
- &Grbl
-
-
- 37, 20
-
-
- &File
-
-
- 71, 20
-
-
- &Language
-
-
- 152, 22
-
-
- &Grbl Emulator
-
-
- 62, 20
-
-
- &ESP8266
-
-
- 24, 20
-
-
- ?
+
+ 0, 556
-
- 0, 0
+
+ 1, 0, 19, 0
-
+
883, 24
-
- 2
+
+ 1
-
- menuStrip1
+
+ statusStrip1
-
- MMn
+
+ StatusBar
-
- System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
- 2
+
+ 1
+
+ 295, 17
+
+
+ 118, 17
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
@@ -674,6 +614,12 @@
&Exit
+
+ 41, 20
+
+
+ &Grbl
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAJxAIA3kywAAACBjSFJNAABu
@@ -751,6 +697,24 @@
Send To &Machine
+
+ 37, 20
+
+
+ &File
+
+
+ 152, 22
+
+
+ &Grbl Emulator
+
+
+ 62, 20
+
+
+ &ESP8266
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAhNJREFUOE/N
@@ -898,6 +862,12 @@
Russian
+
+ 71, 20
+
+
+ &Language
+
164, 22
@@ -928,6 +898,36 @@
Web Site
+
+ 24, 20
+
+
+ ?
+
+
+ 0, 0
+
+
+ 883, 24
+
+
+ 2
+
+
+ menuStrip1
+
+
+ MMn
+
+
+ System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 2
+
True
@@ -1262,6 +1262,18 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ MNEsp8266
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ MNGrblEmulator
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
toolStripMenuItem4
@@ -1304,18 +1316,6 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- MNEsp8266
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- MNGrblEmulator
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
MainForm
diff --git a/LaserGRBL/SettingsForm.Designer.cs b/LaserGRBL/SettingsForm.Designer.cs
index da489d883..8247a5b77 100644
--- a/LaserGRBL/SettingsForm.Designer.cs
+++ b/LaserGRBL/SettingsForm.Designer.cs
@@ -36,13 +36,13 @@ private void InitializeComponent()
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.CBProtocol = new System.Windows.Forms.ComboBox();
- this.BtnLaserMode = new LaserGRBL.UserControls.ImageButton();
this.CBSupportPWM = new System.Windows.Forms.CheckBox();
this.label1 = new System.Windows.Forms.Label();
- this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton();
this.CBLaserMode = new System.Windows.Forms.CheckBox();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
+ this.BtnLaserMode = new LaserGRBL.UserControls.ImageButton();
+ this.BtnModulationInfo = new LaserGRBL.UserControls.ImageButton();
this.BtnProtocol = new LaserGRBL.UserControls.ImageButton();
this.tableLayoutPanel1.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
@@ -107,18 +107,6 @@ private void InitializeComponent()
this.CBProtocol.Name = "CBProtocol";
this.CBProtocol.SelectedIndexChanged += new System.EventHandler(this.CBProtocol_SelectedIndexChanged);
//
- // BtnLaserMode
- //
- this.BtnLaserMode.AltImage = null;
- this.BtnLaserMode.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
- this.BtnLaserMode.Coloration = System.Drawing.Color.Empty;
- this.BtnLaserMode.Image = ((System.Drawing.Image)(resources.GetObject("BtnLaserMode.Image")));
- resources.ApplyResources(this.BtnLaserMode, "BtnLaserMode");
- this.BtnLaserMode.Name = "BtnLaserMode";
- this.BtnLaserMode.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize;
- this.BtnLaserMode.UseAltImage = false;
- this.BtnLaserMode.Click += new System.EventHandler(this.BtnLaserMode_Click);
- //
// CBSupportPWM
//
resources.ApplyResources(this.CBSupportPWM, "CBSupportPWM");
@@ -130,18 +118,6 @@ private void InitializeComponent()
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
- // 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.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);
- //
// CBLaserMode
//
resources.ApplyResources(this.CBLaserMode, "CBLaserMode");
@@ -158,6 +134,30 @@ private void InitializeComponent()
resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3";
//
+ // BtnLaserMode
+ //
+ this.BtnLaserMode.AltImage = null;
+ this.BtnLaserMode.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.BtnLaserMode.Coloration = System.Drawing.Color.Empty;
+ this.BtnLaserMode.Image = ((System.Drawing.Image)(resources.GetObject("BtnLaserMode.Image")));
+ resources.ApplyResources(this.BtnLaserMode, "BtnLaserMode");
+ this.BtnLaserMode.Name = "BtnLaserMode";
+ this.BtnLaserMode.SizingMode = LaserGRBL.UserControls.ImageButton.SizingModes.FixedSize;
+ this.BtnLaserMode.UseAltImage = false;
+ this.BtnLaserMode.Click += new System.EventHandler(this.BtnLaserMode_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.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);
+ //
// BtnProtocol
//
this.BtnProtocol.AltImage = null;
diff --git a/LaserGRBL/SettingsForm.resx b/LaserGRBL/SettingsForm.resx
index 02605dda7..664acab05 100644
--- a/LaserGRBL/SettingsForm.resx
+++ b/LaserGRBL/SettingsForm.resx
@@ -136,7 +136,7 @@
- 502, 3
+ 531, 3
74, 27
@@ -163,7 +163,7 @@
NoControl
- 582, 3
+ 611, 3
74, 27
@@ -196,7 +196,7 @@
1
- 659, 33
+ 688, 33
3
@@ -229,7 +229,7 @@
1, 1, 1, 0
- 100, 21
+ 120, 21
28
@@ -274,7 +274,7 @@
BtnLaserMode
- LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=2.6.11.17913, Culture=neutral, PublicKeyToken=null
+ LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=2.7.0.32177, Culture=neutral, PublicKeyToken=null
tableLayoutPanel3
@@ -319,7 +319,7 @@
NoControl
- 128, 3
+ 148, 3
3, 3, 3, 3
@@ -375,7 +375,7 @@ If not, please disable PWM support.
BtnModulationInfo
- LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=2.6.11.17913, Culture=neutral, PublicKeyToken=null
+ LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=2.7.0.32177, Culture=neutral, PublicKeyToken=null
tableLayoutPanel3
@@ -420,7 +420,7 @@ If not, please disable PWM support.
NoControl
- 128, 48
+ 148, 48
3, 3, 3, 3
@@ -453,13 +453,13 @@ If not, please disable PWM support.
NoControl
- 128, 80
+ 148, 80
3, 3, 3, 3
- 518, 39
+ 518, 52
29
@@ -467,7 +467,8 @@ If not, please disable PWM support.
Connection Protocol:
- UsbSerial, is the most common protocol. Should be used if your engraver is connected to USB or COM port.
-- Ethernet, if you have a WiFi-Ethernet bridge. Communication is implemented like a "telnet" session.
+- Ethernet, if you have a WiFi-Ethernet bridge. Communication is implemented like a "telnet" session.
+- LaserWebESP8266 support WiFi connection via WebSocket, like LaserWeb software.
label3
@@ -509,7 +510,7 @@ If not, please disable PWM support.
BtnProtocol
- LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=2.6.11.17913, Culture=neutral, PublicKeyToken=null
+ LaserGRBL.UserControls.ImageButton, LaserGRBL, Version=2.7.0.32177, Culture=neutral, PublicKeyToken=null
tableLayoutPanel3
@@ -527,7 +528,7 @@ If not, please disable PWM support.
4
- 653, 199
+ 682, 199
0
@@ -554,7 +555,7 @@ If not, please disable PWM support.
3, 3
- 659, 218
+ 688, 218
4
@@ -584,7 +585,7 @@ If not, please disable PWM support.
2
- 665, 263
+ 694, 263
0
@@ -611,7 +612,7 @@ If not, please disable PWM support.
6, 13
- 665, 263
+ 694, 263
Settings