From b3d31195b611336cb3a9986053fd4021b1f21d26 Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Fri, 4 Sep 2015 12:15:59 +0200 Subject: [PATCH] Added basic read functionality --- ErgometerUitlezer/ComPort.cs | 19 ++++ ErgometerUitlezer/Ergometer.resx | 120 +++++++++++++++++++++ ErgometerUitlezer/ErgometerUitlezer.csproj | 12 ++- ErgometerUitlezer/Form1.Designer.cs | 39 ------- ErgometerUitlezer/Form1.cs | 20 ---- ErgometerUitlezer/Meting.cs | 46 ++++++++ ErgometerUitlezer/Program.cs | 3 +- 7 files changed, 196 insertions(+), 63 deletions(-) create mode 100644 ErgometerUitlezer/ComPort.cs create mode 100644 ErgometerUitlezer/Ergometer.resx delete mode 100644 ErgometerUitlezer/Form1.Designer.cs delete mode 100644 ErgometerUitlezer/Form1.cs create mode 100644 ErgometerUitlezer/Meting.cs diff --git a/ErgometerUitlezer/ComPort.cs b/ErgometerUitlezer/ComPort.cs new file mode 100644 index 0000000..9f0e386 --- /dev/null +++ b/ErgometerUitlezer/ComPort.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.IO.Ports; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ErgometerUitlezer +{ + class ComPort + { + SerialPort comPort; + + public ComPort() + { + comPort = null; + } + } +} diff --git a/ErgometerUitlezer/Ergometer.resx b/ErgometerUitlezer/Ergometer.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ErgometerUitlezer/Ergometer.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/ErgometerUitlezer/ErgometerUitlezer.csproj b/ErgometerUitlezer/ErgometerUitlezer.csproj index f40ed31..0768cd0 100644 --- a/ErgometerUitlezer/ErgometerUitlezer.csproj +++ b/ErgometerUitlezer/ErgometerUitlezer.csproj @@ -46,14 +46,20 @@ - + + Form - - Form1.cs + + Ergometer.cs + + + + Ergometer.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/ErgometerUitlezer/Form1.Designer.cs b/ErgometerUitlezer/Form1.Designer.cs deleted file mode 100644 index ace85b1..0000000 --- a/ErgometerUitlezer/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace ErgometerUitlezer -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Text = "Form1"; - } - - #endregion - } -} - diff --git a/ErgometerUitlezer/Form1.cs b/ErgometerUitlezer/Form1.cs deleted file mode 100644 index 4f078f0..0000000 --- a/ErgometerUitlezer/Form1.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace ErgometerUitlezer -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} diff --git a/ErgometerUitlezer/Meting.cs b/ErgometerUitlezer/Meting.cs new file mode 100644 index 0000000..e17001c --- /dev/null +++ b/ErgometerUitlezer/Meting.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ErgometerUitlezer +{ + 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 Meting(int heartbeat, int rpm, double speed, double distance, int power, int energy, int seconds, int actualpower) + { + HeartBeat = heartbeat; + RPM = rpm; + Speed = speed; + Distance = distance; + Power = power; + Energy = energy; + Seconds = seconds; + ActualPower = actualpower; + } + + public override string ToString() + { + string temp = ""; + temp += "Heartbeat: " + HeartBeat + "\n"; + temp += "RPM: " + RPM + "\n"; + temp += "Speed: " + Speed + "\n"; + temp += "Distance: " + Distance + "\n"; + temp += "Power: " + Power + "\n"; + temp += "Energy: " + Energy + "\n"; + temp += "Seconds: " + Seconds + "\n"; + temp += "ActualPower: " + ActualPower + "\n"; + return temp; + } + } +} diff --git a/ErgometerUitlezer/Program.cs b/ErgometerUitlezer/Program.cs index 0f09622..915619b 100644 --- a/ErgometerUitlezer/Program.cs +++ b/ErgometerUitlezer/Program.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO.Ports; using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; @@ -16,7 +17,7 @@ namespace ErgometerUitlezer { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); + Application.Run(new Ergometer()); } } }