Updated Modello Common libraries

Package version up (3.0.34).

Change-Id: I4b002353b0d674bb524b8aa5f8421c50fa1360fc
Signed-off-by: Alice Liu <alice.liu@intel.com>

diff --git a/package/changelog b/package/changelog
index 202324f..8158721 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 3.0.34
+- Updated Modello Common libraries
+== Alice Liu <alice.liu@intel.com> 2014-10-29
+
 * 3.0.33
 - Updated Modello Common libraries
 == Alice Liu <alice.liu@intel.com> 2014-10-23

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index c3a3b77..1639c85 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:3.0.33
+Version:3.0.34
 Maintainer: Wenchao Wang<wenchao.wang@intel.com>
 
 Package:ivi-3.0-web-add-ons

diff --git a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/settings/js/bluetooth.js b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/settings/js/bluetooth.js
index 3a9a2f8..0efcd82 100644 (file)
--- a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/settings/js/bluetooth.js
+++ b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/settings/js/bluetooth.js
@@ -156,6 +156,8 @@ var Bluetooth = function() {
                                showLoadingSpinner("Unpairing");
                                self.adapter().destroyBonding(device.address, function() {
                                        console.log('bluetooth unpaired from ' + device.address);
+                                       self.removeDevice(device.address);
+                                       self.scan(true);
                                        self._restartRefreshDevicesInterval();
                                        hideLoadingSpinner("Unpairing");
                                }, function(e) {

diff --git a/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/carIndicator.js b/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/carIndicator.js
index 6e9b07c..a2f6191 100644 (file)
--- a/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/carIndicator.js
+++ b/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/carIndicator.js
@@ -166,35 +166,35 @@ CarIndicator.prototype._mappingTable = {
        },
        /* end steeringWheel game controler*/
        "TirePressureLeftFront" : {
-               attributeName : "leftFront",
+               attributeName : "pressure",
                callBackPropertyName : "tirePressureLeftFront",
                interfaceName : "tire",
                conversionFunction : parseTirePressure
                //zone : new Zone(["Front","Left"])
        },
        "TirePressureRightFront" : {
-               attributeName : "rightFront",
+               attributeName : "pressure",
                callBackPropertyName : "tirePressureRightFront",
                interfaceName : "tire",
                conversionFunction : parseTirePressure
                //zone : new Zone(["Front","Right"])
        },
        "TirePressureLeftRear" : {
-               attributeName : "leftRear",
+               attributeName : "pressure",
                callBackPropertyName : "tirePressureLeftRear",
                interfaceName : "tire",
                conversionFunction : parseTirePressure
                //zone : new Zone(["Rear","Left"])
        },
        "TirePressureRightRear" : {
-               attributeName : "rightRear",
+               attributeName : "pressure",
                callBackPropertyName : "tirePressureRightRear",
                interfaceName : "tire",
                conversionFunction : parseTirePressure
                //zone : new Zone(["Rear","Right"])
        },
        "ChildLock" : {
-               attributeName : "childLock",
+               attributeName : "lock",
                callBackPropertyName : "childLock",
                interfaceName : "childSafetyLock"
        },
@@ -211,7 +211,7 @@ CarIndicator.prototype._mappingTable = {
                //zone : new Zone(["Rear"])
        },
        "FanSpeed" : {
-               attributeName : "fanSpeed",
+               attributeName : "fanSpeedLevel",
                callBackPropertyName : "fanSpeed",
                interfaceName : "climateControl",
                conversionFunction : parseInteger
@@ -334,22 +334,22 @@ CarIndicator.prototype._mappingTable = {
                conversionFunction : function(value) {
                        "use strict";
                        switch (value) {
-                       case 0:
+                       case "park":
                                value = "P";
                                break;
-                       case 1:
+                       case "reverse":
                                value = "R";
                                break;
-                       case 2:
+                       case "neutral":
                                value = "N";
                                break;
-                       case 3:
+                       case "low":
                                value = "L";
                                break;
-                       case 4:
+                       case "drive":
                                value = "D";
                                break;
-                       case 5:
+                       case "overdrive":
                                value = "OD";
                                break;
                        default: