aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-05-06 13:50:14 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-05-06 13:50:14 +0300
commitc14073e78d2c5b9569f91f47609d431da48ba706 (patch)
tree1498d47e10c6e97d28c3f45f5f9ac57276801a98 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels
parent551ca57984c369ce6084a612c8def44e2dbc3cc8 (diff)
downloadTango-c14073e78d2c5b9569f91f47609d431da48ba706.tar.gz
Tango-c14073e78d2c5b9569f91f47609d431da48ba706.zip
Added start/stop diagnostics and debugging on PMR.
Added device info to connected machine view. Added enable/disable diagnostics/debugging to connected machine view. Improved transfer rate calculation.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs
index 40a407093..fdd0fed5b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs
@@ -239,7 +239,7 @@ namespace Tango.MachineStudio.DataCapture.ViewModels
InvalidateRelayCommands();
}
- private void _frameProvider_FrameReceived(object sender, PushDiagnosticsResponse frame)
+ private void _frameProvider_FrameReceived(object sender, StartDiagnosticsResponse frame)
{
if (!_frameProvider.Disable)
{
@@ -358,7 +358,7 @@ namespace Tango.MachineStudio.DataCapture.ViewModels
{
if (_frameProvider.Disable)
{
- _frameProvider.PushFrame(frame.PushDiagnosticsResponse);
+ _frameProvider.PushFrame(frame.StartDiagnosticsResponse);
CaptureDevices.First().BeginInvoke(() =>
{