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.

1 files changed, 11 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs
index 9f18ec8d4..54154d71a 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs
@@ -299,7 +299,6 @@ namespace Tango.Touch.Controls
         {
             _border_drag.EnsureHeight();
             _border_notifications.EnsureHeight();
-            _scrollViewer.ScrollToTop();
 
             _border_notifications.StartDoubleAnimation(Border.HeightProperty, TimeSpan.FromSeconds(0.2), CurrentMinHeight, null, 1, null, () =>
               {
@@ -333,6 +332,14 @@ namespace Tango.Touch.Controls
             UpdateExpanded(false);
 
             IsExpanded = false;
+
+            Task.Delay(400).ContinueWith((x) =>
+            {
+                Dispatcher.BeginInvoke(new Action(() => 
+                {
+                    _scrollViewer.ScrollToTop();
+                }));
+            });
         }
 
         private void GridNotificationMouseUp(object sender, MouseOrTouchEventArgs e)
@@ -365,6 +372,8 @@ namespace Tango.Touch.Controls
                         CloseNotifications();
                     }
                 }
+
+                _scrollViewer.DisableScrolling = false;
             }
         }
 
@@ -433,6 +442,7 @@ namespace Tango.Touch.Controls
                 _last_mouse_y = _downLocation.Y;
                 _last_delta_measure_time = DateTime.Now;
                 _last_manipulation_delta = 0;
+                _scrollViewer.DisableScrolling = true;
                 _isMouseDown = true;
             }
         }