diff --git a/app/model/LightModel.js b/app/model/LightModel.js
index 3e7082da8..8c3a744af 100644
--- a/app/model/LightModel.js
+++ b/app/model/LightModel.js
@@ -75,6 +75,13 @@ SDL.LightModel = Em.Object.create({
'LEFT_TURN_LIGHTS',
'RIGHT_TURN_LIGHTS',
'HAZARD_LIGHTS',
+ 'REAR_CARGO_LIGHTS',
+ 'REAR_TRUCK_BED_LIGHTS',
+ 'REAR_TRAILER_LIGHTS',
+ 'LEFT_SPOT_LIGHTS',
+ 'RIGHT_SPOT_LIGHTS',
+ 'LEFT_PUDDLE_LIGHTS',
+ 'RIGHT_PUDDLE_LIGHTS'
],
/*
@@ -94,7 +101,8 @@ SDL.LightModel = Em.Object.create({
'EXTERIOR_FRONT_LIGHTS',
'EXTERIOR_REAR_LIGHTS',
'EXTERIOR_LEFT_LIGHTS',
- 'EXTERIOR_RIGHT_LIGHTS'
+ 'EXTERIOR_RIGHT_LIGHTS',
+ 'EXTERIOR_ALL_LIGHTS'
],
/*
@@ -102,7 +110,11 @@ SDL.LightModel = Em.Object.create({
*/
lightStatusStruct:[
'ON',
- 'OFF'
+ 'OFF',
+ 'RAMP_UP',
+ 'RAMP_DOWN',
+ 'UNKNOWN',
+ 'INVALID'
],
lightSettings: {
@@ -149,6 +161,7 @@ SDL.LightModel = Em.Object.create({
name: struct[i],
densityAvailable: true,
rgbColorSpaceAvailable: true,
+ statusAvailable: true,
});
}
return capabilities;
diff --git a/capabilities/rc_capabilities.js b/capabilities/rc_capabilities.js
new file mode 100644
index 000000000..122ff9abe
--- /dev/null
+++ b/capabilities/rc_capabilities.js
@@ -0,0 +1,384 @@
+SDL.remoteControlCapability =
+{
+ buttonCapabilities: [{
+ longPressAvailable: true,
+ name: 'AC_MAX',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'AC',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'RECIRCULATE',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'FAN_UP',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'FAN_DOWN',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'TEMP_UP',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'TEMP_DOWN',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'DEFROST_MAX',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'DEFROST',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'DEFROST_REAR',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'UPPER_VENT',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'LOWER_VENT',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'VOLUME_UP',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'VOLUME_DOWN',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'EJECT',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'SOURCE',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'SHUFFLE',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }, {
+ longPressAvailable: true,
+ name: 'REPEAT',
+ shortPressAvailable: true,
+ upDownAvailable: false
+ }],
+ climateControlCapabilities: [{
+ acEnableAvailable: true,
+ acMaxEnableAvailable: true,
+ autoModeEnableAvailable: true,
+ circulateAirEnableAvailable: true,
+ currentTemperatureAvailable: true,
+ defrostZone: ['FRONT', 'REAR', 'ALL', 'NONE'],
+ defrostZoneAvailable: true,
+ desiredTemperatureAvailable: true,
+ dualModeEnableAvailable: true,
+ heatedMirrorsAvailable: true,
+ heatedRearWindowAvailable: true,
+ heatedSteeringWheelAvailable: true,
+ heatedWindshieldAvailable: true,
+ fanSpeedAvailable: true,
+ moduleName: 'primary_climate',
+ ventilationMode: ['UPPER', 'LOWER', 'BOTH', 'NONE'],
+ ventilationModeAvailable: true
+ }],
+ radioControlCapabilities: [{
+ availableHDsAvailable: true,
+ hdChannelAvailable: true,
+ moduleName: 'radio',
+ radioBandAvailable: true,
+ radioEnableAvailable: true,
+ radioFrequencyAvailable: true,
+ rdsDataAvailable: true,
+ signalChangeThresholdAvailable: true,
+ signalStrengthAvailable: true,
+ sisDataAvailable: true,
+ stateAvailable: true
+ }],
+ audioControlCapabilities: [{
+ moduleName: 'audio',
+ sourceAvailable: true,
+ volumeAvailable: true,
+ equalizerAvailable: true,
+ keepContextAvailable: true,
+ equalizerMaxChannelId: 10
+ }],
+ lightControlCapabilities: {
+ moduleName: 'light',
+ supportedLights: [{
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'FRONT_LEFT_HIGH_BEAM',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'FRONT_RIGHT_HIGH_BEAM',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'FRONT_LEFT_LOW_BEAM',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'FRONT_RIGHT_LOW_BEAM',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'FRONT_LEFT_PARKING_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'FRONT_RIGHT_PARKING_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'FRONT_LEFT_FOG_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'FRONT_RIGHT_FOG_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'FRONT_LEFT_DAYTIME_RUNNING_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'FRONT_RIGHT_DAYTIME_RUNNING_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'FRONT_LEFT_TURN_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'FRONT_RIGHT_TURN_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'REAR_LEFT_FOG_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'REAR_RIGHT_FOG_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'REAR_LEFT_TAIL_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'REAR_RIGHT_TAIL_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'REAR_LEFT_BRAKE_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'REAR_RIGHT_BRAKE_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'REAR_LEFT_TURN_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'REAR_RIGHT_TURN_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'REAR_REGISTRATION_PLATE_LIGHT',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'HIGH_BEAMS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'LOW_BEAMS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'FOG_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'RUNNING_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'PARKING_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'BRAKE_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'REAR_REVERSING_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'SIDE_MARKER_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'LEFT_TURN_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'RIGHT_TURN_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'HAZARD_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'AMBIENT_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'OVERHEAD_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'READING_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'TRUNK_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'EXTERIOR_FRONT_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'EXTERIOR_REAR_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'EXTERIOR_LEFT_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: true,
+ densityAvailable: true,
+ name: 'EXTERIOR_RIGHT_LIGHTS',
+ rgbColorSpaceAvailable: true
+ }, {
+ statusAvailable: false,
+ densityAvailable: false,
+ name: 'REAR_CARGO_LIGHTS',
+ rgbColorSpaceAvailable: false
+ }, {
+ statusAvailable: false,
+ densityAvailable: false,
+ name: 'REAR_TRUCK_BED_LIGHTS',
+ rgbColorSpaceAvailable: false
+ }, {
+ statusAvailable: false,
+ densityAvailable: false,
+ name: 'REAR_TRAILER_LIGHTS',
+ rgbColorSpaceAvailable: false
+ }, {
+ statusAvailable: false,
+ densityAvailable: false,
+ name: 'LEFT_SPOT_LIGHTS',
+ rgbColorSpaceAvailable: false
+ }, {
+ statusAvailable: false,
+ densityAvailable: false,
+ name: 'RIGHT_SPOT_LIGHTS',
+ rgbColorSpaceAvailable: false
+ }, {
+ statusAvailable: false,
+ densityAvailable: false,
+ name: 'LEFT_PUDDLE_LIGHTS',
+ rgbColorSpaceAvailable: false
+ }, {
+ statusAvailable: false,
+ densityAvailable: false,
+ name: 'RIGHT_PUDDLE_LIGHTS',
+ rgbColorSpaceAvailable: false
+ }, {
+ statusAvailable: true,
+ densityAvailable: false,
+ name: 'EXTERIOR_ALL_LIGHTS',
+ rgbColorSpaceAvailable: false
+ }]
+ },
+ hmiSettingsControlCapabilities: {
+ moduleName: 'hmiSettings',
+ distanceUnitAvailable: true,
+ temperatureUnitAvailable: true,
+ displayModeUnitAvailable: true
+ }
+}
diff --git a/ffw/RCRPC.js b/ffw/RCRPC.js
index dfd1e9c36..d5b29b461 100644
--- a/ffw/RCRPC.js
+++ b/ffw/RCRPC.js
@@ -177,44 +177,6 @@ FFW.RC = FFW.RPCObserver.create(
case 'RC.GetCapabilities':
{
Em.Logger.log('FFW.' + request.method + ' Request');
- var remoteControlCapability = {};
-
- var climateControlCapabilities =
- SDL.ClimateController.model.getClimateControlCapabilities();
- var radioControlCapabilities =
- SDL.RadioModel.getRadioControlCapabilities();
- var audioControlCapabilities =
- SDL.MediaController.getAudioControlCapabilities();
- var hmiSettingsControlCapabilities =
- SDL.HmiSettingsModel.getHmiSettingsCapabilities();
- var lightControlCapabilities =
- SDL.LightModel.getLightCapabilities();
- var seatControlCapabilities =
- SDL.SeatModel.getSeatCapabilities();
-
- var buttonCapabilities = [];
-
- buttonCapabilities = buttonCapabilities.concat(
- SDL.ClimateController.model.getClimateButtonCapabilities()
- );
- buttonCapabilities = buttonCapabilities.concat(
- SDL.RadioModel.getRadioButtonCapabilities()
- );
-
- remoteControlCapability.climateControlCapabilities =
- climateControlCapabilities;
- remoteControlCapability.radioControlCapabilities =
- radioControlCapabilities;
- remoteControlCapability.hmiSettingsControlCapabilities =
- hmiSettingsControlCapabilities;
- remoteControlCapability.lightControlCapabilities =
- lightControlCapabilities;
- remoteControlCapability.seatControlCapabilities =
- seatControlCapabilities;
- remoteControlCapability.buttonCapabilities =
- buttonCapabilities;
- remoteControlCapability.audioControlCapabilities =
- audioControlCapabilities;
// send repsonse
var JSONMessage = {
@@ -223,7 +185,7 @@ FFW.RC = FFW.RPCObserver.create(
'result': {
'code': SDL.SDLModel.data.resultCode.SUCCESS,
'method': request.method,
- 'remoteControlCapability': remoteControlCapability
+ 'remoteControlCapability': SDL.remoteControlCapability
}
};
this.client.send(JSONMessage);
@@ -326,6 +288,11 @@ FFW.RC = FFW.RPCObserver.create(
if(request.params.moduleData.lightControlData){
newLightControlData = SDL.LightModel.setLightControlData(
request.params.moduleData.lightControlData);
+
+ if (Object.keys(newLightControlData).length > 0) {
+ FFW.RC.onInteriorVehicleDataNotification({moduleType:'LIGHT',
+ lightControlData: request.params.moduleData.lightControlData});
+ }
}
if(request.params.moduleData.seatControlData){
newSeatControlData = SDL.SeatModel.setSeatControlData(
diff --git a/index.html b/index.html
index 82ec0487e..97872bf14 100644
--- a/index.html
+++ b/index.html
@@ -249,6 +249,10 @@
src="app/view/home/statusNavigationView.js">
+
+
+
+