diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-26 16:02:44 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-26 16:02:44 +0300 |
| commit | 9283a0917dc29aba1e89bf40bc59f255f73cec48 (patch) | |
| tree | 03677bcdf84f75451009b727b5a9a6e17396d54d /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels | |
| parent | d70d3466cd6e67e2b87af4865ee6e629d2edb4ca (diff) | |
| download | Tango-9283a0917dc29aba1e89bf40bc59f255f73cec48.tar.gz Tango-9283a0917dc29aba1e89bf40bc59f255f73cec48.zip | |
Refactored proto C compiler to enable cross directory messages.
Refactored tech motors and dispensers to use types from hardware.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | 32 |
1 files changed, 16 insertions, 16 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 54a790cbe..0c09850c1 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 @@ -794,7 +794,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { await MachineOperator.StartMotorJogging(new MotorJoggingRequest() { - Code = item.HardwareMotorType.Code, + MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code, Direction = MotorDirection.Forward, }); } @@ -802,14 +802,14 @@ namespace Tango.MachineStudio.Technician.ViewModels { await MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest() { - Code = item.HardwareMotorType.Code, + MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code, }); } else if (action == MotorActionType.BackwardPressed) { await MachineOperator.StartMotorJogging(new MotorJoggingRequest() { - Code = item.HardwareMotorType.Code, + MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code, Direction = MotorDirection.Backward, }); } @@ -817,7 +817,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { await MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest() { - Code = item.HardwareMotorType.Code, + MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code, }); } else if (action == MotorActionType.HomingStarted) @@ -828,7 +828,7 @@ namespace Tango.MachineStudio.Technician.ViewModels MachineOperator.StartMotorHoming(new MotorHomingRequest() { - Code = item.HardwareMotorType.Code + MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code, }) .Subscribe((response) => { @@ -848,7 +848,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { await MachineOperator.StopMotorHoming(new MotorAbortHomingRequest() { - Code = item.HardwareMotorType.Code, + MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code, }); item.IsHoming = false; @@ -878,7 +878,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { await MachineOperator.StartDispenserJogging(new DispenserJoggingRequest() { - Code = item.TechDispenser.Code, + Index = item.TechDispenser.Code, Direction = MotorDirection.Forward, }); } @@ -886,14 +886,14 @@ namespace Tango.MachineStudio.Technician.ViewModels { await MachineOperator.StopDispenserJogging(new DispenserAbortJoggingRequest() { - Code = item.TechDispenser.Code, + Index = item.TechDispenser.Code, }); } else if (action == MotorActionType.BackwardPressed) { await MachineOperator.StartDispenserJogging(new DispenserJoggingRequest() { - Code = item.TechDispenser.Code, + Index = item.TechDispenser.Code, Direction = MotorDirection.Backward, }); } @@ -901,7 +901,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { await MachineOperator.StopDispenserJogging(new DispenserAbortJoggingRequest() { - Code = item.TechDispenser.Code, + Index = item.TechDispenser.Code, }); } else if (action == MotorActionType.HomingStarted) @@ -912,7 +912,7 @@ namespace Tango.MachineStudio.Technician.ViewModels MachineOperator.StartDispenserHoming(new DispenserHomingRequest() { - Code = item.TechDispenser.Code + Index = item.TechDispenser.Code }) .Subscribe((response) => { @@ -932,7 +932,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { await MachineOperator.StopDispenserHoming(new DispenserAbortHomingRequest() { - Code = item.TechDispenser.Code, + Index = item.TechDispenser.Code, }); item.IsHoming = false; @@ -1044,7 +1044,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { await Task.WhenAll(item.TechMotors.Select(motor => MachineOperator.StartMotorJogging(new MotorJoggingRequest() { - Code = motor.Code, + MotorType = (PMR.Hardware.HardwareMotorType)motor.Code, Direction = MotorDirection.Forward, }))); } @@ -1052,14 +1052,14 @@ namespace Tango.MachineStudio.Technician.ViewModels { await Task.WhenAll(item.TechMotors.Select(motor => MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest() { - Code = motor.Code, + MotorType = (PMR.Hardware.HardwareMotorType)motor.Code, }))); } else if (action == MotorActionType.BackwardPressed) { await Task.WhenAll(item.TechMotors.Select(motor => MachineOperator.StartMotorJogging(new MotorJoggingRequest() { - Code = motor.Code, + MotorType = (PMR.Hardware.HardwareMotorType)motor.Code, Direction = MotorDirection.Backward, }))); } @@ -1067,7 +1067,7 @@ namespace Tango.MachineStudio.Technician.ViewModels { await Task.WhenAll(item.TechMotors.Select(motor => MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest() { - Code = motor.Code, + MotorType = (PMR.Hardware.HardwareMotorType)motor.Code, }))); } //else if (action == MotorActionType.HomingStarted) |