From f47b12804bfd7e9f3bb7552c2a65c552e1bc136a Mon Sep 17 00:00:00 2001
From: Alexandru Radovici <alexandru.radovici@wyliodrin.com>
Date: Fri, 10 Jun 2016 12:09:42 +0300
Subject: [PATCH] Fixed Chrome 51 startup issue * Updated angular * Updated
 firmata

---
 CHANGELOG                        | 11 +++++++++++
 bower.json                       |  2 +-
 manifest.json                    |  2 +-
 package.json                     |  2 +-
 source/Devices.js                | 26 +++++++++++++++++---------
 source/public/views/connect.html |  8 ++++----
 source/public/wyliodrin.js       |  9 ++++++++-
 7 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e4bf9f0e..2652ab84 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,14 @@
+Wyliodrin STUDIO 10.7.1
+* Fixed Chrome 51 startup
+* Fixed connect screen
+* Updated angular
+* Updated firmata
+
+Wyliodrin STUDIO 10.7
+* Added new connect window
+* Added Chrome Device firmata port autodetect
+* Added Windows 10 IoT Core for DragonBoard and Raspberry Pi
+
 Wyliodrin STUDIO 10.6
 * fixed makefile
 
diff --git a/bower.json b/bower.json
index 2a9ff1cd..bb1506fa 100644
--- a/bower.json
+++ b/bower.json
@@ -16,7 +16,7 @@
     "tests"
   ],
   "dependencies": {
-    "angular": "1.5.2",
+    "angular": "1.5.6",
     "jquery": "~2.1.4",
     "angular-ui": "~0.4.0",
     "xterm.js": "~0.9.3",
diff --git a/manifest.json b/manifest.json
index bcc72a61..adf97a55 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "description":"__MSG_appDesc__",
-  "version": "10.6",
+  "version": "10.7",
   "manifest_version": 2,
   "default_locale":"en",
   "author":"Wyliodrin SRL",
diff --git a/package.json b/package.json
index 6e96bc5a..e4d0c48f 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "debug": "^2.2.0",
     "dexie": "^1.2.0",
     "dict": "^1.4.0",
-    "firmata": "^0.11.3",
+    "firmata": "^0.12.0",
     "highcharts": "^4.2.1",
     "highcharts-ng": "0.0.11",
     "lodash": "^4.0.1",
diff --git a/source/Devices.js b/source/Devices.js
index a130da4c..97ab2f5d 100644
--- a/source/Devices.js
+++ b/source/Devices.js
@@ -23,34 +23,41 @@ class Device
 	constructor (id)
 	{
 		this._id = id;
+		this.properties = {};
 		this.parametersArray = [null, null, null, null];
 	}
 
 	addParameters (priority, parameters)
 	{
+		this.properties = {};
 		this.parametersArray[priority] = parameters;
 	}
 
 	eraseProperties (priority)
 	{
+		this.properties = {};
 		this.parametersArray[priority] = null;
 	}
 
 	get (property)
 	{
 		debug ('Get '+property+' for '+this.id);
-		var data = null;
-		for (var i = this.parametersArray.length-1; i>=0; i--)
+		var data = this.properties[property];
+		if (data === undefined)
 		{
-			var parameters = this.parametersArray[i];
-			if (parameters !== null)
+			for (var i = this.parametersArray.length-1; i>=0; i--)
 			{
-				if (parameters[property])
+				var parameters = this.parametersArray[i];
+				if (parameters !== null)
 				{
-					debug ('Found '+property+' priority '+i+' for id '+this.id);
-					data = parameters[property];
+					if (parameters[property])
+					{
+						debug ('Found '+property+' priority '+i+' for id '+this.id);
+						data = parameters[property];
+					}
 				}
 			}
+			this.properties[property] = data;
 		}
 		return data;
 	}
@@ -150,9 +157,10 @@ function compactDevices ()
 {
 	for (var i=0; i<devices.length; i++)
 	{
+		debug ('Device hasProperties '+devices[i].hasProperties()+' for id '+devices[i].id);
 		if (!devices[i].hasProperties())
 		{
-			debug ('Device '+devices[i].name+' '+devices[i].ip+' has 0 properties');
+			debug ('Device '+devices[i].id+' has 0 properties');
 			devices.splice (i, 1);
 			i--;
 		}
@@ -280,8 +288,8 @@ chrome.mdns.onServiceList.addListener (function (services)
 				device.addParameters (WORKSTATION, parameters);
 			}
 		}
-		compactDevices ();
 	});
+	compactDevices ();
 }, {serviceType: '_workstation._tcp.local'});
 
 module.exports.getDevices = getDevices;
diff --git a/source/public/views/connect.html b/source/public/views/connect.html
index c3859d30..a87862d7 100644
--- a/source/public/views/connect.html
+++ b/source/public/views/connect.html
@@ -47,13 +47,13 @@ <h2>{{ 'BOARD_Connect' | translate }}</h2>
             <md-button class="board-connect-btn" ng-click="c.connect ()">
 	            <img src="/public/drawable/network.png">
 	            <md-tooltip md-direction="bottom">
-	            	IP AddressWWggd fgdfgd dh WWh fh ggh jdj jhjgd
+	            	{{ "IP Address" }}
 	            </md-tooltip>
                 <div class="board-connect-title">
-                	{{ "IP AddressWWggd fgdfgd dh WWh fh ggh jdj jhjgd" | limitTo:18 }}...
+                	{{ "IP Address" | limitTo:18 }}
                 </div>
                 <div class="board-connect-type">
-                	Network
+                	{{ 'DEVICE_Network' | translate }}
                 </div>
 	        </md-button>
 
@@ -66,7 +66,7 @@ <h2>{{ 'BOARD_Connect' | translate }}</h2>
                     {{port.name}}
                 </div>
                 <div class="board-connect-type">
-                    {{ 'Serial' | translate }}
+                    {{ 'DEVICE_Serial' | translate }}
                 </div>
                 <div class="board-connect-address">
                     {{device.path}}
diff --git a/source/public/wyliodrin.js b/source/public/wyliodrin.js
index 1c871754..e0eb4936 100644
--- a/source/public/wyliodrin.js
+++ b/source/public/wyliodrin.js
@@ -26,8 +26,15 @@ var app = angular.module ("wyliodrinApp", ['ui.ace', 'ngSanitize', 'highcharts-n
 {
 	$provide.decorator('$window', function($delegate) 
 	{
+      try
+      {
         $delegate.history = null;
-        return $delegate;
+      }
+      catch (e)
+      {
+        
+      }
+      return $delegate;
     });
 });