Package version up (3.0.28).
Change-Id: I4de30e7301394f5fdba527e6490d7ac19925c62f
Signed-off-by: Alice Liu <alice.liu@intel.com>
+* 3.0.28
+- Updated Modello Common libraries
+== Alice Liu <alice.liu@intel.com> 2014-09-12
+
* 3.0.27
- Updated Modello Common libraries
== Alice Liu <alice.liu@intel.com> 2014-09-02
* 3.0.27
- Updated Modello Common libraries
== Alice Liu <alice.liu@intel.com> 2014-09-02
Maintainer: Wenchao Wang<wenchao.wang@intel.com>
Package:ivi-3.0-web-add-ons
Maintainer: Wenchao Wang<wenchao.wang@intel.com>
Package:ivi-3.0-web-add-ons
"use strict";
console.log("App launched succesfully...");
"use strict";
console.log("App launched succesfully...");
- if (appToHide && appToHide.name !== "Modello Homescreen")
- appToHide.exit();
+ if (appToHide && appToHide.name !== "ModelloHomescreen")
+ appToHide.hide();
for (i = 0; i < list.length; i++) {
var app = list[i];
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 = {
subName = subName.replace(/\./g, "_").replace(/\ /g, "_");
if (app.name.indexOf('Modello') >= 0) {
var newApp = {
running: TopBarIcons.runningAppName === app.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
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);
extraAppsModel.push(newApp);
} else if (modelData.length < 7) {
modelData.push(newApp);
"SteeringWheelAngle" : {
propertyName : "SteeringWheelAngle",
callBackPropertyName : "SteeringWheelAngle",
"SteeringWheelAngle" : {
propertyName : "SteeringWheelAngle",
callBackPropertyName : "SteeringWheelAngle",
- subscribeName : "deadReckoning",
+ subscribeName : "steeringWheel",
conversionFunction : function(value) {
"use strict";
value = parseInt(value, 10);
conversionFunction : function(value) {
"use strict";
value = parseInt(value, 10);
"WheelBrake" : {
propertyName : "Engaged",
callBackPropertyName : "WheelBrake",
"WheelBrake" : {
propertyName : "Engaged",
callBackPropertyName : "WheelBrake",
- subscribeName : "WheelBrake"
+ subscribeName : "brakeOperation"
},
/* end steeringWheel game controler*/
"TirePressureLeftFront" : {
propertyName : "leftFront",
callBackPropertyName : "tirePressureLeftFront",
},
/* end steeringWheel game controler*/
"TirePressureLeftFront" : {
propertyName : "leftFront",
callBackPropertyName : "tirePressureLeftFront",
- subscribeName : "Tire",
+ subscribeName : "tire",
conversionFunction : parseTirePressure,
conversionFunction : parseTirePressure,
- zone : ["Front","Left"]
+ zone : new Zone(["Front","Left"])
},
"TirePressureRightFront" : {
propertyName : "rightFront",
callBackPropertyName : "tirePressureRightFront",
},
"TirePressureRightFront" : {
propertyName : "rightFront",
callBackPropertyName : "tirePressureRightFront",
- subscribeName : "Tire",
+ subscribeName : "tire",
conversionFunction : parseTirePressure,
conversionFunction : parseTirePressure,
- zone : ["Front","Right"]
+ zone : new Zone(["Front","Right"])
},
"TirePressureLeftRear" : {
propertyName : "leftRear",
callBackPropertyName : "tirePressureLeftRear",
},
"TirePressureLeftRear" : {
propertyName : "leftRear",
callBackPropertyName : "tirePressureLeftRear",
- subscribeName : "Tire",
+ subscribeName : "tire",
conversionFunction : parseTirePressure,
conversionFunction : parseTirePressure,
+ zone : new Zone(["Rear","Left"])
},
"TirePressureRightRear" : {
propertyName : "rightRear",
callBackPropertyName : "tirePressureRightRear",
},
"TirePressureRightRear" : {
propertyName : "rightRear",
callBackPropertyName : "tirePressureRightRear",
- subscribeName : "Tire",
+ subscribeName : "tire",
conversionFunction : parseTirePressure,
conversionFunction : parseTirePressure,
- zone : ["Rear","Right"]
+ zone : new Zone(["Rear","Right"])
},
"ChildLock" : {
propertyName : "ChildLockStatus",
},
"ChildLock" : {
propertyName : "ChildLockStatus",
"FrontDefrost" : {
propertyName : "Defrost",
callBackPropertyName : "frontDefrost",
"FrontDefrost" : {
propertyName : "Defrost",
callBackPropertyName : "frontDefrost",
- subscribeName : "defrostWindshield"
+ subscribeName : "defrost"
},
"RearDefrost" : {
propertyName : "Defrost",
callBackPropertyName : "rearDefrost",
},
"RearDefrost" : {
propertyName : "Defrost",
callBackPropertyName : "rearDefrost",
- subscribeName : "defrostRearWindow"
+ subscribeName : "defrost"
},
"FanSpeed" : {
propertyName : "FanSpeed",
callBackPropertyName : "fanSpeed",
},
"FanSpeed" : {
propertyName : "FanSpeed",
callBackPropertyName : "fanSpeed",
- subscribeName : "fanSpeedLevel",
+ subscribeName : "climateControl",
conversionFunction : parseInteger
},
"TargetTemperatureRight" : {
propertyName : "TargetTemperature",
callBackPropertyName : "targetTemperatureRight",
conversionFunction : parseInteger
},
"TargetTemperatureRight" : {
propertyName : "TargetTemperature",
callBackPropertyName : "targetTemperatureRight",
- subscribeName : "targetTemperature",
+ subscribeName : "climateControl",
conversionFunction : parseInteger,
conversionFunction : parseInteger,
+ zone : new Zone(["Right"])
},
"TargetTemperatureLeft" : {
propertyName : "TargetTemperature",
callBackPropertyName : "targetTemperatureLeft",
},
"TargetTemperatureLeft" : {
propertyName : "TargetTemperature",
callBackPropertyName : "targetTemperatureLeft",
- subscribeName : "targetTemperature",
+ subscribeName : "climateControl",
conversionFunction : parseInteger,
conversionFunction : parseInteger,
+ zone : new Zone(["Left"])
},
"Hazard" : {
propertyName : "Hazard",
},
"Hazard" : {
propertyName : "Hazard",
propertyName : "SeatHeater",
callBackPropertyName : "seatHeaterRight",
subscribeName : "climateControl",
propertyName : "SeatHeater",
callBackPropertyName : "seatHeaterRight",
subscribeName : "climateControl",
+ zone : new Zone(["Right"])
},
"SeatHeaterLeft" : {
propertyName : "SeatHeater",
callBackPropertyName : "seatHeaterLeft",
subscribeName : "climateControl",
},
"SeatHeaterLeft" : {
propertyName : "SeatHeater",
callBackPropertyName : "seatHeaterLeft",
subscribeName : "climateControl",
+ zone : new Zone(["Left"])
},
"Parking" : {
propertyName : "Parking",
callBackPropertyName : "rearLights",
},
"Parking" : {
propertyName : "Parking",
callBackPropertyName : "rearLights",
- subscribeName : "parkingLights",
- zone : "None"
+ subscribeName : "lightStatus",
},
"AirConditioning" : {
propertyName : "AirConditioning",
},
"AirConditioning" : {
propertyName : "AirConditioning",
"WheelAngle" : {
propertyName : "FrontWheelRadius",
callBackPropertyName : "wheelAngle",
"WheelAngle" : {
propertyName : "FrontWheelRadius",
callBackPropertyName : "wheelAngle",
- subscribeName : "wheelConfiguration",
+ //subscribeName : "wheelConfiguration",
conversionFunction : parseInteger
},
"Weather" : {
conversionFunction : parseInteger
},
"Weather" : {
"AvgKW" : {
propertyName : "AvgKW",
callBackPropertyName : "avgKW",
"AvgKW" : {
propertyName : "AvgKW",
callBackPropertyName : "avgKW",
- subscribeName : "AvgKW",
+ //subscribeName : "AvgKW",
conversionFunction : function(newValue) {
"use strict";
return parseFloat(newValue).toFixed(2);
conversionFunction : function(newValue) {
"use strict";
return parseFloat(newValue).toFixed(2);
},
"NightMode" : {
propertyName : "NightMode",
},
"NightMode" : {
propertyName : "NightMode",
- callBackPropertyName : "nightMode"
+ callBackPropertyName : "nightMode",
+ subscribeName : "nightMode"
},
"DirectionIndicationINST" : {
propertyName : "DirectionIndicationINST",
callBackPropertyName : "DirectionIndicationINST",
},
"DirectionIndicationINST" : {
propertyName : "DirectionIndicationINST",
callBackPropertyName : "DirectionIndicationINST",
- subscribeName : "DirectionIndicationINST"
+ //subscribeName : "DirectionIndicationINST"
},
"DirectionIndicationMS" : {
propertyName : "DirectionIndicationMS",
callBackPropertyName : "DirectionIndicationMS",
},
"DirectionIndicationMS" : {
propertyName : "DirectionIndicationMS",
callBackPropertyName : "DirectionIndicationMS",
- subscribeName : "DirectionIndicationMS"
+ //subscribeName : "DirectionIndicationMS"
},
"ACCommand" : {
propertyName : "ACCommand",
callBackPropertyName : "ACCommand",
},
"ACCommand" : {
propertyName : "ACCommand",
callBackPropertyName : "ACCommand",
- subscribeName : "ACCommand"
+ //subscribeName : "ACCommand"
},
"RecircReq" : {
propertyName : "RecircReq",
callBackPropertyName : "RecircReq",
},
"RecircReq" : {
propertyName : "RecircReq",
callBackPropertyName : "RecircReq",
- subscribeName : "RecircReq"
+ //subscribeName : "RecircReq"
},
"FrontTSetRightCmd" : {
propertyName : "FrontTSetRightCmd",
callBackPropertyName : "FrontTSetRightCmd",
},
"FrontTSetRightCmd" : {
propertyName : "FrontTSetRightCmd",
callBackPropertyName : "FrontTSetRightCmd",
- subscribeName : "FrontTSetRightCmd"
+ //subscribeName : "FrontTSetRightCmd"
},
"FrontTSetLeftCmd" : {
propertyName : "FrontTSetLeftCmd",
callBackPropertyName : "FrontTSetLeftCmd",
},
"FrontTSetLeftCmd" : {
propertyName : "FrontTSetLeftCmd",
callBackPropertyName : "FrontTSetLeftCmd",
- subscribeName : "FrontTSetLeftCmd"
+ //subscribeName : "FrontTSetLeftCmd"
},
"FrontBlwrSpeedCmd" : {
propertyName : "FrontBlwrSpeedCmd",
callBackPropertyName : "FrontBlwrSpeedCmd",
},
"FrontBlwrSpeedCmd" : {
propertyName : "FrontBlwrSpeedCmd",
callBackPropertyName : "FrontBlwrSpeedCmd",
- subscribeName : "FrontBlwrSpeedCmd"
+ //subscribeName : "FrontBlwrSpeedCmd"
},
"HeatedSeatFRModeRequest" : {
propertyName : "HeatedSeatFRModeRequest",
callBackPropertyName : "HeatedSeatFRModeRequest",
},
"HeatedSeatFRModeRequest" : {
propertyName : "HeatedSeatFRModeRequest",
callBackPropertyName : "HeatedSeatFRModeRequest",
- subscribeName : "HeatedSeatFRModeRequest"
+ //subscribeName : "HeatedSeatFRModeRequest"
},
"HeatedSeatFRRequest" : {
propertyName : "HeatedSeatFRRequest",
callBackPropertyName : "HeatedSeatFRRequest",
},
"HeatedSeatFRRequest" : {
propertyName : "HeatedSeatFRRequest",
callBackPropertyName : "HeatedSeatFRRequest",
- subscribeName : "HeatedSeatFRRequest"
+ //subscribeName : "HeatedSeatFRRequest"
},
"HeatedSeatFLModeRequest" : {
propertyName : "HeatedSeatFLModeRequest",
callBackPropertyName : "HeatedSeatFLModeRequest",
},
"HeatedSeatFLModeRequest" : {
propertyName : "HeatedSeatFLModeRequest",
callBackPropertyName : "HeatedSeatFLModeRequest",
- subscribeName : "HeatedSeatFLModeRequest"
+ //subscribeName : "HeatedSeatFLModeRequest"
},
"HeatedSeatFLRequest" : {
propertyName : "HeatedSeatFLRequest",
callBackPropertyName : "HeatedSeatFLRequest",
},
"HeatedSeatFLRequest" : {
propertyName : "HeatedSeatFLRequest",
callBackPropertyName : "HeatedSeatFLRequest",
- subscribeName : "HeatedSeatFLRequest"
+ //subscribeName : "HeatedSeatFLRequest"
},
"FLHSDistrCmd" : {
propertyName : "FLHSDistrCmd",
callBackPropertyName : "FLHSDistrCmd",
},
"FLHSDistrCmd" : {
propertyName : "FLHSDistrCmd",
callBackPropertyName : "FLHSDistrCmd",
- subscribeName : "FLHSDistrCmd"
+ //subscribeName : "FLHSDistrCmd"
},
"FRHSDistrCmd" : {
propertyName : "FRHSDistrCmd",
callBackPropertyName : "FRHSDistrCmd",
},
"FRHSDistrCmd" : {
propertyName : "FRHSDistrCmd",
callBackPropertyName : "FRHSDistrCmd",
- subscribeName : "FRHSDistrCmd"
+ //subscribeName : "FRHSDistrCmd"
self.onDataUpdate(setUpData, self, id);
}
}
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);
+ }
- 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);