20130413-181024

This commit is contained in:
BlubbFish 2013-04-13 16:10:30 +00:00
parent 9ab9a7fb50
commit 8ce9be6e1c
25 changed files with 156 additions and 37 deletions

Binary file not shown.

View File

@ -1,6 +1,24 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="Laminator_GUI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<userSettings>
<Laminator_GUI.Properties.Settings>
<setting name="Com_Port" serializeAs="String">
<value>COM8</value>
</setting>
<setting name="Default_Temp" serializeAs="String">
<value>32</value>
</setting>
<setting name="Default_Motor" serializeAs="String">
<value>10</value>
</setting>
</Laminator_GUI.Properties.Settings>
</userSettings>
</configuration>

View File

@ -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)

View File

@ -1,30 +1,62 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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.
// </auto-generated>
//------------------------------------------------------------------------------
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;
}
}
}
}

View File

@ -1,7 +1,15 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Laminator_GUI.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings>
<Setting Name="Com_Port" Type="System.String" Scope="User">
<Value Profile="(Default)">COM8</Value>
</Setting>
<Setting Name="Default_Temp" Type="System.String" Scope="User">
<Value Profile="(Default)">32</Value>
</Setting>
<Setting Name="Default_Motor" Type="System.String" Scope="User">
<Value Profile="(Default)">10</Value>
</Setting>
</Settings>
</SettingsFile>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="Laminator_GUI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<userSettings>
<Laminator_GUI.Properties.Settings>
<setting name="Com_Port" serializeAs="String">
<value>COM8</value>
</setting>
<setting name="Default_Temp" serializeAs="String">
<value>32</value>
</setting>
<setting name="Default_Motor" serializeAs="String">
<value>10</value>
</setting>
</Laminator_GUI.Properties.Settings>
</userSettings>
</configuration>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
</configuration>

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
</assembly>

View File

@ -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

View File

@ -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