diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-10-18 13:57:15 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-10-18 13:57:15 +0300 |
| commit | d1dc68496c5e2d103db149bbbe40546acf58bb85 (patch) | |
| tree | 047d651a75a0e61566207279bbe2f5044d022d6d /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | |
| parent | a45a5edec5fbbb6c255a6df421aa7a8ae90a8af0 (diff) | |
| download | Tango-d1dc68496c5e2d103db149bbbe40546acf58bb85.tar.gz Tango-d1dc68496c5e2d103db149bbbe40546acf58bb85.zip | |
Implemented directional homing for motors and dispensers.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs index b0dac90f1..a02e09e9a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs @@ -1262,7 +1262,7 @@ namespace Tango.MachineStudio.Technician.ViewModels MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code, }); } - else if (action == MotorActionType.HomingStarted) + else if (action == MotorActionType.HomingForwardStarted || action == MotorActionType.HomingBackwardStarted) { item.HomingProgress = 0; item.IsHoming = true; @@ -1272,6 +1272,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code, Speed = item.Speed, + Direction = action == MotorActionType.HomingBackwardStarted ? MotorDirection.Backward : MotorDirection.Forward }) .Subscribe((response) => { @@ -1353,7 +1354,7 @@ namespace Tango.MachineStudio.Technician.ViewModels Index = item.TechDispenser.Code, }); } - else if (action == MotorActionType.HomingStarted) + else if (action == MotorActionType.HomingForwardStarted || action == MotorActionType.HomingBackwardStarted) { item.HomingProgress = 0; item.IsHoming = true; @@ -1363,6 +1364,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { Index = item.TechDispenser.Code, Speed = item.Speed, + Direction = action == MotorActionType.HomingBackwardStarted ? MotorDirection.Backward : MotorDirection.Forward }) .Subscribe((response) => { |