diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-21 09:17:46 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-21 09:17:46 +0300 |
| commit | 193f7f5e096751da747b0fe9d145bd43a02d7340 (patch) | |
| tree | ce0aa138252ca76426fbbc84e1753d7e410011a9 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | |
| parent | 98493042a5dace2535dd4343c047eaf1bd784ae3 (diff) | |
| parent | f468145c16b5c677201327feeb4f207c21df0b0b (diff) | |
| download | Tango-193f7f5e096751da747b0fe9d145bd43a02d7340.tar.gz Tango-193f7f5e096751da747b0fe9d145bd43a02d7340.zip | |
merge after conflict
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 | 8 |
1 files changed, 7 insertions, 1 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 f79ebb29b..333e43187 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 @@ -903,6 +903,7 @@ namespace Tango.MachineStudio.Technician.ViewModels await MachineOperator.StartMotorJogging(new MotorJoggingRequest() { MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code, + Speed = item.Speed, Direction = MotorDirection.Forward, }); } @@ -918,6 +919,7 @@ namespace Tango.MachineStudio.Technician.ViewModels await MachineOperator.StartMotorJogging(new MotorJoggingRequest() { MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code, + Speed = item.Speed, Direction = MotorDirection.Backward, }); } @@ -937,6 +939,7 @@ namespace Tango.MachineStudio.Technician.ViewModels MachineOperator.StartMotorHoming(new MotorHomingRequest() { MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code, + Speed = item.Speed, }) .Subscribe((response) => { @@ -988,6 +991,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { Index = item.TechDispenser.Code, Direction = MotorDirection.Forward, + Speed = item.Speed, }); } else if (action == MotorActionType.ForwardReleased) @@ -1003,6 +1007,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { Index = item.TechDispenser.Code, Direction = MotorDirection.Backward, + Speed = item.Speed, }); } else if (action == MotorActionType.BackwardReleased) @@ -1020,7 +1025,8 @@ namespace Tango.MachineStudio.Technician.ViewModels MachineOperator.StartDispenserHoming(new DispenserHomingRequest() { - Index = item.TechDispenser.Code + Index = item.TechDispenser.Code, + Speed = item.Speed, }) .Subscribe((response) => { |