Merged job-prepare branch.

1 files changed, 15 insertions, 3 deletions

diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index ca8bacaa4..19c63bdc5 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -241,20 +241,23 @@ namespace Tango.Emulations.Emulators
                         Index = i,
                         Slot = CartridgeSlot.Ink,
                     },
-                    State = CartridgeState.Present
+                    State = CartridgeState.Present,
+                    Message = "This is an emulated ink filling message"
                 });
             }
 
             InkFillingStatus.CartridgesStatuses.Add(new CartridgeStatus()
             {
                 Cartridge = new Cartridge() { Index = 0, Slot = CartridgeSlot.WasteMiddle },
-                State = CartridgeState.Present
+                State = CartridgeState.Present,
+                Message = "This is an emulated waste emptying message"
             });
 
             InkFillingStatus.CartridgesStatuses.Add(new CartridgeStatus()
             {
                 Cartridge = new Cartridge() { Index = 1, Slot = CartridgeSlot.WasteLower },
-                State = CartridgeState.Present
+                State = CartridgeState.Present,
+                Message = "This is an emulated waste emptying message"
             });
         }
 
@@ -476,6 +479,9 @@ namespace Tango.Emulations.Emulators
                 case MessageType.DataStoreItemModifiedRequest:
                     HandleDataStoreItemModifiedRequest(MessageFactory.ParseTangoMessageFromContainer<DataStoreItemModifiedRequest>(container));
                     break;
+                case MessageType.JobPrepareRequest:
+                    HandleJobPrepareRequest(MessageFactory.ParseTangoMessageFromContainer<JobPrepareRequest>(container));
+                    break;
             }
         }
 
@@ -1768,6 +1774,12 @@ namespace Tango.Emulations.Emulators
             });
         }
 
+        private async void HandleJobPrepareRequest(TangoMessage<JobPrepareRequest> request)
+        {
+            await Task.Delay(2000);
+            await Transporter.SendResponse<JobPrepareResponse>(new JobPrepareResponse(), request.Container.Token);
+        }
+
         #endregion
 
         #region Public Methods