Added DEVICE_ID, DEVICE_NAME & IS_DEVICE_REGISTERED fields to db.

Prevent multiple machine setup from different devices.
Moved notification to inner layout on PPC.
Improved PPC notification bar.
Added more machine status support from embedded.
FIxed issue with external bridge and emergency pressed.

2 files changed, 12 insertions, 8 deletions

diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index 64071a554..ad3b242f4 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -625,6 +625,8 @@ namespace Tango.Emulations.Emulators
 
         private void HandleJobRequest(TangoMessage<JobRequest> request)
         {
+            MachineStatus.State = MachineState.PreparingJob;
+
             JobTicket job = request.Message.JobTicket;
             _current_job_ticket = job;
             _current_job_resume_token = null;
@@ -662,6 +664,8 @@ namespace Tango.Emulations.Emulators
 
             Task.Factory.StartNew(() =>
             {
+                MachineStatus.State = MachineState.RunningJob;
+
                 while (progress < length + job.ProcessParameters.DryerBufferLength * ProcessParametersTable.DRYER_METERS_PER_CYCLE && !_cancelJob)
                 {
                     var status = new PMR.Printing.JobStatus();
@@ -742,6 +746,8 @@ namespace Tango.Emulations.Emulators
                         }, _current_job_resume_token, !_cancelJob);
                     }
                 }
+
+                MachineStatus.State = MachineState.Ready;
             });
         }
 
diff --git a/Software/Visual_Studio/Tango.Emulations/ExternalBridge/EmulatorExternalBridge.cs b/Software/Visual_Studio/Tango.Emulations/ExternalBridge/EmulatorExternalBridge.cs
index 764e0d719..da428b6f7 100644
--- a/Software/Visual_Studio/Tango.Emulations/ExternalBridge/EmulatorExternalBridge.cs
+++ b/Software/Visual_Studio/Tango.Emulations/ExternalBridge/EmulatorExternalBridge.cs
@@ -53,22 +53,20 @@ namespace Tango.Emulations.ExternalBridge
         /// Connects the transport component.
         /// </summary>
         /// <returns></returns>
-        public override Task Connect()
+        public override async Task Connect()
         {
-            return Task.WhenAll(
-                Emulator.Start(),
-                base.Connect());
+            await Emulator.Start();
+            await base.Connect();
         }
 
         /// <summary>
         /// Disconnects the machine operator and the underlying transporter.
         /// </summary>
         /// <returns></returns>
-        public override Task Disconnect()
+        public override async Task Disconnect()
         {
-            return Task.WhenAll(
-                base.Disconnect(),
-                Emulator.Stop());
+            await base.Disconnect();
+            await Emulator.Stop();
         }
 
         /// <summary>