From 17f72ca63a68af00ff278bb303016d74b18cd966 Mon Sep 17 00:00:00 2001 From: sandriek Date: Mon, 14 Sep 2015 11:40:32 +0200 Subject: [PATCH] opslaan opslaan --- .../.vs/ErgometerApplication/v14/.suo | Bin 22528 -> 42496 bytes .../Ergometer.Designer.cs | 12 +- .../ErgometerApplication/Ergometer.cs | 45 +++++- .../ErgometerApplication/Ergometer.resx | 129 ++++++++++++++++++ .../ErgometerApplication.csproj | 3 + .../ErgometerApplication/Meting.cs | 21 +-- .../ErgometerApplication.vshost.exe.manifest | 11 ++ ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7332 -> 7336 bytes ...terApplication.csproj.FileListAbsolute.txt | 2 + 9 files changed, 211 insertions(+), 12 deletions(-) create mode 100644 ErgometerApplication/ErgometerApplication/Ergometer.resx create mode 100644 ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.vshost.exe.manifest diff --git a/ErgometerApplication/.vs/ErgometerApplication/v14/.suo b/ErgometerApplication/.vs/ErgometerApplication/v14/.suo index 5df19c5c6a8dfe76f692d7e64afe9b6d0e7d037d..0620cff97cba6497361e212cf4c56ed3e20ae917 100644 GIT binary patch literal 42496 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 D3{)w6 delta 1445 zcmdT^OH30{6n$^#k1{QVLaR{Pfgl!v@<}u(DAUkjgP&Rn5#%FC08K;!Z4GHeh8+n+ zr8g=hni%53rGDX16*{y1=$qr-rjS-)$-q1l-GZKlZbi4DZ?TDzwvcXxy>&Fion{*l1>Ng+ z=H*X2{A3>lxgfn1$FB|+#nQ1oFjL~Pn;6;BjFv@4yEX1TnXbkJ>+RS*s9;cAKsC^( zs0g=NXh^%tvpLMG@NwAC2ntq!keCauBnvF08o;1c&{lYqHX1VdX%htW9-h6oDY`xr zgIEJTrR5P${(q%fv0IB;LI0iM7yZdx8t%&=#*V{SgExqL?ic&z-)Ph${@5i z)WdzZXJ+p90LL~eTNxe+D=7H_tL-n9UA_H1rQmEW0O6jI#$#&E6%Q(nDK%`Kqr)dO zxjKDUyRWzO!RO0usd4ZX1|Qyq3rnI_#Nto4-7&{bauXbO6CARd;IUg|=LVux1jCT@ z_uBnipN@ud+?pS~i07wrqi|&k26q?0+qE2zPX6qZafHp1KZ6qxs2P@c6+EG4W}N#M^o$Fm=XHaaNx(pm=cr66LCMg5s$Q+XU~unG5n N+b&AEU7&c<@*Q&-{AvII diff --git a/ErgometerApplication/ErgometerApplication/Ergometer.Designer.cs b/ErgometerApplication/ErgometerApplication/Ergometer.Designer.cs index c71e80b..46db67c 100644 --- a/ErgometerApplication/ErgometerApplication/Ergometer.Designer.cs +++ b/ErgometerApplication/ErgometerApplication/Ergometer.Designer.cs @@ -43,6 +43,8 @@ namespace ErgometerApplication this.timeButton = new System.Windows.Forms.Button(); this.energyButton = new System.Windows.Forms.Button(); this.distanceButton = new System.Windows.Forms.Button(); + this.saveTimer = new System.Windows.Forms.Timer(this.components); + this.writeTimer = new System.Windows.Forms.Timer(this.components); this.SuspendLayout(); // // richTextBox1 @@ -67,11 +69,15 @@ namespace ErgometerApplication // ComPortBox // this.ComPortBox.FormattingEnabled = true; - this.ComPortBox.Items.AddRange(SerialPort.GetPortNames()); + this.ComPortBox.Items.AddRange(new object[] { + "CNCA0", + "CNCB0", + "COM3", + "COM4"}); this.ComPortBox.Location = new System.Drawing.Point(12, 291); this.ComPortBox.Name = "ComPortBox"; this.ComPortBox.Size = new System.Drawing.Size(97, 24); - this.ComPortBox.SelectedItem = 1; + this.ComPortBox.TabIndex = 11; // // statusButton // @@ -203,5 +209,7 @@ namespace ErgometerApplication private System.Windows.Forms.Button timeButton; private System.Windows.Forms.Button energyButton; private System.Windows.Forms.Button distanceButton; + private System.Windows.Forms.Timer saveTimer; + private System.Windows.Forms.Timer writeTimer; } } diff --git a/ErgometerApplication/ErgometerApplication/Ergometer.cs b/ErgometerApplication/ErgometerApplication/Ergometer.cs index fd50c13..16f42f3 100644 --- a/ErgometerApplication/ErgometerApplication/Ergometer.cs +++ b/ErgometerApplication/ErgometerApplication/Ergometer.cs @@ -15,7 +15,8 @@ namespace ErgometerApplication public partial class Ergometer : Form { private ComPort comPort; - + private Meting schrijfweg; + private List _data; public Ergometer() { InitializeComponent(); @@ -154,12 +155,54 @@ namespace ErgometerApplication { statusButton.Enabled = false; updateTimer.Start(); + saveTimer.Start(); + writeTimer.Start(); } else { statusButton.Enabled = true; updateTimer.Stop(); + saveTimer.Stop(); + writeTimer.Stop(); } } + + private void saveTimer_Tick(object sender, EventArgs e) + { + saveData(schrijfweg); + } + + private void writeFile() + { + + string json = JsonConvert.SerializeObject(_data.ToArray()); + + System.IO.File.WriteAllText(@Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "//path.ergo", json); + } + private void saveData(Meting meting) + { + _data = new List(); + _data.Add(new Meting() + { + HeartBeat = schrijfweg.HeartBeat, + RPM = schrijfweg.RPM, + Speed = schrijfweg.Speed, + Distance = schrijfweg.Distance, + Power = schrijfweg.Power, + Energy = schrijfweg.Energy, + Seconds = schrijfweg.Seconds, + ActualPower = schrijfweg.ActualPower + }); + } + + private void writeTimer_Tick(object sender, EventArgs e) + { + writeFile(); + } + + private void Ergometer_Load(object sender, EventArgs e) + { + + } } } \ No newline at end of file diff --git a/ErgometerApplication/ErgometerApplication/Ergometer.resx b/ErgometerApplication/ErgometerApplication/Ergometer.resx new file mode 100644 index 0000000..67b00e8 --- /dev/null +++ b/ErgometerApplication/ErgometerApplication/Ergometer.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 160, 17 + + + 285, 17 + + \ No newline at end of file diff --git a/ErgometerApplication/ErgometerApplication/ErgometerApplication.csproj b/ErgometerApplication/ErgometerApplication/ErgometerApplication.csproj index e72cd80..de8ff05 100644 --- a/ErgometerApplication/ErgometerApplication/ErgometerApplication.csproj +++ b/ErgometerApplication/ErgometerApplication/ErgometerApplication.csproj @@ -57,6 +57,9 @@ + + Ergometer.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/ErgometerApplication/ErgometerApplication/Meting.cs b/ErgometerApplication/ErgometerApplication/Meting.cs index 6c88117..656fa3f 100644 --- a/ErgometerApplication/ErgometerApplication/Meting.cs +++ b/ErgometerApplication/ErgometerApplication/Meting.cs @@ -6,16 +6,16 @@ using System.Threading.Tasks; namespace ErgometerApplication { - class Meting + public class Meting { - public int HeartBeat { get; } - public int RPM { get; } - public double Speed { get; } - public double Distance { get; } - public int Power { get; } - public int Energy { get; } - public int Seconds { get; } - public int ActualPower { get; } + public int HeartBeat { get; set; } + public int RPM { get; set; } + public double Speed { get; set; } + public double Distance { get; set; } + public int Power { get; set; } + public int Energy { get; set; } + public int Seconds { get; set; } + public int ActualPower { get; set; } public Meting(int heartbeat, int rpm, double speed, double distance, int power, int energy, int seconds, int actualpower) { @@ -28,7 +28,10 @@ namespace ErgometerApplication Seconds = seconds; ActualPower = actualpower; } + public Meting() + { + } public override string ToString() { string temp = ""; diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.vshost.exe.manifest b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.vshost.exe.manifest new file mode 100644 index 0000000..061c9ca --- /dev/null +++ b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.vshost.exe.manifest @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 99638d1ddb62a135f099e3e5f451c66c1e5c045a..664d167b356dc5b850eff0093c7dbb9a9332dbb2 100644 GIT binary patch delta 106 zcmZ2txx#WoCAZ*YMrW&-(Bjmh;+W#Zyp+_U$qu}MlW%cf6R5!^A;7CBkcB3(*@5>p OH-;$4oXy>mlFR@msU|}J delta 102 zcmZ2sxx{iqCAYvNMrW&-(Bjmh;+UY++~oYp2YCV~-{!u?UyUJN#Gi>F7Pxr|?<{Vt J68(~r%mCm0Ca3@a diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt index 98090cc..e0dd5a5 100644 --- a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt +++ b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt @@ -7,3 +7,5 @@ C:\Users\Remco\Documents\GitHub\ErgometerApplication\ErgometerApplication\Ergome C:\Users\Remco\Documents\GitHub\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.csproj.GenerateResource.Cache C:\Users\Remco\Documents\GitHub\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.exe C:\Users\Remco\Documents\GitHub\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.pdb +C:\Users\sander\Documents\GitHub\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.exe +C:\Users\sander\Documents\GitHub\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.pdb