diff --git a/Laminator-GUI/Laminator-GUI.v11.suo b/Laminator-GUI/Laminator-GUI.v11.suo index 7996313..222f347 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 fad249e..ec97c43 100644 --- a/Laminator-GUI/Laminator-GUI/App.config +++ b/Laminator-GUI/Laminator-GUI/App.config @@ -1,6 +1,24 @@  + + +
+ + + + + + COM8 + + + 32 + + + 10 + + + \ No newline at end of file diff --git a/Laminator-GUI/Laminator-GUI/Form1.cs b/Laminator-GUI/Laminator-GUI/Form1.cs index e46da02..b5a80f7 100644 --- a/Laminator-GUI/Laminator-GUI/Form1.cs +++ b/Laminator-GUI/Laminator-GUI/Form1.cs @@ -9,6 +9,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using Laminator_GUI.Properties; namespace Laminator_GUI { @@ -27,14 +28,18 @@ namespace Laminator_GUI private string solltempText = "-1"; private string motorText = "-1"; private Thread t; + private Settings settings; public delegate void InvokeDelegate(); public Form1() { InitializeComponent(); + this.settings = new Settings(); this.chart.ChartAreas[0].AxisX.Maximum = 500; - this.serialPort = new SerialPort("COM5", 9600, Parity.None, 8, StopBits.One); + this.serialPort = new SerialPort(this.settings.Com_Port, 9600, Parity.None, 8, StopBits.One); this.serialPort.Open(); + this.serialPort.Write("m" + this.settings.Default_Motor.PadLeft(2, '0') + "\n"); + this.serialPort.Write("t" + this.settings.Default_Temp.PadLeft(3, '0') + "\n"); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker1.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.RefreshGui); this.t = new Thread(this.polling); @@ -73,7 +78,7 @@ namespace Laminator_GUI { this.backgroundWorker1.RunWorkerAsync(); } - catch (InvalidOperationException e) { } + catch (InvalidOperationException) { } } } private void RefreshGui(object sender, RunWorkerCompletedEventArgs e) @@ -88,7 +93,7 @@ namespace Laminator_GUI this.tempbox.BeginInvoke(new InvokeDelegate(InvokeTempBox)); this.motorbox.BeginInvoke(new InvokeDelegate(InvokeMotorBox)); } - catch (InvalidOperationException f) { } + catch (InvalidOperationException) { } } private void InvokeMotorBox() @@ -143,20 +148,24 @@ namespace Laminator_GUI this.chart.Series["Heizung"].Points.Clear(); this.chart.Series["Motor"].Points.Clear(); int i = 1; - foreach (int temp in this.hist) + try { - this.chart.Series["Temp"].Points.AddXY(i++, temp); - } - i = 1; - foreach (bool heat in this.hheat) - { - this.chart.Series["Heizung"].Points.AddXY(i++, heat ? 200 : 160); - } - i = 1; - foreach (bool motor in this.hmotor) - { - this.chart.Series["Motor"].Points.AddXY(i++, motor ? 140 : 100); + foreach (int temp in this.hist) + { + this.chart.Series["Temp"].Points.AddXY(i++, temp); + } + i = 1; + foreach (bool heat in this.hheat) + { + this.chart.Series["Heizung"].Points.AddXY(i++, heat ? 200 : 160); + } + i = 1; + foreach (bool motor in this.hmotor) + { + this.chart.Series["Motor"].Points.AddXY(i++, motor ? 140 : 100); + } } + catch (InvalidOperationException) { } } private void button1_Click(object sender, EventArgs e) diff --git a/Laminator-GUI/Laminator-GUI/Properties/Settings.Designer.cs b/Laminator-GUI/Laminator-GUI/Properties/Settings.Designer.cs index 0ee2a68..2acc944 100644 --- a/Laminator-GUI/Laminator-GUI/Properties/Settings.Designer.cs +++ b/Laminator-GUI/Laminator-GUI/Properties/Settings.Designer.cs @@ -1,30 +1,62 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.18033 +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.18033 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // //------------------------------------------------------------------------------ -namespace Laminator_GUI.Properties -{ - - +namespace Laminator_GUI.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("COM8")] + public string Com_Port { + get { + return ((string)(this["Com_Port"])); + } + set { + this["Com_Port"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("32")] + public string Default_Temp { + get { + return ((string)(this["Default_Temp"])); + } + set { + this["Default_Temp"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("10")] + public string Default_Motor { + get { + return ((string)(this["Default_Motor"])); + } + set { + this["Default_Motor"] = value; + } + } } } diff --git a/Laminator-GUI/Laminator-GUI/Properties/Settings.settings b/Laminator-GUI/Laminator-GUI/Properties/Settings.settings index abf36c5..b7b0e06 100644 --- a/Laminator-GUI/Laminator-GUI/Properties/Settings.settings +++ b/Laminator-GUI/Laminator-GUI/Properties/Settings.settings @@ -1,7 +1,15 @@  - - - - - - + + + + + COM8 + + + 32 + + + 10 + + + \ No newline at end of file diff --git a/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.exe b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.exe new file mode 100644 index 0000000..658cdd6 Binary files /dev/null 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 new file mode 100644 index 0000000..ec97c43 --- /dev/null +++ b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.exe.config @@ -0,0 +1,24 @@ + + + + +
+ + + + + + + + + COM8 + + + 32 + + + 10 + + + + \ No newline at end of file diff --git a/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.pdb b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.pdb new file mode 100644 index 0000000..11fc9eb Binary files /dev/null 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 b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.vshost.exe new file mode 100644 index 0000000..8c84517 Binary files /dev/null and b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.vshost.exe 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 new file mode 100644 index 0000000..fad249e --- /dev/null +++ b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.vshost.exe.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.vshost.exe.manifest b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.vshost.exe.manifest new file mode 100644 index 0000000..f96b1d6 --- /dev/null +++ b/Laminator-GUI/Laminator-GUI/bin/Release/Laminator-GUI.vshost.exe.manifest @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/Laminator-GUI/Laminator-GUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Laminator-GUI/Laminator-GUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 42d05d2..cd9cee8 100644 Binary files a/Laminator-GUI/Laminator-GUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Laminator-GUI/Laminator-GUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Laminator-GUI/Laminator-GUI/obj/Debug/Laminator-GUI.csproj.FileListAbsolute.txt b/Laminator-GUI/Laminator-GUI/obj/Debug/Laminator-GUI.csproj.FileListAbsolute.txt index 54720b2..45d4c2c 100644 --- a/Laminator-GUI/Laminator-GUI/obj/Debug/Laminator-GUI.csproj.FileListAbsolute.txt +++ b/Laminator-GUI/Laminator-GUI/obj/Debug/Laminator-GUI.csproj.FileListAbsolute.txt @@ -7,3 +7,6 @@ C:\Users\netz\Documents\Bastelleien\Laminator\Laminator-GUI\Laminator-GUI\obj\De C:\Users\netz\Documents\Bastelleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Debug\Laminator-GUI.csproj.GenerateResource.Cache C:\Users\netz\Documents\Bastelleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Debug\Laminator-GUI.exe C:\Users\netz\Documents\Bastelleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Debug\Laminator-GUI.pdb +D:\Doc's\Basteleien\Laminator\Laminator-GUI\Laminator-GUI\bin\Debug\Laminator-GUI.exe.config +D:\Doc's\Basteleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Debug\Laminator-GUI.exe +D:\Doc's\Basteleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Debug\Laminator-GUI.pdb diff --git a/Laminator-GUI/Laminator-GUI/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Laminator-GUI/Laminator-GUI/obj/Release/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 0000000..4d6f1bc Binary files /dev/null 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 new file mode 100644 index 0000000..43fd719 Binary files /dev/null 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 new file mode 100644 index 0000000..2798c51 --- /dev/null +++ b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.csproj.FileListAbsolute.txt @@ -0,0 +1,8 @@ +D:\Doc's\Basteleien\Laminator\Laminator-GUI\Laminator-GUI\bin\Release\Laminator-GUI.exe.config +D:\Doc's\Basteleien\Laminator\Laminator-GUI\Laminator-GUI\bin\Release\Laminator-GUI.exe +D:\Doc's\Basteleien\Laminator\Laminator-GUI\Laminator-GUI\bin\Release\Laminator-GUI.pdb +D:\Doc's\Basteleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Release\Laminator_GUI.Form1.resources +D:\Doc's\Basteleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Release\Laminator_GUI.Properties.Resources.resources +D:\Doc's\Basteleien\Laminator\Laminator-GUI\Laminator-GUI\obj\Release\Laminator-GUI.csproj.GenerateResource.Cache +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 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 new file mode 100644 index 0000000..1b81dcd Binary files /dev/null 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.exe b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.exe new file mode 100644 index 0000000..658cdd6 Binary files /dev/null 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 new file mode 100644 index 0000000..11fc9eb Binary files /dev/null and b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator-GUI.pdb differ diff --git a/Laminator-GUI/Laminator-GUI/obj/Release/Laminator_GUI.Form1.resources b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator_GUI.Form1.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator_GUI.Form1.resources differ diff --git a/Laminator-GUI/Laminator-GUI/obj/Release/Laminator_GUI.Properties.Resources.resources b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator_GUI.Properties.Resources.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/Laminator-GUI/Laminator-GUI/obj/Release/Laminator_GUI.Properties.Resources.resources differ diff --git a/Laminator-GUI/Laminator-GUI/bin/Release/.gitignore b/Laminator-GUI/Laminator-GUI/obj/Release/TempPE/.gitignore similarity index 100% rename from Laminator-GUI/Laminator-GUI/bin/Release/.gitignore rename to Laminator-GUI/Laminator-GUI/obj/Release/TempPE/.gitignore diff --git a/Laminator-GUI/Laminator-GUI/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/Laminator-GUI/Laminator-GUI/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs new file mode 100644 index 0000000..e69de29 diff --git a/Laminator-GUI/Laminator-GUI/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/Laminator-GUI/Laminator-GUI/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs new file mode 100644 index 0000000..e69de29 diff --git a/Laminator-GUI/Laminator-GUI/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/Laminator-GUI/Laminator-GUI/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs new file mode 100644 index 0000000..e69de29