Skip to content

Commit 76f054e

Browse files
authored
Merge pull request #350 from LuxoftSDL/feature/sdl_0269_new_vehicle_data_climateData
[SDL 0269] New vehicle data ClimateData
2 parents f8c6691 + e8316c2 commit 76f054e

19 files changed

Lines changed: 460 additions & 31 deletions

lib/js/src/rpc/enums/VehicleDataType.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable camelcase */
22
/*
3-
* Copyright (c) 2020, SmartDeviceLink Consortium, Inc.
3+
* Copyright (c) 2021, SmartDeviceLink Consortium, Inc.
44
* All rights reserved.
55
*
66
* Redistribution and use in source and binary forms, with or without
@@ -97,8 +97,19 @@ class VehicleDataType extends Enum {
9797
return VehicleDataType._MAP.VEHICLEDATA_FUELCONSUMPTION;
9898
}
9999

100+
/**
101+
* Get the enum value for VEHICLEDATA_CLIMATEDATA.
102+
* @since SmartDeviceLink 7.1.0
103+
* @returns {String} - The enum value.
104+
*/
105+
static get VEHICLEDATA_CLIMATEDATA () {
106+
return VehicleDataType._MAP.VEHICLEDATA_CLIMATEDATA;
107+
}
108+
100109
/**
101110
* Get the enum value for VEHICLEDATA_EXTERNTEMP.
111+
* @since SmartDeviceLink 2.0.0
112+
* @deprecated in SmartDeviceLink 7.1.0
102113
* @returns {String} - The enum value.
103114
*/
104115
static get VEHICLEDATA_EXTERNTEMP () {
@@ -390,6 +401,7 @@ VehicleDataType._MAP = Object.freeze({
390401
'VEHICLEDATA_FUELLEVEL': 'VEHICLEDATA_FUELLEVEL',
391402
'VEHICLEDATA_FUELLEVEL_STATE': 'VEHICLEDATA_FUELLEVEL_STATE',
392403
'VEHICLEDATA_FUELCONSUMPTION': 'VEHICLEDATA_FUELCONSUMPTION',
404+
'VEHICLEDATA_CLIMATEDATA': 'VEHICLEDATA_CLIMATEDATA',
393405
'VEHICLEDATA_EXTERNTEMP': 'VEHICLEDATA_EXTERNTEMP',
394406
'VEHICLEDATA_VIN': 'VEHICLEDATA_VIN',
395407
'VEHICLEDATA_GEARSTATUS': 'VEHICLEDATA_GEARSTATUS',

lib/js/src/rpc/messages/GetVehicleData.js

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable camelcase */
22
/*
3-
* Copyright (c) 2020, SmartDeviceLink Consortium, Inc.
3+
* Copyright (c) 2021, SmartDeviceLink Consortium, Inc.
44
* All rights reserved.
55
*
66
* Redistribution and use in source and binary forms, with or without
@@ -204,9 +204,30 @@ class GetVehicleData extends RpcRequest {
204204
return this.getParameter(GetVehicleData.KEY_FUEL_RANGE);
205205
}
206206

207+
/**
208+
* Set the ClimateData
209+
* @since SmartDeviceLink 7.1.0
210+
* @param {Boolean} data - See ClimateData - The desired ClimateData.
211+
* @returns {GetVehicleData} - The class instance for method chaining.
212+
*/
213+
setClimateData (data) {
214+
this.setParameter(GetVehicleData.KEY_CLIMATE_DATA, data);
215+
return this;
216+
}
217+
218+
/**
219+
* Get the ClimateData
220+
* @returns {Boolean} - the KEY_CLIMATE_DATA value
221+
*/
222+
getClimateData () {
223+
return this.getParameter(GetVehicleData.KEY_CLIMATE_DATA);
224+
}
225+
207226
/**
208227
* Set the ExternalTemperature
209-
* @param {Boolean} temperature - The external temperature in degrees celsius - The desired ExternalTemperature.
228+
* @since SmartDeviceLink 2.0.0
229+
* @deprecated in SmartDeviceLink 7.1.0
230+
* @param {Boolean} temperature - The external temperature in degrees celsius. This parameter is deprecated starting RPC Spec 7.1, please see climateData. - The desired ExternalTemperature.
210231
* @returns {GetVehicleData} - The class instance for method chaining.
211232
*/
212233
setExternalTemperature (temperature) {
@@ -216,6 +237,8 @@ class GetVehicleData extends RpcRequest {
216237

217238
/**
218239
* Get the ExternalTemperature
240+
* @since SmartDeviceLink 2.0.0
241+
* @deprecated in SmartDeviceLink 7.1.0
219242
* @returns {Boolean} - the KEY_EXTERNAL_TEMPERATURE value
220243
*/
221244
getExternalTemperature () {
@@ -727,6 +750,7 @@ GetVehicleData.KEY_FUEL_LEVEL = 'fuelLevel';
727750
GetVehicleData.KEY_FUEL_LEVEL_STATE = 'fuelLevel_State';
728751
GetVehicleData.KEY_INSTANT_FUEL_CONSUMPTION = 'instantFuelConsumption';
729752
GetVehicleData.KEY_FUEL_RANGE = 'fuelRange';
753+
GetVehicleData.KEY_CLIMATE_DATA = 'climateData';
730754
GetVehicleData.KEY_EXTERNAL_TEMPERATURE = 'externalTemperature';
731755
GetVehicleData.KEY_TURN_SIGNAL = 'turnSignal';
732756
GetVehicleData.KEY_VIN = 'vin';

lib/js/src/rpc/messages/GetVehicleDataResponse.js

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable camelcase */
22
/*
3-
* Copyright (c) 2020, SmartDeviceLink Consortium, Inc.
3+
* Copyright (c) 2021, SmartDeviceLink Consortium, Inc.
44
* All rights reserved.
55
*
66
* Redistribution and use in source and binary forms, with or without
@@ -34,6 +34,7 @@
3434
import { AirbagStatus } from '../structs/AirbagStatus.js';
3535
import { BeltStatus } from '../structs/BeltStatus.js';
3636
import { BodyInformation } from '../structs/BodyInformation.js';
37+
import { ClimateData } from '../structs/ClimateData.js';
3738
import { ClusterModeStatus } from '../structs/ClusterModeStatus.js';
3839
import { ComponentVolumeStatus } from '../enums/ComponentVolumeStatus.js';
3940
import { DeviceStatus } from '../structs/DeviceStatus.js';
@@ -231,9 +232,31 @@ class GetVehicleDataResponse extends RpcResponse {
231232
return this.getObject(FuelRange, GetVehicleDataResponse.KEY_FUEL_RANGE);
232233
}
233234

235+
/**
236+
* Set the ClimateData
237+
* @since SmartDeviceLink 7.1.0
238+
* @param {ClimateData} data - See ClimateData - The desired ClimateData.
239+
* @returns {GetVehicleDataResponse} - The class instance for method chaining.
240+
*/
241+
setClimateData (data) {
242+
this._validateType(ClimateData, data);
243+
this.setParameter(GetVehicleDataResponse.KEY_CLIMATE_DATA, data);
244+
return this;
245+
}
246+
247+
/**
248+
* Get the ClimateData
249+
* @returns {ClimateData} - the KEY_CLIMATE_DATA value
250+
*/
251+
getClimateData () {
252+
return this.getObject(ClimateData, GetVehicleDataResponse.KEY_CLIMATE_DATA);
253+
}
254+
234255
/**
235256
* Set the ExternalTemperature
236-
* @param {Number} temperature - The external temperature in degrees celsius - The desired ExternalTemperature.
257+
* @since SmartDeviceLink 2.0.0
258+
* @deprecated in SmartDeviceLink 7.1.0
259+
* @param {Number} temperature - The external temperature in degrees celsius. This parameter is deprecated starting RPC Spec 7.1, please see climateData. - The desired ExternalTemperature.
237260
* {'num_min_value': -40.0, 'num_max_value': 100.0}
238261
* @returns {GetVehicleDataResponse} - The class instance for method chaining.
239262
*/
@@ -244,6 +267,8 @@ class GetVehicleDataResponse extends RpcResponse {
244267

245268
/**
246269
* Get the ExternalTemperature
270+
* @since SmartDeviceLink 2.0.0
271+
* @deprecated in SmartDeviceLink 7.1.0
247272
* @returns {Number} - the KEY_EXTERNAL_TEMPERATURE value
248273
*/
249274
getExternalTemperature () {
@@ -782,6 +807,7 @@ GetVehicleDataResponse.KEY_FUEL_LEVEL = 'fuelLevel';
782807
GetVehicleDataResponse.KEY_FUEL_LEVEL_STATE = 'fuelLevel_State';
783808
GetVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION = 'instantFuelConsumption';
784809
GetVehicleDataResponse.KEY_FUEL_RANGE = 'fuelRange';
810+
GetVehicleDataResponse.KEY_CLIMATE_DATA = 'climateData';
785811
GetVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE = 'externalTemperature';
786812
GetVehicleDataResponse.KEY_TURN_SIGNAL = 'turnSignal';
787813
GetVehicleDataResponse.KEY_VIN = 'vin';

lib/js/src/rpc/messages/OnVehicleData.js

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable camelcase */
22
/*
3-
* Copyright (c) 2020, SmartDeviceLink Consortium, Inc.
3+
* Copyright (c) 2021, SmartDeviceLink Consortium, Inc.
44
* All rights reserved.
55
*
66
* Redistribution and use in source and binary forms, with or without
@@ -34,6 +34,7 @@
3434
import { AirbagStatus } from '../structs/AirbagStatus.js';
3535
import { BeltStatus } from '../structs/BeltStatus.js';
3636
import { BodyInformation } from '../structs/BodyInformation.js';
37+
import { ClimateData } from '../structs/ClimateData.js';
3738
import { ClusterModeStatus } from '../structs/ClusterModeStatus.js';
3839
import { ComponentVolumeStatus } from '../enums/ComponentVolumeStatus.js';
3940
import { DeviceStatus } from '../structs/DeviceStatus.js';
@@ -210,9 +211,31 @@ class OnVehicleData extends RpcNotification {
210211
return this.getObject(FuelRange, OnVehicleData.KEY_FUEL_RANGE);
211212
}
212213

214+
/**
215+
* Set the ClimateData
216+
* @since SmartDeviceLink 7.1.0
217+
* @param {ClimateData} data - See ClimateData - The desired ClimateData.
218+
* @returns {OnVehicleData} - The class instance for method chaining.
219+
*/
220+
setClimateData (data) {
221+
this._validateType(ClimateData, data);
222+
this.setParameter(OnVehicleData.KEY_CLIMATE_DATA, data);
223+
return this;
224+
}
225+
226+
/**
227+
* Get the ClimateData
228+
* @returns {ClimateData} - the KEY_CLIMATE_DATA value
229+
*/
230+
getClimateData () {
231+
return this.getObject(ClimateData, OnVehicleData.KEY_CLIMATE_DATA);
232+
}
233+
213234
/**
214235
* Set the ExternalTemperature
215-
* @param {Number} temperature - The external temperature in degrees celsius - The desired ExternalTemperature.
236+
* @since SmartDeviceLink 2.0.0
237+
* @deprecated in SmartDeviceLink 7.1.0
238+
* @param {Number} temperature - The external temperature in degrees celsius. This parameter is deprecated starting RPC Spec 7.1, please see climateData. - The desired ExternalTemperature.
216239
* {'num_min_value': -40.0, 'num_max_value': 100.0}
217240
* @returns {OnVehicleData} - The class instance for method chaining.
218241
*/
@@ -223,6 +246,8 @@ class OnVehicleData extends RpcNotification {
223246

224247
/**
225248
* Get the ExternalTemperature
249+
* @since SmartDeviceLink 2.0.0
250+
* @deprecated in SmartDeviceLink 7.1.0
226251
* @returns {Number} - the KEY_EXTERNAL_TEMPERATURE value
227252
*/
228253
getExternalTemperature () {
@@ -761,6 +786,7 @@ OnVehicleData.KEY_FUEL_LEVEL = 'fuelLevel';
761786
OnVehicleData.KEY_FUEL_LEVEL_STATE = 'fuelLevel_State';
762787
OnVehicleData.KEY_INSTANT_FUEL_CONSUMPTION = 'instantFuelConsumption';
763788
OnVehicleData.KEY_FUEL_RANGE = 'fuelRange';
789+
OnVehicleData.KEY_CLIMATE_DATA = 'climateData';
764790
OnVehicleData.KEY_EXTERNAL_TEMPERATURE = 'externalTemperature';
765791
OnVehicleData.KEY_TURN_SIGNAL = 'turnSignal';
766792
OnVehicleData.KEY_VIN = 'vin';

lib/js/src/rpc/messages/SubscribeVehicleData.js

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable camelcase */
22
/*
3-
* Copyright (c) 2020, SmartDeviceLink Consortium, Inc.
3+
* Copyright (c) 2021, SmartDeviceLink Consortium, Inc.
44
* All rights reserved.
55
*
66
* Redistribution and use in source and binary forms, with or without
@@ -204,9 +204,30 @@ class SubscribeVehicleData extends RpcRequest {
204204
return this.getParameter(SubscribeVehicleData.KEY_FUEL_RANGE);
205205
}
206206

207+
/**
208+
* Set the ClimateData
209+
* @since SmartDeviceLink 7.1.0
210+
* @param {Boolean} data - See ClimateData - The desired ClimateData.
211+
* @returns {SubscribeVehicleData} - The class instance for method chaining.
212+
*/
213+
setClimateData (data) {
214+
this.setParameter(SubscribeVehicleData.KEY_CLIMATE_DATA, data);
215+
return this;
216+
}
217+
218+
/**
219+
* Get the ClimateData
220+
* @returns {Boolean} - the KEY_CLIMATE_DATA value
221+
*/
222+
getClimateData () {
223+
return this.getParameter(SubscribeVehicleData.KEY_CLIMATE_DATA);
224+
}
225+
207226
/**
208227
* Set the ExternalTemperature
209-
* @param {Boolean} temperature - The external temperature in degrees celsius - The desired ExternalTemperature.
228+
* @since SmartDeviceLink 2.0.0
229+
* @deprecated in SmartDeviceLink 7.1.0
230+
* @param {Boolean} temperature - The external temperature in degrees celsius. This parameter is deprecated starting RPC Spec 7.1, please see climateData. - The desired ExternalTemperature.
210231
* @returns {SubscribeVehicleData} - The class instance for method chaining.
211232
*/
212233
setExternalTemperature (temperature) {
@@ -216,6 +237,8 @@ class SubscribeVehicleData extends RpcRequest {
216237

217238
/**
218239
* Get the ExternalTemperature
240+
* @since SmartDeviceLink 2.0.0
241+
* @deprecated in SmartDeviceLink 7.1.0
219242
* @returns {Boolean} - the KEY_EXTERNAL_TEMPERATURE value
220243
*/
221244
getExternalTemperature () {
@@ -709,6 +732,7 @@ SubscribeVehicleData.KEY_FUEL_LEVEL = 'fuelLevel';
709732
SubscribeVehicleData.KEY_FUEL_LEVEL_STATE = 'fuelLevel_State';
710733
SubscribeVehicleData.KEY_INSTANT_FUEL_CONSUMPTION = 'instantFuelConsumption';
711734
SubscribeVehicleData.KEY_FUEL_RANGE = 'fuelRange';
735+
SubscribeVehicleData.KEY_CLIMATE_DATA = 'climateData';
712736
SubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE = 'externalTemperature';
713737
SubscribeVehicleData.KEY_TURN_SIGNAL = 'turnSignal';
714738
SubscribeVehicleData.KEY_GEAR_STATUS = 'gearStatus';

lib/js/src/rpc/messages/SubscribeVehicleDataResponse.js

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable camelcase */
22
/*
3-
* Copyright (c) 2020, SmartDeviceLink Consortium, Inc.
3+
* Copyright (c) 2021, SmartDeviceLink Consortium, Inc.
44
* All rights reserved.
55
*
66
* Redistribution and use in source and binary forms, with or without
@@ -209,9 +209,31 @@ class SubscribeVehicleDataResponse extends RpcResponse {
209209
return this.getObject(VehicleDataResult, SubscribeVehicleDataResponse.KEY_FUEL_RANGE);
210210
}
211211

212+
/**
213+
* Set the ClimateData
214+
* @since SmartDeviceLink 7.1.0
215+
* @param {VehicleDataResult} data - See ClimateData - The desired ClimateData.
216+
* @returns {SubscribeVehicleDataResponse} - The class instance for method chaining.
217+
*/
218+
setClimateData (data) {
219+
this._validateType(VehicleDataResult, data);
220+
this.setParameter(SubscribeVehicleDataResponse.KEY_CLIMATE_DATA, data);
221+
return this;
222+
}
223+
224+
/**
225+
* Get the ClimateData
226+
* @returns {VehicleDataResult} - the KEY_CLIMATE_DATA value
227+
*/
228+
getClimateData () {
229+
return this.getObject(VehicleDataResult, SubscribeVehicleDataResponse.KEY_CLIMATE_DATA);
230+
}
231+
212232
/**
213233
* Set the ExternalTemperature
214-
* @param {VehicleDataResult} temperature - The external temperature in degrees celsius. - The desired ExternalTemperature.
234+
* @since SmartDeviceLink 2.0.0
235+
* @deprecated in SmartDeviceLink 7.1.0
236+
* @param {VehicleDataResult} temperature - The external temperature in degrees celsius. This parameter is deprecated starting RPC Spec 7.1, please see climateData. - The desired ExternalTemperature.
215237
* @returns {SubscribeVehicleDataResponse} - The class instance for method chaining.
216238
*/
217239
setExternalTemperature (temperature) {
@@ -222,6 +244,8 @@ class SubscribeVehicleDataResponse extends RpcResponse {
222244

223245
/**
224246
* Get the ExternalTemperature
247+
* @since SmartDeviceLink 2.0.0
248+
* @deprecated in SmartDeviceLink 7.1.0
225249
* @returns {VehicleDataResult} - the KEY_EXTERNAL_TEMPERATURE value
226250
*/
227251
getExternalTemperature () {
@@ -741,6 +765,7 @@ SubscribeVehicleDataResponse.KEY_FUEL_LEVEL = 'fuelLevel';
741765
SubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE = 'fuelLevel_State';
742766
SubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION = 'instantFuelConsumption';
743767
SubscribeVehicleDataResponse.KEY_FUEL_RANGE = 'fuelRange';
768+
SubscribeVehicleDataResponse.KEY_CLIMATE_DATA = 'climateData';
744769
SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE = 'externalTemperature';
745770
SubscribeVehicleDataResponse.KEY_TURN_SIGNAL = 'turnSignal';
746771
SubscribeVehicleDataResponse.KEY_GEAR_STATUS = 'gearStatus';

lib/js/src/rpc/messages/UnsubscribeVehicleData.js

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable camelcase */
22
/*
3-
* Copyright (c) 2020, SmartDeviceLink Consortium, Inc.
3+
* Copyright (c) 2021, SmartDeviceLink Consortium, Inc.
44
* All rights reserved.
55
*
66
* Redistribution and use in source and binary forms, with or without
@@ -204,9 +204,30 @@ class UnsubscribeVehicleData extends RpcRequest {
204204
return this.getParameter(UnsubscribeVehicleData.KEY_FUEL_RANGE);
205205
}
206206

207+
/**
208+
* Set the ClimateData
209+
* @since SmartDeviceLink 7.1.0
210+
* @param {Boolean} data - See ClimateData - The desired ClimateData.
211+
* @returns {UnsubscribeVehicleData} - The class instance for method chaining.
212+
*/
213+
setClimateData (data) {
214+
this.setParameter(UnsubscribeVehicleData.KEY_CLIMATE_DATA, data);
215+
return this;
216+
}
217+
218+
/**
219+
* Get the ClimateData
220+
* @returns {Boolean} - the KEY_CLIMATE_DATA value
221+
*/
222+
getClimateData () {
223+
return this.getParameter(UnsubscribeVehicleData.KEY_CLIMATE_DATA);
224+
}
225+
207226
/**
208227
* Set the ExternalTemperature
209-
* @param {Boolean} temperature - The external temperature in degrees celsius. - The desired ExternalTemperature.
228+
* @since SmartDeviceLink 2.0.0
229+
* @deprecated in SmartDeviceLink 7.1.0
230+
* @param {Boolean} temperature - The external temperature in degrees celsius. This parameter is deprecated starting RPC Spec 7.1, please see climateData. - The desired ExternalTemperature.
210231
* @returns {UnsubscribeVehicleData} - The class instance for method chaining.
211232
*/
212233
setExternalTemperature (temperature) {
@@ -216,6 +237,8 @@ class UnsubscribeVehicleData extends RpcRequest {
216237

217238
/**
218239
* Get the ExternalTemperature
240+
* @since SmartDeviceLink 2.0.0
241+
* @deprecated in SmartDeviceLink 7.1.0
219242
* @returns {Boolean} - the KEY_EXTERNAL_TEMPERATURE value
220243
*/
221244
getExternalTemperature () {
@@ -709,6 +732,7 @@ UnsubscribeVehicleData.KEY_FUEL_LEVEL = 'fuelLevel';
709732
UnsubscribeVehicleData.KEY_FUEL_LEVEL_STATE = 'fuelLevel_State';
710733
UnsubscribeVehicleData.KEY_INSTANT_FUEL_CONSUMPTION = 'instantFuelConsumption';
711734
UnsubscribeVehicleData.KEY_FUEL_RANGE = 'fuelRange';
735+
UnsubscribeVehicleData.KEY_CLIMATE_DATA = 'climateData';
712736
UnsubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE = 'externalTemperature';
713737
UnsubscribeVehicleData.KEY_TURN_SIGNAL = 'turnSignal';
714738
UnsubscribeVehicleData.KEY_GEAR_STATUS = 'gearStatus';

0 commit comments

Comments
 (0)