From 310bad07bf3a1cec831a5c75c1bf91f54ce61929 Mon Sep 17 00:00:00 2001 From: Brian Jones Date: Wed, 10 Sep 2014 16:29:44 -0700 Subject: [PATCH] Removing space in app name - Fix for TC-1404 Updating tizen.vehicle API to use the new API Change-Id: I67609baa992c4b68d83491fee15f96ec578eb991 --- css/car/components/topBarIcons/topBarIcons.js | 8 +-- js/services/carIndicator.js | 86 ++++++++++++++------------- packaging/modello-common.changes | 3 + 3 files changed, 53 insertions(+), 44 deletions(-) diff --git a/css/car/components/topBarIcons/topBarIcons.js b/css/car/components/topBarIcons/topBarIcons.js index 357eb89..ce7d0b2 100644 --- a/css/car/components/topBarIcons/topBarIcons.js +++ b/css/car/components/topBarIcons/topBarIcons.js @@ -94,7 +94,7 @@ function onLaunchSuccess() { "use strict"; console.log("App launched succesfully..."); - if (appToHide && appToHide.name !== "Modello Homescreen") + if (appToHide && appToHide.name !== "ModelloHomescreen") appToHide.hide(); } @@ -218,7 +218,7 @@ function launchApplication(id) { for (i = 0; i < list.length; i++) { var app = list[i]; - var subName = app.name.substr(8); + var subName = app.name.substr(7); subName = subName.replace(/\./g, "_").replace(/\ /g, "_"); if (app.name.indexOf('Modello') >= 0) { var newApp = { @@ -231,11 +231,11 @@ function launchApplication(id) { running: TopBarIcons.runningAppName === app.id }; - if (app.name === "Modello Homescreen") { + if (app.name === "ModelloHomescreen") { homeScreenApp = newApp; } else { //app filter to block adding some apps into topbar - if (app.name === 'Modello AMB Simulator') { + if (app.name === 'ModelloAMBSimulator') { extraAppsModel.push(newApp); } else if (modelData.length < 7) { modelData.push(newApp); diff --git a/js/services/carIndicator.js b/js/services/carIndicator.js index 896aac9..3b96afd 100644 --- a/js/services/carIndicator.js +++ b/js/services/carIndicator.js @@ -139,7 +139,7 @@ CarIndicator.prototype._mappingTable = { "SteeringWheelAngle" : { propertyName : "SteeringWheelAngle", callBackPropertyName : "SteeringWheelAngle", - subscribeName : "deadReckoning", + subscribeName : "steeringWheel", conversionFunction : function(value) { "use strict"; value = parseInt(value, 10); @@ -157,36 +157,36 @@ CarIndicator.prototype._mappingTable = { "WheelBrake" : { propertyName : "Engaged", callBackPropertyName : "WheelBrake", - subscribeName : "WheelBrake" + subscribeName : "brakeOperation" }, /* end steeringWheel game controler*/ "TirePressureLeftFront" : { propertyName : "leftFront", callBackPropertyName : "tirePressureLeftFront", - subscribeName : "Tire", + subscribeName : "tire", conversionFunction : parseTirePressure, - zone : ["Front","Left"] + zone : new Zone(["Front","Left"]) }, "TirePressureRightFront" : { propertyName : "rightFront", callBackPropertyName : "tirePressureRightFront", - subscribeName : "Tire", + subscribeName : "tire", conversionFunction : parseTirePressure, - zone : ["Front","Right"] + zone : new Zone(["Front","Right"]) }, "TirePressureLeftRear" : { propertyName : "leftRear", callBackPropertyName : "tirePressureLeftRear", - subscribeName : "Tire", + subscribeName : "tire", conversionFunction : parseTirePressure, - zone : ["Rear","Left"] + zone : new Zone(["Rear","Left"]) }, "TirePressureRightRear" : { propertyName : "rightRear", callBackPropertyName : "tirePressureRightRear", - subscribeName : "Tire", + subscribeName : "tire", conversionFunction : parseTirePressure, - zone : ["Rear","Right"] + zone : new Zone(["Rear","Right"]) }, "ChildLock" : { propertyName : "ChildLockStatus", @@ -196,32 +196,32 @@ CarIndicator.prototype._mappingTable = { "FrontDefrost" : { propertyName : "Defrost", callBackPropertyName : "frontDefrost", - subscribeName : "defrostWindshield" + subscribeName : "defrost" }, "RearDefrost" : { propertyName : "Defrost", callBackPropertyName : "rearDefrost", - subscribeName : "defrostRearWindow" + subscribeName : "defrost" }, "FanSpeed" : { propertyName : "FanSpeed", callBackPropertyName : "fanSpeed", - subscribeName : "fanSpeedLevel", + subscribeName : "climateControl", conversionFunction : parseInteger }, "TargetTemperatureRight" : { propertyName : "TargetTemperature", callBackPropertyName : "targetTemperatureRight", - subscribeName : "targetTemperature", + subscribeName : "climateControl", conversionFunction : parseInteger, - zone : ["Right"] + zone : new Zone(["Right"]) }, "TargetTemperatureLeft" : { propertyName : "TargetTemperature", callBackPropertyName : "targetTemperatureLeft", - subscribeName : "targetTemperature", + subscribeName : "climateControl", conversionFunction : parseInteger, - zone : ["Left"] + zone : new Zone(["Left"]) }, "Hazard" : { propertyName : "Hazard", @@ -237,19 +237,18 @@ CarIndicator.prototype._mappingTable = { propertyName : "SeatHeater", callBackPropertyName : "seatHeaterRight", subscribeName : "climateControl", - zone : ["Right"] + zone : new Zone(["Right"]) }, "SeatHeaterLeft" : { propertyName : "SeatHeater", callBackPropertyName : "seatHeaterLeft", subscribeName : "climateControl", - zone : ["Left"] + zone : new Zone(["Left"]) }, "Parking" : { propertyName : "Parking", callBackPropertyName : "rearLights", - subscribeName : "parkingLights", - zone : "None" + subscribeName : "lightStatus", }, "AirConditioning" : { propertyName : "AirConditioning", @@ -293,7 +292,7 @@ CarIndicator.prototype._mappingTable = { "WheelAngle" : { propertyName : "FrontWheelRadius", callBackPropertyName : "wheelAngle", - subscribeName : "wheelConfiguration", + //subscribeName : "wheelConfiguration", conversionFunction : parseInteger }, "Weather" : { @@ -304,7 +303,7 @@ CarIndicator.prototype._mappingTable = { "AvgKW" : { propertyName : "AvgKW", callBackPropertyName : "avgKW", - subscribeName : "AvgKW", + //subscribeName : "AvgKW", conversionFunction : function(newValue) { "use strict"; return parseFloat(newValue).toFixed(2); @@ -359,72 +358,73 @@ CarIndicator.prototype._mappingTable = { }, "NightMode" : { propertyName : "NightMode", - callBackPropertyName : "nightMode" + callBackPropertyName : "nightMode", + subscribeName : "nightMode" }, "DirectionIndicationINST" : { propertyName : "DirectionIndicationINST", callBackPropertyName : "DirectionIndicationINST", - subscribeName : "DirectionIndicationINST" + //subscribeName : "DirectionIndicationINST" }, "DirectionIndicationMS" : { propertyName : "DirectionIndicationMS", callBackPropertyName : "DirectionIndicationMS", - subscribeName : "DirectionIndicationMS" + //subscribeName : "DirectionIndicationMS" }, "ACCommand" : { propertyName : "ACCommand", callBackPropertyName : "ACCommand", - subscribeName : "ACCommand" + //subscribeName : "ACCommand" }, "RecircReq" : { propertyName : "RecircReq", callBackPropertyName : "RecircReq", - subscribeName : "RecircReq" + //subscribeName : "RecircReq" }, "FrontTSetRightCmd" : { propertyName : "FrontTSetRightCmd", callBackPropertyName : "FrontTSetRightCmd", - subscribeName : "FrontTSetRightCmd" + //subscribeName : "FrontTSetRightCmd" }, "FrontTSetLeftCmd" : { propertyName : "FrontTSetLeftCmd", callBackPropertyName : "FrontTSetLeftCmd", - subscribeName : "FrontTSetLeftCmd" + //subscribeName : "FrontTSetLeftCmd" }, "FrontBlwrSpeedCmd" : { propertyName : "FrontBlwrSpeedCmd", callBackPropertyName : "FrontBlwrSpeedCmd", - subscribeName : "FrontBlwrSpeedCmd" + //subscribeName : "FrontBlwrSpeedCmd" }, "HeatedSeatFRModeRequest" : { propertyName : "HeatedSeatFRModeRequest", callBackPropertyName : "HeatedSeatFRModeRequest", - subscribeName : "HeatedSeatFRModeRequest" + //subscribeName : "HeatedSeatFRModeRequest" }, "HeatedSeatFRRequest" : { propertyName : "HeatedSeatFRRequest", callBackPropertyName : "HeatedSeatFRRequest", - subscribeName : "HeatedSeatFRRequest" + //subscribeName : "HeatedSeatFRRequest" }, "HeatedSeatFLModeRequest" : { propertyName : "HeatedSeatFLModeRequest", callBackPropertyName : "HeatedSeatFLModeRequest", - subscribeName : "HeatedSeatFLModeRequest" + //subscribeName : "HeatedSeatFLModeRequest" }, "HeatedSeatFLRequest" : { propertyName : "HeatedSeatFLRequest", callBackPropertyName : "HeatedSeatFLRequest", - subscribeName : "HeatedSeatFLRequest" + //subscribeName : "HeatedSeatFLRequest" }, "FLHSDistrCmd" : { propertyName : "FLHSDistrCmd", callBackPropertyName : "FLHSDistrCmd", - subscribeName : "FLHSDistrCmd" + //subscribeName : "FLHSDistrCmd" }, "FRHSDistrCmd" : { propertyName : "FRHSDistrCmd", callBackPropertyName : "FRHSDistrCmd", - subscribeName : "FRHSDistrCmd" + //subscribeName : "FRHSDistrCmd" } }; @@ -474,10 +474,16 @@ CarIndicator.prototype.addListener = function(aCallbackObject) { self.onDataUpdate(setUpData, self, id); } } - //subscribe isn't supported yet, will re-enable once it is - //tizen.vehicle[subscribeName].subscribe(subscribeCallback, zone); + if (typeof (tizen.vehicle[subscribeName].subscribe) !== undefined) + { + console.log("Modello: Subscribing to AMB signal - " + subscribeName); + tizen.vehicle[subscribeName].subscribe(subscribeCallback, zone); + } } else { - console.warn("Tizen API is not available, cannot subscribe to signal", signal); + if (tizen.vehicle[subscribeName] === undefined) + console.warn(subscribeName + " is not available to subscribe to"); + else + console.warn("Tizen API is not available, cannot subscribe to signal", signal); } } } diff --git a/packaging/modello-common.changes b/packaging/modello-common.changes index db64629..d3a7b5e 100644 --- a/packaging/modello-common.changes +++ b/packaging/modello-common.changes @@ -1,3 +1,6 @@ +* Wed Sep 10 2014 Brian Jones accepted/tizen/ivi/20140821.133859-3-gf761b8f +- Removing space in app name - Fix for TC-1404 Updating tizen.vehicle API to use the new API + * Fri Sep 05 2014 Brian Jones accepted/tizen/ivi/20140821.133859-2-g6401195 - Reverting workaround, going back to using hide() instead of exit() for switching apps -- 2.7.4