diff --git a/Laminator-GUI/Laminator-GUI.v11.suo b/Laminator-GUI/Laminator-GUI.v11.suo index c042a0a..9416993 100644 Binary files a/Laminator-GUI/Laminator-GUI.v11.suo and b/Laminator-GUI/Laminator-GUI.v11.suo differ diff --git a/Laminator-GUI/Laminator-GUI/App.config b/Laminator-GUI/Laminator-GUI/App.config index ec97c43..b1b378d 100644 --- a/Laminator-GUI/Laminator-GUI/App.config +++ b/Laminator-GUI/Laminator-GUI/App.config @@ -11,7 +11,7 @@ - COM8 + COM7 32 diff --git a/Laminator-GUI/Laminator-GUI/Form1.Designer.cs b/Laminator-GUI/Laminator-GUI/Form1.Designer.cs index 18c6ccc..715474a 100644 --- a/Laminator-GUI/Laminator-GUI/Form1.Designer.cs +++ b/Laminator-GUI/Laminator-GUI/Form1.Designer.cs @@ -28,10 +28,10 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea4 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Series series10 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.Series series11 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.Series series12 = new System.Windows.Forms.DataVisualization.Charting.Series(); this.label1 = new System.Windows.Forms.Label(); this.Temp = new System.Windows.Forms.Label(); this.chart = new System.Windows.Forms.DataVisualization.Charting.Chart(); @@ -43,6 +43,11 @@ this.motorbox = new System.Windows.Forms.NumericUpDown(); this.heizungSoll = new System.Windows.Forms.Label(); this.motorSoll = new System.Windows.Forms.Label(); + this.setTemp1 = new System.Windows.Forms.Button(); + this.setTemp2 = new System.Windows.Forms.Button(); + this.setTemp3 = new System.Windows.Forms.Button(); + this.setTemp4 = new System.Windows.Forms.Button(); + this.setTemp5 = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tempbox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.motorbox)).BeginInit(); @@ -70,26 +75,26 @@ // // chart // - chartArea1.Name = "ChartArea1"; - this.chart.ChartAreas.Add(chartArea1); + chartArea4.Name = "ChartArea1"; + this.chart.ChartAreas.Add(chartArea4); this.chart.Location = new System.Drawing.Point(13, 134); this.chart.Name = "chart"; - series1.ChartArea = "ChartArea1"; - series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.FastLine; - series1.Color = System.Drawing.Color.Red; - series1.IsVisibleInLegend = false; - series1.Name = "Temp"; - series2.ChartArea = "ChartArea1"; - series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.FastLine; - series2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - series2.Name = "Motor"; - series3.ChartArea = "ChartArea1"; - series3.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.FastLine; - series3.Color = System.Drawing.Color.Blue; - series3.Name = "Heizung"; - this.chart.Series.Add(series1); - this.chart.Series.Add(series2); - this.chart.Series.Add(series3); + series10.ChartArea = "ChartArea1"; + series10.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.FastLine; + series10.Color = System.Drawing.Color.Red; + series10.IsVisibleInLegend = false; + series10.Name = "Temp"; + series11.ChartArea = "ChartArea1"; + series11.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.FastLine; + series11.Color = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + series11.Name = "Motor"; + series12.ChartArea = "ChartArea1"; + series12.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.FastLine; + series12.Color = System.Drawing.Color.Blue; + series12.Name = "Heizung"; + this.chart.Series.Add(series10); + this.chart.Series.Add(series11); + this.chart.Series.Add(series12); this.chart.Size = new System.Drawing.Size(359, 122); this.chart.TabIndex = 2; this.chart.Text = "chart1"; @@ -197,11 +202,66 @@ this.motorSoll.TabIndex = 12; this.motorSoll.Text = "-1"; // + // setTemp1 + // + this.setTemp1.Location = new System.Drawing.Point(383, 12); + this.setTemp1.Name = "setTemp1"; + this.setTemp1.Size = new System.Drawing.Size(89, 41); + this.setTemp1.TabIndex = 13; + this.setTemp1.Text = "Aufheizen 185°C"; + this.setTemp1.UseVisualStyleBackColor = true; + this.setTemp1.Click += new System.EventHandler(this.setTemp1_Click); + // + // setTemp2 + // + this.setTemp2.Location = new System.Drawing.Point(383, 59); + this.setTemp2.Name = "setTemp2"; + this.setTemp2.Size = new System.Drawing.Size(89, 41); + this.setTemp2.TabIndex = 14; + this.setTemp2.Text = "Steppen 185°C"; + this.setTemp2.UseVisualStyleBackColor = true; + this.setTemp2.Click += new System.EventHandler(this.setTemp2_Click); + // + // setTemp3 + // + this.setTemp3.Location = new System.Drawing.Point(383, 106); + this.setTemp3.Name = "setTemp3"; + this.setTemp3.Size = new System.Drawing.Size(89, 41); + this.setTemp3.TabIndex = 15; + this.setTemp3.Text = "Brennen 190°C"; + this.setTemp3.UseVisualStyleBackColor = true; + this.setTemp3.Click += new System.EventHandler(this.setTemp3_Click); + // + // setTemp4 + // + this.setTemp4.Location = new System.Drawing.Point(383, 153); + this.setTemp4.Name = "setTemp4"; + this.setTemp4.Size = new System.Drawing.Size(89, 41); + this.setTemp4.TabIndex = 16; + this.setTemp4.Text = "Abkühlen Motor on"; + this.setTemp4.UseVisualStyleBackColor = true; + this.setTemp4.Click += new System.EventHandler(this.setTemp4_Click); + // + // setTemp5 + // + this.setTemp5.Location = new System.Drawing.Point(383, 200); + this.setTemp5.Name = "setTemp5"; + this.setTemp5.Size = new System.Drawing.Size(89, 41); + this.setTemp5.TabIndex = 17; + this.setTemp5.Text = "Abkühlen Motor off"; + this.setTemp5.UseVisualStyleBackColor = true; + this.setTemp5.Click += new System.EventHandler(this.setTemp5_Click); + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(384, 261); + this.ClientSize = new System.Drawing.Size(484, 261); + this.Controls.Add(this.setTemp5); + this.Controls.Add(this.setTemp4); + this.Controls.Add(this.setTemp3); + this.Controls.Add(this.setTemp2); + this.Controls.Add(this.setTemp1); this.Controls.Add(this.motorSoll); this.Controls.Add(this.heizungSoll); this.Controls.Add(this.motorbox); @@ -214,8 +274,8 @@ this.Controls.Add(this.Temp); this.Controls.Add(this.label1); this.MaximizeBox = false; - this.MaximumSize = new System.Drawing.Size(400, 300); - this.MinimumSize = new System.Drawing.Size(400, 300); + this.MaximumSize = new System.Drawing.Size(500, 300); + this.MinimumSize = new System.Drawing.Size(500, 300); this.Name = "Form1"; this.Text = "Laminator GUI"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.close); @@ -240,6 +300,11 @@ private System.Windows.Forms.NumericUpDown motorbox; private System.Windows.Forms.Label heizungSoll; private System.Windows.Forms.Label motorSoll; + private System.Windows.Forms.Button setTemp1; + private System.Windows.Forms.Button setTemp2; + private System.Windows.Forms.Button setTemp3; + private System.Windows.Forms.Button setTemp4; + private System.Windows.Forms.Button setTemp5; } } diff --git a/Laminator-GUI/Laminator-GUI/Form1.cs b/Laminator-GUI/Laminator-GUI/Form1.cs index 423db6e..4b8c819 100644 --- a/Laminator-GUI/Laminator-GUI/Form1.cs +++ b/Laminator-GUI/Laminator-GUI/Form1.cs @@ -159,5 +159,45 @@ namespace Laminator_GUI t.Abort(); serialPort.Close(); } + + private void setTemp1_Click(object sender, EventArgs e) + { + this.serialPort.Write("t185\n"); + this.serialPort.Write("m10\n"); + this.motorText = "-1"; + this.solltempText = "-1"; + } + + private void setTemp2_Click(object sender, EventArgs e) + { + this.serialPort.Write("t185\n"); + this.serialPort.Write("m02\n"); + this.motorText = "-1"; + this.solltempText = "-1"; + } + + private void setTemp3_Click(object sender, EventArgs e) + { + this.serialPort.Write("t190\n"); + this.serialPort.Write("m10\n"); + this.motorText = "-1"; + this.solltempText = "-1"; + } + + private void setTemp4_Click(object sender, EventArgs e) + { + this.serialPort.Write("t010\n"); + this.serialPort.Write("m10\n"); + this.motorText = "-1"; + this.solltempText = "-1"; + } + + private void setTemp5_Click(object sender, EventArgs e) + { + this.serialPort.Write("t010\n"); + this.serialPort.Write("m00\n"); + this.motorText = "-1"; + this.solltempText = "-1"; + } } } diff --git a/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.exe b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.exe index c5db39b..4197e2a 100644 Binary files a/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.exe and b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.exe differ diff --git a/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.exe.config b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.exe.config index ec97c43..b1b378d 100644 --- a/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.exe.config +++ b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.exe.config @@ -11,7 +11,7 @@ - COM8 + COM7 32 diff --git a/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.pdb b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.pdb index 6236fa6..de8ae53 100644 Binary files a/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.pdb and b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.pdb differ diff --git a/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.vshost.exe.config b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.vshost.exe.config index ec97c43..b1b378d 100644 --- a/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.vshost.exe.config +++ b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.vshost.exe.config @@ -11,7 +11,7 @@ - COM8 + COM7 32 diff --git a/Laminator-GUI/Laminator-GUI/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Laminator-GUI/Laminator-GUI/obj/Release/DesignTimeResolveAssemblyReferences.cache index 5eb8aa4..8272351 100644 Binary files a/Laminator-GUI/Laminator-GUI/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Laminator-GUI/Laminator-GUI/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Laminator-GUI/Laminator-GUI/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/Laminator-GUI/Laminator-GUI/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 43fd719..0dd2c44 100644 Binary files a/Laminator-GUI/Laminator-GUI/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/Laminator-GUI/Laminator-GUI/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.csproj.FileListAbsolute.txt b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.csproj.FileListAbsolute.txt index b5695d0..fb7a642 100644 --- a/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.csproj.FileListAbsolute.txt +++ b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.csproj.FileListAbsolute.txt @@ -7,3 +7,12 @@ D:\Doc's\Basteleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Release\Laminator- D:\Doc's\Basteleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Release\Laminator-GUI.exe D:\Doc's\Basteleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Release\Laminator-GUI.pdb D:\Doc's\Basteleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Release\Laminator-GUI.csprojResolveAssemblyReference.cache +C:\Users\netz\Documents\Bastelleien\Laminator\Laminator-GUI\Laminator-GUI\bin\Release\Laminator-GUI.exe.config +C:\Users\netz\Documents\Bastelleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Release\Laminator-GUI.exe +C:\Users\netz\Documents\Bastelleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Release\Laminator-GUI.pdb +C:\Users\netz\Documents\Bastelleien\Laminator\Laminator-GUI\Laminator-GUI\bin\Release\Laminator-GUI.exe +C:\Users\netz\Documents\Bastelleien\Laminator\Laminator-GUI\Laminator-GUI\bin\Release\Laminator-GUI.pdb +C:\Users\netz\Documents\Bastelleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Release\Laminator-GUI.csprojResolveAssemblyReference.cache +C:\Users\netz\Documents\Bastelleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Release\Laminator_GUI.Form1.resources +C:\Users\netz\Documents\Bastelleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Release\Laminator_GUI.Properties.Resources.resources +C:\Users\netz\Documents\Bastelleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Release\Laminator-GUI.csproj.GenerateResource.Cache diff --git a/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.csproj.GenerateResource.Cache b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.csproj.GenerateResource.Cache index 4d3d889..981d7c9 100644 Binary files a/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.csproj.GenerateResource.Cache and b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.csproj.GenerateResource.Cache differ diff --git a/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.csprojResolveAssemblyReference.cache b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.csprojResolveAssemblyReference.cache index e96651a..3e705d8 100644 Binary files a/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.csprojResolveAssemblyReference.cache and b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.csprojResolveAssemblyReference.cache differ diff --git a/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.exe b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.exe index c5db39b..4197e2a 100644 Binary files a/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.exe and b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.exe differ diff --git a/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.pdb b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.pdb index 6236fa6..de8ae53 100644 Binary files a/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.pdb and b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.pdb differ