diff --git a/.gitignore b/.gitignore index 3c2089c..ae3debd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,329 +1,329 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ -**/Properties/launchSettings.json - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ +**/Properties/launchSettings.json + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder .mfractor/ \ No newline at end of file diff --git a/AccelVisualizer/AccelVisualizer.csproj b/AccelVisualizer/AccelVisualizer.csproj index 52f11b1..ca22da2 100644 --- a/AccelVisualizer/AccelVisualizer.csproj +++ b/AccelVisualizer/AccelVisualizer.csproj @@ -1,109 +1,109 @@ - - - - - Debug - AnyCPU - {FCBC25C8-0BBF-4EA4-9043-743B06FFBC02} - WinExe - AccelVisualizer - AccelVisualizer - v4.6.1 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - ..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll - - - ..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll - - - - - - - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - Chart.xaml - - - - - Designer - MSBuild:Compile - - - App.xaml - Code - - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - + + + + + Debug + AnyCPU + {FCBC25C8-0BBF-4EA4-9043-743B06FFBC02} + WinExe + AccelVisualizer + AccelVisualizer + v4.6.1 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + ..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll + + + ..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll + + + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + Chart.xaml + + + + + Designer + MSBuild:Compile + + + App.xaml + Code + + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + \ No newline at end of file diff --git a/AccelVisualizer/App.config b/AccelVisualizer/App.config index 731f6de..00bfd11 100644 --- a/AccelVisualizer/App.config +++ b/AccelVisualizer/App.config @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/AccelVisualizer/App.xaml b/AccelVisualizer/App.xaml index a5df817..ed8fa89 100644 --- a/AccelVisualizer/App.xaml +++ b/AccelVisualizer/App.xaml @@ -1,9 +1,9 @@ - - - - - + + + + + diff --git a/AccelVisualizer/App.xaml.cs b/AccelVisualizer/App.xaml.cs index 3d7645d..6b27cb2 100644 --- a/AccelVisualizer/App.xaml.cs +++ b/AccelVisualizer/App.xaml.cs @@ -1,18 +1,18 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; - -namespace AccelVisualizer -{ - /// - /// Interaction logic for App.xaml - /// - public partial class App : Application - { - - } -} +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace AccelVisualizer +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + + } +} diff --git a/AccelVisualizer/Chart.xaml b/AccelVisualizer/Chart.xaml index f7c6b97..de68468 100644 --- a/AccelVisualizer/Chart.xaml +++ b/AccelVisualizer/Chart.xaml @@ -1,48 +1,48 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AccelVisualizer/Chart.xaml.cs b/AccelVisualizer/Chart.xaml.cs index 824f581..a8747f1 100644 --- a/AccelVisualizer/Chart.xaml.cs +++ b/AccelVisualizer/Chart.xaml.cs @@ -1,174 +1,174 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using LiveCharts; -using LiveCharts.Wpf; -using LiveCharts.Configurations; - -namespace AccelVisualizer -{ - public partial class Chart : Window, INotifyPropertyChanged - { - public ChartValues ChartValuesX { get; set; } - public ChartValues ChartValuesY { get; set; } - public ChartValues ChartValuesZ { get; set; } - - public Func DateTimeFormatter { get; set; } - public double AxisStep { get; set; } - public double AxisUnit { get; set; } - private double _axisMax; - private double _axisMin; - double startTime; - - StampedSensorData sensorData; - bool listening; - - public Chart() - { - InitializeComponent(); - - //Mapper to plot points correctly - var mapper = Mappers.Xy() - .X(model => model.seconds) - .Y(model => model.Value); - - //Save mapper globally - Charting.For(mapper); - - ChartValuesX = new ChartValues(); - ChartValuesY = new ChartValues(); - ChartValuesZ = new ChartValues(); - - //set how to display the X Labels - //DateTimeFormatter = value => (long)Math.Floor(value); - - //AxisStep forces the distance between each separator in the X axis - AxisStep = 1; - - //AxisUnit lets the axis know that we are plotting in seconds - AxisUnit = 1; - - //Init the UDP socket - UDPSocket.InitSocket(); - - //Send a package to server - UDPSocket.SendPacket(); - - //Receive first package and take note of start time - sensorData = UDPSocket.ReceivePacket(); - startTime = sensorData.GetSeconds(); - - //Set axes correctly - SetAxisLimits(0); - - //Plot first value - PlotSensorData(sensorData); - - DataContext = this; - - this.Show(); - - listening = true; - - //Start new thread for package listener - Task.Factory.StartNew(ReceivePackages); - } - - private void ReceivePackages() - { - while (listening) - { - sensorData = UDPSocket.ReceivePacket(); - Console.WriteLine(sensorData.ToString()); - PlotSensorData(sensorData); - - //Remove data when too large - if(ChartValuesX.Count > 100) - { - RemoveData(); - } - } - } - - private void RemoveData() - { - ChartValuesX.RemoveAt(0); - ChartValuesY.RemoveAt(0); - ChartValuesZ.RemoveAt(0); - } - - public double AxisMax - { - get { return _axisMax; } - set - { - _axisMax = value; - OnPropertyChanged("AxisMax"); - } - } - public double AxisMin - { - get { return _axisMin; } - set - { - _axisMin = value; - OnPropertyChanged("AxisMin"); - } - } - - private void SetAxisLimits(double now) - { - AxisMax = now + 1; // force the axis to be 1 second ahead - AxisMin = now - 10; // and 30 seconds behind - } - - private void PlotSensorData(StampedSensorData data) - { - //If time is 0, don't plot - if(data.GetSeconds() == 0) - { - return; - } - - //Convert to Measurement data types - Measurement X, Y, Z; - double now = data.GetSeconds() - startTime; - - X = new Measurement { Value = data.GetX(), seconds = now }; - Y = new Measurement { Value = data.GetY(), seconds = now }; - Z = new Measurement { Value = data.GetZ(), seconds = now }; - - //Add values to plot - ChartValuesX.Add(X); - ChartValuesY.Add(Y); - ChartValuesZ.Add(Z); - - //Update axes - SetAxisLimits(now); - } - - #region INotifyPropertyChanged implementation - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void OnPropertyChanged(string propertyName = null) - { - if (PropertyChanged != null) - PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName)); - } - - #endregion - } -} +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; +using LiveCharts; +using LiveCharts.Wpf; +using LiveCharts.Configurations; + +namespace AccelVisualizer +{ + public partial class Chart : Window, INotifyPropertyChanged + { + public ChartValues ChartValuesX { get; set; } + public ChartValues ChartValuesY { get; set; } + public ChartValues ChartValuesZ { get; set; } + + public Func DateTimeFormatter { get; set; } + public double AxisStep { get; set; } + public double AxisUnit { get; set; } + private double _axisMax; + private double _axisMin; + double startTime; + + StampedSensorData sensorData; + bool listening; + + public Chart() + { + InitializeComponent(); + + //Mapper to plot points correctly + var mapper = Mappers.Xy() + .X(model => model.seconds) + .Y(model => model.Value); + + //Save mapper globally + Charting.For(mapper); + + ChartValuesX = new ChartValues(); + ChartValuesY = new ChartValues(); + ChartValuesZ = new ChartValues(); + + //set how to display the X Labels + //DateTimeFormatter = value => (long)Math.Floor(value); + + //AxisStep forces the distance between each separator in the X axis + AxisStep = 1; + + //AxisUnit lets the axis know that we are plotting in seconds + AxisUnit = 1; + + Show(); + + //Init the UDP socket + UDPSocket.InitSocket(); + + //Send a package to server + UDPSocket.SendPacket(); + + //Receive first package and take note of start time + sensorData = UDPSocket.ReceivePacket(); + startTime = sensorData.GetSeconds(); + + //Set axes correctly + SetAxisLimits(0); + + //Plot first value + PlotSensorData(sensorData); + + DataContext = this; + + listening = true; + + //Start new thread for package listener + Task.Factory.StartNew(ReceivePackages); + } + + private void ReceivePackages() + { + while (listening) + { + sensorData = UDPSocket.ReceivePacket(); + Console.WriteLine(sensorData.ToString()); + PlotSensorData(sensorData); + + //Remove data when too large + if(ChartValuesX.Count > 100) + { + RemoveData(); + } + } + } + + private void RemoveData() + { + ChartValuesX.RemoveAt(0); + ChartValuesY.RemoveAt(0); + ChartValuesZ.RemoveAt(0); + } + + public double AxisMax + { + get { return _axisMax; } + set + { + _axisMax = value; + OnPropertyChanged("AxisMax"); + } + } + public double AxisMin + { + get { return _axisMin; } + set + { + _axisMin = value; + OnPropertyChanged("AxisMin"); + } + } + + private void SetAxisLimits(double now) + { + AxisMax = now + 1; // force the axis to be 1 second ahead + AxisMin = now - 10; // and 30 seconds behind + } + + private void PlotSensorData(StampedSensorData data) + { + //If time is 0, don't plot + if(data.GetSeconds() == 0) + { + return; + } + + //Convert to Measurement data types + Measurement X, Y, Z; + double now = data.GetSeconds() - startTime; + + X = new Measurement { Value = data.GetX(), seconds = now }; + Y = new Measurement { Value = data.GetY(), seconds = now }; + Z = new Measurement { Value = data.GetZ(), seconds = now }; + + //Add values to plot + ChartValuesX.Add(X); + ChartValuesY.Add(Y); + ChartValuesZ.Add(Z); + + //Update axes + SetAxisLimits(now); + } + + #region INotifyPropertyChanged implementation + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void OnPropertyChanged(string propertyName = null) + { + if (PropertyChanged != null) + PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName)); + } + + #endregion + } +} diff --git a/AccelVisualizer/Measurement.cs b/AccelVisualizer/Measurement.cs index e70847a..99095ba 100644 --- a/AccelVisualizer/Measurement.cs +++ b/AccelVisualizer/Measurement.cs @@ -1,12 +1,12 @@ -using System; - -namespace AccelVisualizer -{ - public class Measurement - { - //public DateTime DateTime { get; set; } - public double seconds { get; set; } - public double Value { get; set; } - } -} - +using System; + +namespace AccelVisualizer +{ + public class Measurement + { + //public DateTime DateTime { get; set; } + public double seconds { get; set; } + public double Value { get; set; } + } +} + diff --git a/AccelVisualizer/Properties/AssemblyInfo.cs b/AccelVisualizer/Properties/AssemblyInfo.cs index 28abfe6..34e04a8 100644 --- a/AccelVisualizer/Properties/AssemblyInfo.cs +++ b/AccelVisualizer/Properties/AssemblyInfo.cs @@ -1,55 +1,55 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("AccelVisualizer")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("AccelVisualizer")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] - - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("AccelVisualizer")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("AccelVisualizer")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/AccelVisualizer/Properties/Resources.Designer.cs b/AccelVisualizer/Properties/Resources.Designer.cs index f739125..fb73b30 100644 --- a/AccelVisualizer/Properties/Resources.Designer.cs +++ b/AccelVisualizer/Properties/Resources.Designer.cs @@ -1,71 +1,71 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace AccelVisualizer.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AccelVisualizer.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace AccelVisualizer.Properties +{ + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AccelVisualizer.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/AccelVisualizer/Properties/Resources.resx b/AccelVisualizer/Properties/Resources.resx index af7dbeb..ffecec8 100644 --- a/AccelVisualizer/Properties/Resources.resx +++ b/AccelVisualizer/Properties/Resources.resx @@ -1,117 +1,117 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/AccelVisualizer/Properties/Settings.Designer.cs b/AccelVisualizer/Properties/Settings.Designer.cs index ca4e180..78a60dc 100644 --- a/AccelVisualizer/Properties/Settings.Designer.cs +++ b/AccelVisualizer/Properties/Settings.Designer.cs @@ -1,30 +1,30 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace AccelVisualizer.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 - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace AccelVisualizer.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 + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/AccelVisualizer/Properties/Settings.settings b/AccelVisualizer/Properties/Settings.settings index 033d7a5..8f2fd95 100644 --- a/AccelVisualizer/Properties/Settings.settings +++ b/AccelVisualizer/Properties/Settings.settings @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/AccelVisualizer/StampedSensorData.cs b/AccelVisualizer/StampedSensorData.cs index b9471ec..f041f5d 100644 --- a/AccelVisualizer/StampedSensorData.cs +++ b/AccelVisualizer/StampedSensorData.cs @@ -1,122 +1,122 @@ -using System; -using System.Globalization; -using System.Net; -using System.Net.Sockets; -using System.Text; - -namespace AccelVisualizer -{ - public class StampedSensorData - { - //Acceleration in G's - float x, y, z; - - //Timestamp - double seconds; - - //Constructors - public StampedSensorData() - { - x = 0; - y = 0; - z = 0; - seconds = 0; - } - - public StampedSensorData(float x, float y, float z, ulong seconds, ulong nanoSeconds) - { - this.x = x; - this.y = y; - this.z = z; - this.seconds = ConvertToSeconds(seconds, nanoSeconds); - } - - //Setters - public void SetX(float newX) - { - x = newX; - } - - public void SetY(float newY) - { - y = newY; - } - - public void SetZ(float newY) - { - y = newY; - } - - public void SetSeconds(double newSeconds) - { - seconds = newSeconds; - } - - //Getters - public float GetX() - { - return x; - } - - public float GetY() - { - return y; - } - - public float GetZ() - { - return z; - } - - public double GetSeconds() - { - return seconds; - } - - //Convert to seconds - public static double ConvertToSeconds(ulong seconds, ulong nanoSeconds) - { - return seconds + nanoSeconds / 1000000000.0; - } - - public static StampedSensorData ReadString(string input) - { - input.Replace('.', ','); - string[] data = input.Split(';'); - - if(data.Length < 5) - { - //Invalid data read, return empty sensordata - return new StampedSensorData(); - } - - float x, y, z; - ulong seconds, nanoSeconds; - - if(float.TryParse(data[0], out x) - && float.TryParse(data[1], out y) - && float.TryParse(data[2], out z) - && ulong.TryParse(data[3], out seconds) - && ulong.TryParse(data[4], out nanoSeconds)) - { - //Succesfully parsed, return data - return new StampedSensorData(x, y, z, seconds, nanoSeconds); - } else - { - //Parse not succesful, return empty sensordata - return new StampedSensorData(); - } - } - - public override string ToString() - { - return "X: " + x.ToString() + " Y: " + y.ToString() + " Z: " + z.ToString() + " Seconds: " + seconds.ToString(); - } - - public long GetTimeTicks() - { - return (long) Math.Floor(seconds * TimeSpan.TicksPerSecond); - } - } - -} +using System; +using System.Globalization; +using System.Net; +using System.Net.Sockets; +using System.Text; + +namespace AccelVisualizer +{ + public class StampedSensorData + { + //Acceleration in G's + float x, y, z; + + //Timestamp + double seconds; + + //Constructors + public StampedSensorData() + { + x = 0; + y = 0; + z = 0; + seconds = 0; + } + + public StampedSensorData(float x, float y, float z, ulong seconds, ulong nanoSeconds) + { + this.x = x; + this.y = y; + this.z = z; + this.seconds = ConvertToSeconds(seconds, nanoSeconds); + } + + //Setters + public void SetX(float newX) + { + x = newX; + } + + public void SetY(float newY) + { + y = newY; + } + + public void SetZ(float newY) + { + y = newY; + } + + public void SetSeconds(double newSeconds) + { + seconds = newSeconds; + } + + //Getters + public float GetX() + { + return x; + } + + public float GetY() + { + return y; + } + + public float GetZ() + { + return z; + } + + public double GetSeconds() + { + return seconds; + } + + //Convert to seconds + public static double ConvertToSeconds(ulong seconds, ulong nanoSeconds) + { + return seconds + nanoSeconds / 1000000000.0; + } + + public static StampedSensorData ReadString(string input) + { + input.Replace('.', ','); + string[] data = input.Split(';'); + + if(data.Length < 5) + { + //Invalid data read, return empty sensordata + return new StampedSensorData(); + } + + float x, y, z; + ulong seconds, nanoSeconds; + + if(float.TryParse(data[0], out x) + && float.TryParse(data[1], out y) + && float.TryParse(data[2], out z) + && ulong.TryParse(data[3], out seconds) + && ulong.TryParse(data[4], out nanoSeconds)) + { + //Succesfully parsed, return data + return new StampedSensorData(x, y, z, seconds, nanoSeconds); + } else + { + //Parse not succesful, return empty sensordata + return new StampedSensorData(); + } + } + + public override string ToString() + { + return "X: " + x.ToString() + " Y: " + y.ToString() + " Z: " + z.ToString() + " Seconds: " + seconds.ToString(); + } + + public long GetTimeTicks() + { + return (long) Math.Floor(seconds * TimeSpan.TicksPerSecond); + } + } + +} diff --git a/AccelVisualizer/UDPSocket.cs b/AccelVisualizer/UDPSocket.cs index fd01c8e..26350bd 100644 --- a/AccelVisualizer/UDPSocket.cs +++ b/AccelVisualizer/UDPSocket.cs @@ -1,100 +1,100 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Net; -using System.Net.Sockets; - -namespace AccelVisualizer -{ - class UDPSocket - { - // Data buffer for incoming data. - static byte[] bytes = new byte[512]; - - //Socket - static Socket sender; - static IPHostEntry ipHostInfo = Dns.GetHostEntry(Dns.GetHostName()); - static IPAddress ipAddress = IPAddress.Parse("192.168.0.109"); - static IPEndPoint remoteEP; - - public static void InitSocket() - { - try - { - //Port 5000 - remoteEP = new IPEndPoint(ipAddress, 5000); - - // Create a TCP/IP socket. - sender = new Socket(ipAddress.AddressFamily, - SocketType.Dgram, ProtocolType.Udp); - } - catch (Exception e) - { - Console.WriteLine(e.ToString()); - } - } - - public static void SendPacket() - { - try - { - // Encode the data string into a byte array. - byte[] msg = Encoding.ASCII.GetBytes("Send anything to start receiving packages."); - - // Send the data through the socket. - int bytesSent = sender.SendTo(msg, remoteEP); - } - catch (ArgumentNullException ane) - { - Console.WriteLine("ArgumentNullException : {0}", ane.ToString()); - } - catch (SocketException se) - { - Console.WriteLine("SocketException : {0}", se.ToString()); - } - catch (Exception e) - { - Console.WriteLine("Unexpected exception : {0}", e.ToString()); - } - } - - public static StampedSensorData ReceivePacket() - { - try - { - //Capture the identity of the sending host. - IPEndPoint sendingEndpoint = new IPEndPoint(IPAddress.Any, 0); - EndPoint senderRemote = (EndPoint)sendingEndpoint; - - int bytesRec = sender.ReceiveFrom(bytes, ref senderRemote); - string currentRead = Encoding.ASCII.GetString(bytes).Replace('.', ','); - - return StampedSensorData.ReadString(currentRead); - } - catch (ArgumentNullException ane) - { - Console.WriteLine("ArgumentNullException : {0}", ane.ToString()); - return new StampedSensorData(); - } - catch (SocketException se) - { - Console.WriteLine("SocketException : {0}", se.ToString()); - return new StampedSensorData(); - } - catch (Exception e) - { - Console.WriteLine("Unexpected exception : {0}", e.ToString()); - return new StampedSensorData(); - } - } - - public static void CloseSocket() - { - // Release the socket. - sender.Shutdown(SocketShutdown.Both); - sender.Close(); - } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Net; +using System.Net.Sockets; + +namespace AccelVisualizer +{ + class UDPSocket + { + // Data buffer for incoming data. + static byte[] bytes = new byte[512]; + + //Socket + static Socket sender; + static IPHostEntry ipHostInfo = Dns.GetHostEntry(Dns.GetHostName()); + static IPAddress ipAddress = IPAddress.Parse("192.168.120.106"); + static IPEndPoint remoteEP; + + public static void InitSocket() + { + try + { + //Port 5000 + remoteEP = new IPEndPoint(ipAddress, 5000); + + // Create a TCP/IP socket. + sender = new Socket(ipAddress.AddressFamily, + SocketType.Dgram, ProtocolType.Udp); + } + catch (Exception e) + { + Console.WriteLine(e.ToString()); + } + } + + public static void SendPacket() + { + try + { + // Encode the data string into a byte array. + byte[] msg = Encoding.ASCII.GetBytes("Send anything to start receiving packages."); + + // Send the data through the socket. + int bytesSent = sender.SendTo(msg, remoteEP); + } + catch (ArgumentNullException ane) + { + Console.WriteLine("ArgumentNullException : {0}", ane.ToString()); + } + catch (SocketException se) + { + Console.WriteLine("SocketException : {0}", se.ToString()); + } + catch (Exception e) + { + Console.WriteLine("Unexpected exception : {0}", e.ToString()); + } + } + + public static StampedSensorData ReceivePacket() + { + try + { + //Capture the identity of the sending host. + IPEndPoint sendingEndpoint = new IPEndPoint(IPAddress.Any, 0); + EndPoint senderRemote = (EndPoint)sendingEndpoint; + + int bytesRec = sender.ReceiveFrom(bytes, ref senderRemote); + string currentRead = Encoding.ASCII.GetString(bytes).Replace('.', ','); + + return StampedSensorData.ReadString(currentRead); + } + catch (ArgumentNullException ane) + { + Console.WriteLine("ArgumentNullException : {0}", ane.ToString()); + return new StampedSensorData(); + } + catch (SocketException se) + { + Console.WriteLine("SocketException : {0}", se.ToString()); + return new StampedSensorData(); + } + catch (Exception e) + { + Console.WriteLine("Unexpected exception : {0}", e.ToString()); + return new StampedSensorData(); + } + } + + public static void CloseSocket() + { + // Release the socket. + sender.Shutdown(SocketShutdown.Both); + sender.Close(); + } + } +} diff --git a/AccelVisualizer/packages.config b/AccelVisualizer/packages.config index 1dbd7cb..775dc9a 100644 --- a/AccelVisualizer/packages.config +++ b/AccelVisualizer/packages.config @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/ClientTest.sln b/ClientTest.sln index 0396f24..fc1534a 100644 --- a/ClientTest.sln +++ b/ClientTest.sln @@ -1,25 +1,25 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AccelVisualizer", "AccelVisualizer\AccelVisualizer.csproj", "{FCBC25C8-0BBF-4EA4-9043-743B06FFBC02}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FCBC25C8-0BBF-4EA4-9043-743B06FFBC02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCBC25C8-0BBF-4EA4-9043-743B06FFBC02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCBC25C8-0BBF-4EA4-9043-743B06FFBC02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCBC25C8-0BBF-4EA4-9043-743B06FFBC02}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {9D299831-D223-4240-9C3C-213A66157A87} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2027 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AccelVisualizer", "AccelVisualizer\AccelVisualizer.csproj", "{FCBC25C8-0BBF-4EA4-9043-743B06FFBC02}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FCBC25C8-0BBF-4EA4-9043-743B06FFBC02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FCBC25C8-0BBF-4EA4-9043-743B06FFBC02}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FCBC25C8-0BBF-4EA4-9043-743B06FFBC02}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FCBC25C8-0BBF-4EA4-9043-743B06FFBC02}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {9D299831-D223-4240-9C3C-213A66157A87} + EndGlobalSection +EndGlobal diff --git a/ClientTest/App.config b/ClientTest/App.config index 731f6de..00bfd11 100644 --- a/ClientTest/App.config +++ b/ClientTest/App.config @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/ClientTest/ClientTest.csproj b/ClientTest/ClientTest.csproj index 683a28a..36b2973 100644 --- a/ClientTest/ClientTest.csproj +++ b/ClientTest/ClientTest.csproj @@ -1,52 +1,52 @@ - - - - - Debug - AnyCPU - {0AA862E1-2247-4CA7-8324-FBD7C5959CAF} - Exe - ClientTest - ClientTest - v4.6.1 - 512 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - + + + + + Debug + AnyCPU + {0AA862E1-2247-4CA7-8324-FBD7C5959CAF} + Exe + ClientTest + ClientTest + v4.6.1 + 512 + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClientTest/Program.cs b/ClientTest/Program.cs index 0aad98b..fb6d067 100644 --- a/ClientTest/Program.cs +++ b/ClientTest/Program.cs @@ -1,82 +1,82 @@ -using System; -using System.Net; -using System.Net.Sockets; -using System.Text; - -public class SynchronousSocketClient -{ - - public static void StartClient() - { - // Data buffer for incoming data. - byte[] bytes = new byte[512]; - - // Connect to a remote device. - try - { - // Establish the remote endpoint for the socket. - // This example uses port 5000 on the local computer. - IPHostEntry ipHostInfo = Dns.GetHostEntry(Dns.GetHostName()); - IPAddress ipAddress = IPAddress.Parse("192.168.0.109"); - IPEndPoint remoteEP = new IPEndPoint(ipAddress, 5000); - - // Create a TCP/IP socket. - Socket sender = new Socket(ipAddress.AddressFamily, - SocketType.Dgram, ProtocolType.Udp); - - // Connect the socket to the remote endpoint. Catch any errors. - try - { - //sender.Connect(remoteEP); - - //Console.WriteLine("Socket connected to {0}", - // sender.RemoteEndPoint.ToString()); - - // Encode the data string into a byte array. - byte[] msg = Encoding.ASCII.GetBytes("This is a test"); - - // Send the data through the socket. - int bytesSent = sender.SendTo(msg, remoteEP); - - // Creates an IPEndPoint to capture the identity of the sending host. - IPEndPoint sendingEndpoint = new IPEndPoint(IPAddress.Any, 0); - EndPoint senderRemote = (EndPoint)sendingEndpoint; - - // Receive the response from the remote device. - while(true) - { - int bytesRec = sender.ReceiveFrom(bytes, ref senderRemote); - Console.WriteLine("Echoed test = {0}", Encoding.ASCII.GetString(bytes, 0, bytesRec)); - } - - // Release the socket. - sender.Shutdown(SocketShutdown.Both); - sender.Close(); - - } - catch (ArgumentNullException ane) - { - Console.WriteLine("ArgumentNullException : {0}", ane.ToString()); - } - catch (SocketException se) - { - Console.WriteLine("SocketException : {0}", se.ToString()); - } - catch (Exception e) - { - Console.WriteLine("Unexpected exception : {0}", e.ToString()); - } - - } - catch (Exception e) - { - Console.WriteLine(e.ToString()); - } - } - - public static int Main(String[] args) - { - StartClient(); - return 0; - } -} +using System; +using System.Net; +using System.Net.Sockets; +using System.Text; + +public class SynchronousSocketClient +{ + + public static void StartClient() + { + // Data buffer for incoming data. + byte[] bytes = new byte[512]; + + // Connect to a remote device. + try + { + // Establish the remote endpoint for the socket. + // This example uses port 5000 on the local computer. + IPHostEntry ipHostInfo = Dns.GetHostEntry(Dns.GetHostName()); + IPAddress ipAddress = IPAddress.Parse("192.168.0.109"); + IPEndPoint remoteEP = new IPEndPoint(ipAddress, 5000); + + // Create a TCP/IP socket. + Socket sender = new Socket(ipAddress.AddressFamily, + SocketType.Dgram, ProtocolType.Udp); + + // Connect the socket to the remote endpoint. Catch any errors. + try + { + //sender.Connect(remoteEP); + + //Console.WriteLine("Socket connected to {0}", + // sender.RemoteEndPoint.ToString()); + + // Encode the data string into a byte array. + byte[] msg = Encoding.ASCII.GetBytes("This is a test"); + + // Send the data through the socket. + int bytesSent = sender.SendTo(msg, remoteEP); + + // Creates an IPEndPoint to capture the identity of the sending host. + IPEndPoint sendingEndpoint = new IPEndPoint(IPAddress.Any, 0); + EndPoint senderRemote = (EndPoint)sendingEndpoint; + + // Receive the response from the remote device. + while(true) + { + int bytesRec = sender.ReceiveFrom(bytes, ref senderRemote); + Console.WriteLine("Echoed test = {0}", Encoding.ASCII.GetString(bytes, 0, bytesRec)); + } + + // Release the socket. + sender.Shutdown(SocketShutdown.Both); + sender.Close(); + + } + catch (ArgumentNullException ane) + { + Console.WriteLine("ArgumentNullException : {0}", ane.ToString()); + } + catch (SocketException se) + { + Console.WriteLine("SocketException : {0}", se.ToString()); + } + catch (Exception e) + { + Console.WriteLine("Unexpected exception : {0}", e.ToString()); + } + + } + catch (Exception e) + { + Console.WriteLine(e.ToString()); + } + } + + public static int Main(String[] args) + { + StartClient(); + return 0; + } +} diff --git a/ClientTest/Properties/AssemblyInfo.cs b/ClientTest/Properties/AssemblyInfo.cs index da929e3..68f745a 100644 --- a/ClientTest/Properties/AssemblyInfo.cs +++ b/ClientTest/Properties/AssemblyInfo.cs @@ -1,36 +1,36 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ClientTest")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ClientTest")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("0aa862e1-2247-4ca7-8324-fbd7c5959caf")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("ClientTest")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("ClientTest")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("0aa862e1-2247-4ca7-8324-fbd7c5959caf")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")]