diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2020-08-11 13:47:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 13:47:40 -0400 |
| commit | 062957f2c2963b30f4719909a1f795dcb7ca5961 (patch) | |
| tree | f6a46f06835ac2b318d7a1e1863a56b20271b79f | |
| parent | fbf1ddb24ee5517121b58b6ea423362b7adf99ba (diff) | |
| parent | 32cc43c4565fc7f41db15830744277628c56d1c2 (diff) | |
| download | sdl_ios-062957f2c2963b30f4719909a1f795dcb7ca5961.tar.gz | |
Merge pull request #1692 from yoooriii/feature/0256_fuel_related_vehicle_data
[SDL-0256] Refactor Fuel Information Related Vehicle Data
35 files changed, 1000 insertions, 512 deletions
diff --git a/Example Apps/Example ObjC/VehicleDataManager.m b/Example Apps/Example ObjC/VehicleDataManager.m index 5c2d3bac2..bcbf1f362 100644 --- a/Example Apps/Example ObjC/VehicleDataManager.m +++ b/Example Apps/Example ObjC/VehicleDataManager.m @@ -144,9 +144,11 @@ NS_ASSUME_NONNULL_BEGIN SDLLogD(@"App has permission to access vehicle data. Requesting vehicle data..."); + SDLGetVehicleData *getAllVehicleData = [[SDLGetVehicleData alloc] initWithGps:@YES speed:@YES rpm:@YES instantFuelConsumption:@YES fuelRange:@YES externalTemperature:@YES turnSignal:@YES vin:@YES prndl:@YES tirePressure:@YES odometer:@YES beltStatus:@YES bodyInformation:@YES deviceStatus:@YES driverBraking:@YES wiperStatus:@YES headLampStatus:@YES engineTorque:@YES accPedalPosition:@YES steeringWheelAngle:@YES engineOilLife:@YES electronicParkBrakeStatus:@YES cloudAppVehicleID:@YES eCallInfo:@YES airbagStatus:@YES emergencyEvent:@YES clusterModeStatus:@YES myKey:@YES handsOffSteering:@YES]; #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - SDLGetVehicleData *getAllVehicleData = [[SDLGetVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES electronicParkBrakeStatus:YES emergencyEvent:YES engineOilLife:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES fuelRange:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES turnSignal:YES vin:YES wiperStatus:YES]; + getAllVehicleData.fuelLevel = @YES; + getAllVehicleData.fuelLevel_State = @YES; #pragma clang diagnostic pop [manager sendRequest:getAllVehicleData withResponseHandler:^(__kindof SDLRPCRequest * _Nullable request, __kindof SDLRPCResponse * _Nullable response, NSError * _Nullable error) { @@ -219,9 +221,15 @@ NS_ASSUME_NONNULL_BEGIN } else if ([vehicleDataType isEqualToString:ACExternalTemperatureMenuName]) { vehicleDataDescription = vehicleData.externalTemperature.description; } else if ([vehicleDataType isEqualToString:ACFuelLevelMenuName]) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" vehicleDataDescription = vehicleData.fuelLevel.description; +#pragma clang diagnostic pop } else if ([vehicleDataType isEqualToString:ACFuelLevelStateMenuName]) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" vehicleDataDescription = vehicleData.fuelLevel_State.description; +#pragma clang diagnostic pop } else if ([vehicleDataType isEqualToString:ACFuelRangeMenuName]) { vehicleDataDescription = vehicleData.fuelRange.description; } else if ([vehicleDataType isEqualToString:ACGPSMenuName]) { diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index c8d46f486..fd22008df 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -57,6 +57,7 @@ s.public_header_files = [ 'SmartDeviceLink/SDLButtonPressMode.h', 'SmartDeviceLink/SDLCancelInteraction.h', 'SmartDeviceLink/SDLCancelInteractionResponse.h', +'SmartDeviceLink/SDLCapacityUnit.h', 'SmartDeviceLink/SDLCarModeStatus.h', 'SmartDeviceLink/SDLCarWindowViewController.h', 'SmartDeviceLink/SDLChangeRegistration.h', diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj index bc90ee8f1..1bae109fe 100644 --- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj +++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj @@ -149,7 +149,6 @@ 162E832C1A9BDE8B00906325 /* SDLDiagnosticMessageSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 162E82481A9BDE8A00906325 /* SDLDiagnosticMessageSpec.m */; }; 162E832D1A9BDE8B00906325 /* SDLEncodedSyncPDataSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 162E82491A9BDE8A00906325 /* SDLEncodedSyncPDataSpec.m */; }; 162E832E1A9BDE8B00906325 /* SDLEndAudioPassThruSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 162E824A1A9BDE8A00906325 /* SDLEndAudioPassThruSpec.m */; }; - 162E83301A9BDE8B00906325 /* SDLGetVehicleDataSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 162E824C1A9BDE8A00906325 /* SDLGetVehicleDataSpec.m */; }; 162E83311A9BDE8B00906325 /* SDLListFilesSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 162E824D1A9BDE8A00906325 /* SDLListFilesSpec.m */; }; 162E83321A9BDE8B00906325 /* SDLPerformAudioPassThruSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 162E824E1A9BDE8A00906325 /* SDLPerformAudioPassThruSpec.m */; }; 162E83331A9BDE8B00906325 /* SDLPerformInteractionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 162E824F1A9BDE8A00906325 /* SDLPerformInteractionSpec.m */; }; @@ -1572,6 +1571,10 @@ 9FE2471522D77AD500F8D2FC /* SDLWindowType.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FE2471322D77AD500F8D2FC /* SDLWindowType.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9FE2471622D77AD500F8D2FC /* SDLWindowType.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FE2471422D77AD500F8D2FC /* SDLWindowType.m */; }; 9FE2471922D77AED00F8D2FC /* SDLPredefinedWindows.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FE2471722D77AED00F8D2FC /* SDLPredefinedWindows.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B38D8E61249FE28500B977D0 /* SDLCapacityUnit.h in Headers */ = {isa = PBXBuildFile; fileRef = B38D8E5F249FE28500B977D0 /* SDLCapacityUnit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B38D8E62249FE28500B977D0 /* SDLCapacityUnit.m in Sources */ = {isa = PBXBuildFile; fileRef = B38D8E60249FE28500B977D0 /* SDLCapacityUnit.m */; }; + B38D8E8224A1F53500B977D0 /* SDLCapacityUnitSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = B38D8E8124A1F53500B977D0 /* SDLCapacityUnitSpec.m */; }; + B3F7918324E062C200DB5CAF /* SDLGetVehicleDataSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 162E824C1A9BDE8A00906325 /* SDLGetVehicleDataSpec.m */; }; DA0C46AD1DCD35080001F2A8 /* SDLRPCParameterNames.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0C46AC1DCD35080001F2A8 /* SDLRPCParameterNames.m */; }; DA0C46AF1DCD41E30001F2A8 /* SDLMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = DA0C46AE1DCD41E30001F2A8 /* SDLMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; DA318C1F1DD0F06C00C035AC /* NSMutableDictionary+Store.h in Headers */ = {isa = PBXBuildFile; fileRef = DA318C1D1DD0F06C00C035AC /* NSMutableDictionary+Store.h */; }; @@ -3359,6 +3362,9 @@ 9FE2471322D77AD500F8D2FC /* SDLWindowType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLWindowType.h; sourceTree = "<group>"; }; 9FE2471422D77AD500F8D2FC /* SDLWindowType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLWindowType.m; sourceTree = "<group>"; }; 9FE2471722D77AED00F8D2FC /* SDLPredefinedWindows.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLPredefinedWindows.h; sourceTree = "<group>"; }; + B38D8E5F249FE28500B977D0 /* SDLCapacityUnit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLCapacityUnit.h; sourceTree = "<group>"; }; + B38D8E60249FE28500B977D0 /* SDLCapacityUnit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLCapacityUnit.m; sourceTree = "<group>"; }; + B38D8E8124A1F53500B977D0 /* SDLCapacityUnitSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLCapacityUnitSpec.m; sourceTree = "<group>"; }; BB3C600D221AEF37007DD4CA /* NSMutableDictionary+StoreSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "NSMutableDictionary+StoreSpec.m"; path = "DevAPISpecs/NSMutableDictionary+StoreSpec.m"; sourceTree = "<group>"; }; DA0C46AC1DCD35080001F2A8 /* SDLRPCParameterNames.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCParameterNames.m; sourceTree = "<group>"; }; DA0C46AE1DCD41E30001F2A8 /* SDLMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMacros.h; sourceTree = "<group>"; }; @@ -3607,6 +3613,7 @@ 162E81E81A9BDE8A00906325 /* SDLButtonEventModeSpec.m */, 162E81E91A9BDE8A00906325 /* SDLButtonNameSpec.m */, 162E81EA1A9BDE8A00906325 /* SDLButtonPressModeSpec.m */, + B38D8E8124A1F53500B977D0 /* SDLCapacityUnitSpec.m */, 162E81EB1A9BDE8A00906325 /* SDLCarModeStatusSpec.m */, 162E81EC1A9BDE8A00906325 /* SDLCharacterSetSpec.m */, 162E81ED1A9BDE8A00906325 /* SDLCompassDirectionSpec.m */, @@ -5083,6 +5090,8 @@ 5D61FA691A84238A00846EE7 /* SDLButtonName.m */, 5D61FA6A1A84238A00846EE7 /* SDLButtonPressMode.h */, 5D61FA6B1A84238A00846EE7 /* SDLButtonPressMode.m */, + B38D8E5F249FE28500B977D0 /* SDLCapacityUnit.h */, + B38D8E60249FE28500B977D0 /* SDLCapacityUnit.m */, 5D61FA6C1A84238A00846EE7 /* SDLCarModeStatus.h */, 5D61FA6D1A84238A00846EE7 /* SDLCarModeStatus.m */, 5D61FA721A84238A00846EE7 /* SDLCharacterSet.h */, @@ -7040,6 +7049,7 @@ 5D0A738A203F24320001595D /* SDLSoftButtonObject.h in Headers */, 5D61FDB31A84238C00846EE7 /* SDLSubscribeVehicleDataResponse.h in Headers */, 5D92935A20B33D4F00FCC775 /* SDLChoiceCell.h in Headers */, + B38D8E61249FE28500B977D0 /* SDLCapacityUnit.h in Headers */, 5D61FC961A84238C00846EE7 /* SDLECallConfirmationStatus.h in Headers */, 5D4D67AC1D2ED37A00468B4A /* SDLNotificationDispatcher.h in Headers */, 5D61FDA51A84238C00846EE7 /* SDLSpeak.h in Headers */, @@ -7773,6 +7783,7 @@ 5D61FD661A84238C00846EE7 /* SDLResetGlobalPropertiesResponse.m in Sources */, 4A99D0132475773C009B43E6 /* SDLImageField+ScreenManagerExtensions.m in Sources */, 5D61FCFE1A84238C00846EE7 /* SDLObjectWithPriority.m in Sources */, + B38D8E62249FE28500B977D0 /* SDLCapacityUnit.m in Sources */, 5D92937D20B70A3E00FCC775 /* SDLPresentKeyboardOperation.m in Sources */, 9FD334E122DC6E7500F62736 /* SDLCreateWindow.m in Sources */, 5DBF06241E64A83F00A5CF03 /* SDLLogManager.m in Sources */, @@ -8108,6 +8119,7 @@ 4A4AD8A424894260008FC414 /* TestOldConfigurationUpdateManagerDelegate.m in Sources */, 162E838A1A9BDE8B00906325 /* SDLSingleTireStatusSpec.m in Sources */, 5D6EB4CC1BF28DC600693731 /* NSMapTable+SubscriptingSpec.m in Sources */, + B3F7918324E062C200DB5CAF /* SDLGetVehicleDataSpec.m in Sources */, 88F37A4D226F84BE00DF119B /* SDLIAPDataSessionSpec.m in Sources */, 9FA0D00322DF06B9009CF344 /* SDLWindowTypeCapabilitiesSpec.m in Sources */, 162E83051A9BDE8B00906325 /* SDLVehicleDataActiveStatusSpec.m in Sources */, @@ -8170,6 +8182,7 @@ 88B58DBD222042500011B063 /* SDLDirectionSpec.m in Sources */, 162E83721A9BDE8B00906325 /* SDLAudioPassThruCapabilitiesSpec.m in Sources */, 162E83681A9BDE8B00906325 /* SDLSpeakResponseSpec.m in Sources */, + B38D8E8224A1F53500B977D0 /* SDLCapacityUnitSpec.m in Sources */, 1EB59CD8202DCCD500343A61 /* SDLMassageCushionFirmnessSpec.m in Sources */, 162E83661A9BDE8B00906325 /* SDLShowResponseSpec.m in Sources */, 5D9F50831BEA5C6100FEF399 /* SDLFileManagerSpec.m in Sources */, @@ -8438,7 +8451,6 @@ 162E82E71A9BDE8B00906325 /* SDLKeyboardEventSpec.m in Sources */, 162E834E1A9BDE8B00906325 /* SDLCreateInteractionChoiceSetResponseSpec.m in Sources */, DA9F7EB61DCC086A00ACAE48 /* SDLOasisAddressSpec.m in Sources */, - 162E83301A9BDE8B00906325 /* SDLGetVehicleDataSpec.m in Sources */, 162E833F1A9BDE8B00906325 /* SDLSliderSpec.m in Sources */, 162E838C1A9BDE8B00906325 /* SDLSoftButtonSpec.m in Sources */, 5DA23FF81F2FAF2D009C0313 /* SDLControlFramePayloadRPCStartServiceAckSpec.m in Sources */, diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec index 3b449d3e5..7983acc58 100644 --- a/SmartDeviceLink.podspec +++ b/SmartDeviceLink.podspec @@ -61,6 +61,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLButtonPressMode.h', 'SmartDeviceLink/SDLCancelInteraction.h', 'SmartDeviceLink/SDLCancelInteractionResponse.h', +'SmartDeviceLink/SDLCapacityUnit.h', 'SmartDeviceLink/SDLCarModeStatus.h', 'SmartDeviceLink/SDLCarWindowViewController.h', 'SmartDeviceLink/SDLChangeRegistration.h', diff --git a/SmartDeviceLink/SDLCapacityUnit.h b/SmartDeviceLink/SDLCapacityUnit.h new file mode 100644 index 000000000..415bd18c5 --- /dev/null +++ b/SmartDeviceLink/SDLCapacityUnit.h @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2020, SmartDeviceLink Consortium, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the SmartDeviceLink Consortium Inc. nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "SDLEnum.h" + +NS_ASSUME_NONNULL_BEGIN + +/** + * @since SDL 7.0.0 + */ +typedef SDLEnum SDLCapacityUnit SDL_SWIFT_ENUM; + +extern SDLCapacityUnit const SDLCapacityUnitKilograms; + +extern SDLCapacityUnit const SDLCapacityUnitKilowatthours; + +extern SDLCapacityUnit const SDLCapacityUnitLiters; + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLCapacityUnit.m b/SmartDeviceLink/SDLCapacityUnit.m new file mode 100644 index 000000000..7e21103fa --- /dev/null +++ b/SmartDeviceLink/SDLCapacityUnit.m @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2020, SmartDeviceLink Consortium, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the SmartDeviceLink Consortium Inc. nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "SDLCapacityUnit.h" + +SDLCapacityUnit const SDLCapacityUnitLiters = @"LITERS"; +SDLCapacityUnit const SDLCapacityUnitKilowatthours = @"KILOWATTHOURS"; +SDLCapacityUnit const SDLCapacityUnitKilograms = @"KILOGRAMS"; diff --git a/SmartDeviceLink/SDLFuelRange.h b/SmartDeviceLink/SDLFuelRange.h index 3220256cb..981ecd94b 100644 --- a/SmartDeviceLink/SDLFuelRange.h +++ b/SmartDeviceLink/SDLFuelRange.h @@ -6,6 +6,8 @@ // Copyright © 2018 smartdevicelink. All rights reserved. // +#import "SDLCapacityUnit.h" +#import "SDLComponentVolumeStatus.h" #import "SDLRPCMessage.h" #import "SDLFuelType.h" @@ -17,6 +19,41 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLFuelRange : SDLRPCStruct /** + * @param type - type + * @param range - @(range) + * @param level - @(level) + * @param levelState - levelState + * @param capacity - @(capacity) + * @param capacityUnit - capacityUnit + * @return A SDLFuelRange object + */ +- (instancetype)initWithType:(nullable SDLFuelType)type range:(float)range level:(float)level levelState:(nullable SDLComponentVolumeStatus)levelState capacity:(float)capacity capacityUnit:(nullable SDLCapacityUnit)capacityUnit; + +/** + * The absolute capacity of this fuel type. + * + * Optional, Float, 0.0 - 1000000.0 + */ +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *capacity; + +/** + * The unit of the capacity of this fuel type such as liters for gasoline or kWh for batteries. + */ +@property (strong, nonatomic, nullable) SDLCapacityUnit capacityUnit; + +/** + * The relative remaining capacity of this fuel type (percentage). + * + * Optional, Float, -6.0 - 1000000.0 + */ +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *level; + +/** + * The fuel level state. + */ +@property (strong, nonatomic, nullable) SDLComponentVolumeStatus levelState; + +/** * The vehicle's fuel type * * Optional diff --git a/SmartDeviceLink/SDLFuelRange.m b/SmartDeviceLink/SDLFuelRange.m index 1512a0957..f8e54736d 100644 --- a/SmartDeviceLink/SDLFuelRange.m +++ b/SmartDeviceLink/SDLFuelRange.m @@ -15,6 +15,20 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLFuelRange +- (instancetype)initWithType:(nullable SDLFuelType)type range:(float)range level:(float)level levelState:(nullable SDLComponentVolumeStatus)levelState capacity:(float)capacity capacityUnit:(nullable SDLCapacityUnit)capacityUnit { + self = [super init]; + if (!self) { + return nil; + } + self.type = type; + self.range = @(range); + self.level = @(level); + self.levelState = levelState; + self.capacity = @(capacity); + self.capacityUnit = capacityUnit; + return self; +} + - (void)setType:(nullable SDLFuelType)type { [self.store sdl_setObject:type forName:SDLRPCParameterNameType]; } @@ -31,6 +45,41 @@ NS_ASSUME_NONNULL_BEGIN return [self.store sdl_objectForName:SDLRPCParameterNameRange ofClass:NSNumber.class error:nil]; } +- (void)setLevel:(nullable NSNumber<SDLFloat> *)level { + [self.store sdl_setObject:level forName:SDLRPCParameterNameLevel]; +} + +- (nullable NSNumber<SDLFloat> *)level { + NSError *error = nil; + return [self.store sdl_objectForName:SDLRPCParameterNameLevel ofClass:NSNumber.class error:&error]; +} + +- (void)setLevelState:(nullable SDLComponentVolumeStatus)levelState { + [self.store sdl_setObject:levelState forName:SDLRPCParameterNameLevelState]; +} + +- (nullable SDLComponentVolumeStatus)levelState { + NSError *error = nil; + return [self.store sdl_enumForName:SDLRPCParameterNameLevelState error:&error]; +} + +- (void)setCapacity:(nullable NSNumber<SDLFloat> *)capacity { + [self.store sdl_setObject:capacity forName:SDLRPCParameterNameCapacity]; +} + +- (nullable NSNumber<SDLFloat> *)capacity { + NSError *error = nil; + return [self.store sdl_objectForName:SDLRPCParameterNameCapacity ofClass:NSNumber.class error:&error]; +} + +- (void)setCapacityUnit:(nullable SDLCapacityUnit)capacityUnit { + [self.store sdl_setObject:capacityUnit forName:SDLRPCParameterNameCapacityUnit]; +} + +- (nullable SDLCapacityUnit)capacityUnit { + NSError *error = nil; + return [self.store sdl_enumForName:SDLRPCParameterNameCapacityUnit error:&error]; +} @end diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index 6af61f4c8..2410b63e1 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -47,7 +47,7 @@ NS_ASSUME_NONNULL_BEGIN * @param wiperStatus Get wiperStatus data * @return A SDLGetVehicleData object */ -- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo emergencyEvent:(BOOL)emergencyEvent engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:vin:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); +- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo emergencyEvent:(BOOL)emergencyEvent engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:vin:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); /** * Convenience init for getting data for all possible vehicle data items. @@ -83,7 +83,7 @@ NS_ASSUME_NONNULL_BEGIN * @param wiperStatus Get wiperStatus data * @return A SDLGetVehicleData object */ -- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:vin:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); +- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:vin:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); /** * Convenience init for getting data for all possible vehicle data items. @@ -120,7 +120,7 @@ NS_ASSUME_NONNULL_BEGIN * @param wiperStatus Get wiperStatus data * @return A SDLGetVehicleData object */ -- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:vin:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); +- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:vin:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); /** * Convenience init for getting data for all possible vehicle data items. @@ -128,8 +128,6 @@ NS_ASSUME_NONNULL_BEGIN * @param gps - gps * @param speed - speed * @param rpm - rpm - * @param fuelLevel - fuelLevel - * @param fuelLevel_State - fuelLevel_State * @param instantFuelConsumption - instantFuelConsumption * @param fuelRange - fuelRange * @param externalTemperature - externalTemperature @@ -158,7 +156,7 @@ NS_ASSUME_NONNULL_BEGIN * @param handsOffSteering - handsOffSteering * @return A SDLGetVehicleData object */ -- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm fuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel fuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal vin:(nullable NSNumber<SDLBool> *)vin prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering; +- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal vin:(nullable NSNumber<SDLBool> *)vin prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering; /** * A boolean value. If true, requests GPS data. @@ -178,12 +176,12 @@ NS_ASSUME_NONNULL_BEGIN /** * A boolean value. If true, requests Fuel Level data. */ -@property (nullable, strong, nonatomic) NSNumber<SDLBool> *fuelLevel; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel __deprecated_msg("use fuelRange instead on 7.0+ RPC version connections"); /** * A boolean value. If true, requests Fuel Level State data. */ -@property (nullable, strong, nonatomic) NSNumber<SDLBool> *fuelLevel_State; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel_State __deprecated_msg("use fuelRange instead on 7.0+ RPC version connections"); /** * A boolean value. If true, requests Fuel Range data. diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m index 354ae7a8b..0ebc322b2 100644 --- a/SmartDeviceLink/SDLGetVehicleData.m +++ b/SmartDeviceLink/SDLGetVehicleData.m @@ -24,18 +24,46 @@ NS_ASSUME_NONNULL_BEGIN #pragma clang diagnostic pop - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo emergencyEvent:(BOOL)emergencyEvent engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus { - return [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) fuelLevel:@(fuelLevel) fuelLevel_State:@(fuelLevelState) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(NO) externalTemperature:@(externalTemperature) turnSignal:@(NO) vin:@(vin) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(NO) electronicParkBrakeStatus:@(NO) cloudAppVehicleID:@(NO) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:@(NO)]; + self = [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) instantFuelConsumption:@(instantFuelConsumption) fuelRange:nil externalTemperature:@(externalTemperature) turnSignal:nil vin:@(vin) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:nil electronicParkBrakeStatus:nil cloudAppVehicleID:nil eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:nil]; + if (self) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + self.fuelLevel = @(fuelLevel); + self.fuelLevel_State = @(fuelLevelState); +#pragma clang diagnostic pop + } + return self; } - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus { - return [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) fuelLevel:@(fuelLevel) fuelLevel_State:@(fuelLevelState) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(fuelRange) externalTemperature:@(externalTemperature) turnSignal:@(turnSignal) vin:@(vin) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(engineOilLife) electronicParkBrakeStatus:@(electronicParkBrakeStatus) cloudAppVehicleID:@(NO) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:@(NO)]; + self = [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(fuelRange) externalTemperature:@(externalTemperature) turnSignal:@(turnSignal) vin:@(vin) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(engineOilLife) electronicParkBrakeStatus:@(electronicParkBrakeStatus) cloudAppVehicleID:nil eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:nil]; + if (self) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + self.fuelLevel = @(fuelLevel); + self.fuelLevel_State = @(fuelLevelState); +#pragma clang diagnostic pop + } + return self; +} + +- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus { + return [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(fuelRange) externalTemperature:@(externalTemperature) turnSignal:@(turnSignal) vin:@(vin) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(engineOilLife) electronicParkBrakeStatus:@(electronicParkBrakeStatus) cloudAppVehicleID:@(cloudAppVehicleID) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:nil]; } - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus { - return [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) fuelLevel:@(fuelLevel) fuelLevel_State:@(fuelLevelState) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(fuelRange) externalTemperature:@(externalTemperature) turnSignal:@(turnSignal) vin:@(vin) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(engineOilLife) electronicParkBrakeStatus:@(electronicParkBrakeStatus) cloudAppVehicleID:@(cloudAppVehicleID) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:@(NO)]; + self = [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(fuelRange) externalTemperature:@(externalTemperature) turnSignal:@(turnSignal) vin:@(vin) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(engineOilLife) electronicParkBrakeStatus:@(electronicParkBrakeStatus) cloudAppVehicleID:@(cloudAppVehicleID) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:nil]; + if (self) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + self.fuelLevel = @(fuelLevel); + self.fuelLevel_State = @(fuelLevelState); +#pragma clang diagnostic pop + } + return self; } -- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm fuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel fuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal vin:(nullable NSNumber<SDLBool> *)vin prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering { +- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal vin:(nullable NSNumber<SDLBool> *)vin prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering { self = [self init]; if (!self) { return nil; @@ -43,8 +71,6 @@ NS_ASSUME_NONNULL_BEGIN self.gps = gps; self.speed = speed; self.rpm = rpm; - self.fuelLevel = fuelLevel; - self.fuelLevel_State = fuelLevel_State; self.instantFuelConsumption = instantFuelConsumption; self.fuelRange = fuelRange; self.externalTemperature = externalTemperature; diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 1d9afddb6..4da91a44c 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -51,8 +51,6 @@ NS_ASSUME_NONNULL_BEGIN * @param engineOilLife The estimated percentage (0% - 100%) of remaining oil life of the engine, optional * @param engineTorque Torque value for engine (in Nm) on non-diesel variants, optional * @param externalTemperature The external temperature in degrees celsius., optional - * @param fuelLevel The fuel level in the tank (percentage), optional - * @param fuelLevel_State The fuel level state, optional * @param fuelRange The estimate range in KM the vehicle can travel based on fuel level and consumption. Optional, Array of length 0 - 100, of SDLFuelRange * @param gps The car current GPS coordinates, optional * @param handsOffSteering To indicate whether driver hands are off the steering wheel, optional @@ -71,7 +69,7 @@ NS_ASSUME_NONNULL_BEGIN * * @return an initialized object of the SDLGetVehicleDataResponse class or nil */ -- (instancetype)initWithGps:(nullable SDLGPSData *)gps speed:(float)speed rpm:(nullable NSNumber<SDLUInt> *)rpm fuelLevel:(float)fuelLevel fuelLevel_State:(nullable SDLComponentVolumeStatus)fuelLevel_State instantFuelConsumption:(float)instantFuelConsumption fuelRange:(nullable NSArray<SDLFuelRange *> *)fuelRange externalTemperature:(float)externalTemperature turnSignal:(nullable SDLTurnSignal)turnSignal vin:(nullable NSString *)vin prndl:(nullable SDLPRNDL)prndl tirePressure:(nullable SDLTireStatus *)tirePressure odometer:(nullable NSNumber<SDLUInt> *)odometer beltStatus:(nullable SDLBeltStatus *)beltStatus bodyInformation:(nullable SDLBodyInformation *)bodyInformation deviceStatus:(nullable SDLDeviceStatus *)deviceStatus driverBraking:(nullable SDLVehicleDataEventStatus)driverBraking wiperStatus:(nullable SDLWiperStatus)wiperStatus headLampStatus:(nullable SDLHeadLampStatus *)headLampStatus engineTorque:(float)engineTorque accPedalPosition:(float)accPedalPosition steeringWheelAngle:(float)steeringWheelAngle engineOilLife:(float)engineOilLife electronicParkBrakeStatus:(nullable SDLElectronicParkBrakeStatus)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSString *)cloudAppVehicleID eCallInfo:(nullable SDLECallInfo *)eCallInfo airbagStatus:(nullable SDLAirbagStatus *)airbagStatus emergencyEvent:(nullable SDLEmergencyEvent *)emergencyEvent clusterModeStatus:(nullable SDLClusterModeStatus *)clusterModeStatus myKey:(nullable SDLMyKey *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering; +- (instancetype)initWithGps:(nullable SDLGPSData *)gps speed:(float)speed rpm:(nullable NSNumber<SDLUInt> *)rpm instantFuelConsumption:(float)instantFuelConsumption fuelRange:(nullable NSArray<SDLFuelRange *> *)fuelRange externalTemperature:(float)externalTemperature turnSignal:(nullable SDLTurnSignal)turnSignal vin:(nullable NSString *)vin prndl:(nullable SDLPRNDL)prndl tirePressure:(nullable SDLTireStatus *)tirePressure odometer:(nullable NSNumber<SDLUInt> *)odometer beltStatus:(nullable SDLBeltStatus *)beltStatus bodyInformation:(nullable SDLBodyInformation *)bodyInformation deviceStatus:(nullable SDLDeviceStatus *)deviceStatus driverBraking:(nullable SDLVehicleDataEventStatus)driverBraking wiperStatus:(nullable SDLWiperStatus)wiperStatus headLampStatus:(nullable SDLHeadLampStatus *)headLampStatus engineTorque:(float)engineTorque accPedalPosition:(float)accPedalPosition steeringWheelAngle:(float)steeringWheelAngle engineOilLife:(float)engineOilLife electronicParkBrakeStatus:(nullable SDLElectronicParkBrakeStatus)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSString *)cloudAppVehicleID eCallInfo:(nullable SDLECallInfo *)eCallInfo airbagStatus:(nullable SDLAirbagStatus *)airbagStatus emergencyEvent:(nullable SDLEmergencyEvent *)emergencyEvent clusterModeStatus:(nullable SDLClusterModeStatus *)clusterModeStatus myKey:(nullable SDLMyKey *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering; /** The car current GPS coordinates @@ -91,12 +89,12 @@ NS_ASSUME_NONNULL_BEGIN /** The fuel level in the tank (percentage) */ -@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *fuelLevel; +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *fuelLevel __deprecated_msg("use fuelRange.level instead on 7.0+ RPC version connections"); /** The fuel level state */ -@property (nullable, strong, nonatomic) SDLComponentVolumeStatus fuelLevel_State; +@property (strong, nonatomic, nullable) SDLComponentVolumeStatus fuelLevel_State __deprecated_msg("use fuelRange.levelState instead on 7.0+ RPC version connections"); /** The estimate range in KM the vehicle can travel based on fuel level and consumption diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m index 7203cef32..dfca48bbb 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m @@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN } #pragma clang diagnostic pop -- (instancetype)initWithGps:(nullable SDLGPSData *)gps speed:(float)speed rpm:(nullable NSNumber<SDLUInt> *)rpm fuelLevel:(float)fuelLevel fuelLevel_State:(nullable SDLComponentVolumeStatus)fuelLevel_State instantFuelConsumption:(float)instantFuelConsumption fuelRange:(nullable NSArray<SDLFuelRange *> *)fuelRange externalTemperature:(float)externalTemperature turnSignal:(nullable SDLTurnSignal)turnSignal vin:(nullable NSString *)vin prndl:(nullable SDLPRNDL)prndl tirePressure:(nullable SDLTireStatus *)tirePressure odometer:(nullable NSNumber<SDLUInt> *)odometer beltStatus:(nullable SDLBeltStatus *)beltStatus bodyInformation:(nullable SDLBodyInformation *)bodyInformation deviceStatus:(nullable SDLDeviceStatus *)deviceStatus driverBraking:(nullable SDLVehicleDataEventStatus)driverBraking wiperStatus:(nullable SDLWiperStatus)wiperStatus headLampStatus:(nullable SDLHeadLampStatus *)headLampStatus engineTorque:(float)engineTorque accPedalPosition:(float)accPedalPosition steeringWheelAngle:(float)steeringWheelAngle engineOilLife:(float)engineOilLife electronicParkBrakeStatus:(nullable SDLElectronicParkBrakeStatus)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSString *)cloudAppVehicleID eCallInfo:(nullable SDLECallInfo *)eCallInfo airbagStatus:(nullable SDLAirbagStatus *)airbagStatus emergencyEvent:(nullable SDLEmergencyEvent *)emergencyEvent clusterModeStatus:(nullable SDLClusterModeStatus *)clusterModeStatus myKey:(nullable SDLMyKey *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering { +- (instancetype)initWithGps:(nullable SDLGPSData *)gps speed:(float)speed rpm:(nullable NSNumber<SDLUInt> *)rpm instantFuelConsumption:(float)instantFuelConsumption fuelRange:(nullable NSArray<SDLFuelRange *> *)fuelRange externalTemperature:(float)externalTemperature turnSignal:(nullable SDLTurnSignal)turnSignal vin:(nullable NSString *)vin prndl:(nullable SDLPRNDL)prndl tirePressure:(nullable SDLTireStatus *)tirePressure odometer:(nullable NSNumber<SDLUInt> *)odometer beltStatus:(nullable SDLBeltStatus *)beltStatus bodyInformation:(nullable SDLBodyInformation *)bodyInformation deviceStatus:(nullable SDLDeviceStatus *)deviceStatus driverBraking:(nullable SDLVehicleDataEventStatus)driverBraking wiperStatus:(nullable SDLWiperStatus)wiperStatus headLampStatus:(nullable SDLHeadLampStatus *)headLampStatus engineTorque:(float)engineTorque accPedalPosition:(float)accPedalPosition steeringWheelAngle:(float)steeringWheelAngle engineOilLife:(float)engineOilLife electronicParkBrakeStatus:(nullable SDLElectronicParkBrakeStatus)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSString *)cloudAppVehicleID eCallInfo:(nullable SDLECallInfo *)eCallInfo airbagStatus:(nullable SDLAirbagStatus *)airbagStatus emergencyEvent:(nullable SDLEmergencyEvent *)emergencyEvent clusterModeStatus:(nullable SDLClusterModeStatus *)clusterModeStatus myKey:(nullable SDLMyKey *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering { self = [self init]; if (!self) { return nil; @@ -43,8 +43,6 @@ NS_ASSUME_NONNULL_BEGIN self.gps = gps; self.speed = @(speed); self.rpm = rpm; - self.fuelLevel = @(fuelLevel); - self.fuelLevel_State = fuelLevel_State; self.instantFuelConsumption = @(instantFuelConsumption); self.fuelRange = fuelRange; self.externalTemperature = @(externalTemperature); diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 80661c046..65dd75538 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -36,11 +36,10 @@ NS_ASSUME_NONNULL_BEGIN /** * Initializes an instance of the SDLOnVehicleData class + * * @param gps - gps * @param speed - @(speed) * @param rpm - rpm - * @param fuelLevel - @(fuelLevel) - * @param fuelLevel_State - fuelLevel_State * @param instantFuelConsumption - @(instantFuelConsumption) * @param fuelRange - fuelRange * @param externalTemperature - @(externalTemperature) @@ -69,7 +68,7 @@ NS_ASSUME_NONNULL_BEGIN * @param handsOffSteering - handsOffSteering * @return A SDLOnVehicleData object */ -- (instancetype)initWithGps:(nullable SDLGPSData *)gps speed:(float)speed rpm:(nullable NSNumber<SDLUInt> *)rpm fuelLevel:(float)fuelLevel fuelLevel_State:(nullable SDLComponentVolumeStatus)fuelLevel_State instantFuelConsumption:(float)instantFuelConsumption fuelRange:(nullable NSArray<SDLFuelRange *> *)fuelRange externalTemperature:(float)externalTemperature turnSignal:(nullable SDLTurnSignal)turnSignal vin:(nullable NSString *)vin prndl:(nullable SDLPRNDL)prndl tirePressure:(nullable SDLTireStatus *)tirePressure odometer:(nullable NSNumber<SDLUInt> *)odometer beltStatus:(nullable SDLBeltStatus *)beltStatus bodyInformation:(nullable SDLBodyInformation *)bodyInformation deviceStatus:(nullable SDLDeviceStatus *)deviceStatus driverBraking:(nullable SDLVehicleDataEventStatus)driverBraking wiperStatus:(nullable SDLWiperStatus)wiperStatus headLampStatus:(nullable SDLHeadLampStatus *)headLampStatus engineTorque:(float)engineTorque accPedalPosition:(float)accPedalPosition steeringWheelAngle:(float)steeringWheelAngle engineOilLife:(float)engineOilLife electronicParkBrakeStatus:(nullable SDLElectronicParkBrakeStatus)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSString *)cloudAppVehicleID eCallInfo:(nullable SDLECallInfo *)eCallInfo airbagStatus:(nullable SDLAirbagStatus *)airbagStatus emergencyEvent:(nullable SDLEmergencyEvent *)emergencyEvent clusterModeStatus:(nullable SDLClusterModeStatus *)clusterModeStatus myKey:(nullable SDLMyKey *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering; +- (instancetype)initWithGps:(nullable SDLGPSData *)gps speed:(float)speed rpm:(nullable NSNumber<SDLUInt> *)rpm instantFuelConsumption:(float)instantFuelConsumption fuelRange:(nullable NSArray<SDLFuelRange *> *)fuelRange externalTemperature:(float)externalTemperature turnSignal:(nullable SDLTurnSignal)turnSignal vin:(nullable NSString *)vin prndl:(nullable SDLPRNDL)prndl tirePressure:(nullable SDLTireStatus *)tirePressure odometer:(nullable NSNumber<SDLUInt> *)odometer beltStatus:(nullable SDLBeltStatus *)beltStatus bodyInformation:(nullable SDLBodyInformation *)bodyInformation deviceStatus:(nullable SDLDeviceStatus *)deviceStatus driverBraking:(nullable SDLVehicleDataEventStatus)driverBraking wiperStatus:(nullable SDLWiperStatus)wiperStatus headLampStatus:(nullable SDLHeadLampStatus *)headLampStatus engineTorque:(float)engineTorque accPedalPosition:(float)accPedalPosition steeringWheelAngle:(float)steeringWheelAngle engineOilLife:(float)engineOilLife electronicParkBrakeStatus:(nullable SDLElectronicParkBrakeStatus)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSString *)cloudAppVehicleID eCallInfo:(nullable SDLECallInfo *)eCallInfo airbagStatus:(nullable SDLAirbagStatus *)airbagStatus emergencyEvent:(nullable SDLEmergencyEvent *)emergencyEvent clusterModeStatus:(nullable SDLClusterModeStatus *)clusterModeStatus myKey:(nullable SDLMyKey *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering; /** The car current GPS coordinates @@ -89,12 +88,12 @@ NS_ASSUME_NONNULL_BEGIN /** The fuel level in the tank (percentage) */ -@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *fuelLevel; +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *fuelLevel __deprecated_msg("use fuelRange.level instead on 7.0+ RPC version connections"); /** The fuel level state */ -@property (nullable, strong, nonatomic) SDLComponentVolumeStatus fuelLevel_State; +@property (strong, nonatomic, nullable) SDLComponentVolumeStatus fuelLevel_State __deprecated_msg("use fuelRange.levelState instead on 7.0+ RPC version connections"); /** The estimate range in KM the vehicle can travel based on fuel level and consumption @@ -230,7 +229,7 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - + @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState An object containing the OEM custom vehicle data item. @@ -240,7 +239,7 @@ NS_ASSUME_NONNULL_BEGIN /** Gets the OEM custom vehicle data item for any given OEM custom vehicle data name. - + @param vehicleDataName The name of the OEM custom vehicle data item. @return An OEM custom vehicle data object for the given vehicle data name. diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m index be08a62a2..f38e97d0d 100644 --- a/SmartDeviceLink/SDLOnVehicleData.m +++ b/SmartDeviceLink/SDLOnVehicleData.m @@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN } #pragma clang diagnostic pop -- (instancetype)initWithGps:(nullable SDLGPSData *)gps speed:(float)speed rpm:(nullable NSNumber<SDLUInt> *)rpm fuelLevel:(float)fuelLevel fuelLevel_State:(nullable SDLComponentVolumeStatus)fuelLevel_State instantFuelConsumption:(float)instantFuelConsumption fuelRange:(nullable NSArray<SDLFuelRange *> *)fuelRange externalTemperature:(float)externalTemperature turnSignal:(nullable SDLTurnSignal)turnSignal vin:(nullable NSString *)vin prndl:(nullable SDLPRNDL)prndl tirePressure:(nullable SDLTireStatus *)tirePressure odometer:(nullable NSNumber<SDLUInt> *)odometer beltStatus:(nullable SDLBeltStatus *)beltStatus bodyInformation:(nullable SDLBodyInformation *)bodyInformation deviceStatus:(nullable SDLDeviceStatus *)deviceStatus driverBraking:(nullable SDLVehicleDataEventStatus)driverBraking wiperStatus:(nullable SDLWiperStatus)wiperStatus headLampStatus:(nullable SDLHeadLampStatus *)headLampStatus engineTorque:(float)engineTorque accPedalPosition:(float)accPedalPosition steeringWheelAngle:(float)steeringWheelAngle engineOilLife:(float)engineOilLife electronicParkBrakeStatus:(nullable SDLElectronicParkBrakeStatus)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSString *)cloudAppVehicleID eCallInfo:(nullable SDLECallInfo *)eCallInfo airbagStatus:(nullable SDLAirbagStatus *)airbagStatus emergencyEvent:(nullable SDLEmergencyEvent *)emergencyEvent clusterModeStatus:(nullable SDLClusterModeStatus *)clusterModeStatus myKey:(nullable SDLMyKey *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering { +- (instancetype)initWithGps:(nullable SDLGPSData *)gps speed:(float)speed rpm:(nullable NSNumber<SDLUInt> *)rpm instantFuelConsumption:(float)instantFuelConsumption fuelRange:(nullable NSArray<SDLFuelRange *> *)fuelRange externalTemperature:(float)externalTemperature turnSignal:(nullable SDLTurnSignal)turnSignal vin:(nullable NSString *)vin prndl:(nullable SDLPRNDL)prndl tirePressure:(nullable SDLTireStatus *)tirePressure odometer:(nullable NSNumber<SDLUInt> *)odometer beltStatus:(nullable SDLBeltStatus *)beltStatus bodyInformation:(nullable SDLBodyInformation *)bodyInformation deviceStatus:(nullable SDLDeviceStatus *)deviceStatus driverBraking:(nullable SDLVehicleDataEventStatus)driverBraking wiperStatus:(nullable SDLWiperStatus)wiperStatus headLampStatus:(nullable SDLHeadLampStatus *)headLampStatus engineTorque:(float)engineTorque accPedalPosition:(float)accPedalPosition steeringWheelAngle:(float)steeringWheelAngle engineOilLife:(float)engineOilLife electronicParkBrakeStatus:(nullable SDLElectronicParkBrakeStatus)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSString *)cloudAppVehicleID eCallInfo:(nullable SDLECallInfo *)eCallInfo airbagStatus:(nullable SDLAirbagStatus *)airbagStatus emergencyEvent:(nullable SDLEmergencyEvent *)emergencyEvent clusterModeStatus:(nullable SDLClusterModeStatus *)clusterModeStatus myKey:(nullable SDLMyKey *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering { self = [self init]; if (!self) { return nil; @@ -42,8 +42,6 @@ NS_ASSUME_NONNULL_BEGIN self.gps = gps; self.speed = @(speed); self.rpm = rpm; - self.fuelLevel = @(fuelLevel); - self.fuelLevel_State = fuelLevel_State; self.instantFuelConsumption = @(instantFuelConsumption); self.fuelRange = fuelRange; self.externalTemperature = @(externalTemperature); diff --git a/SmartDeviceLink/SDLRPCParameterNames.h b/SmartDeviceLink/SDLRPCParameterNames.h index ef2f00be9..b8359401a 100644 --- a/SmartDeviceLink/SDLRPCParameterNames.h +++ b/SmartDeviceLink/SDLRPCParameterNames.h @@ -117,6 +117,8 @@ extern SDLRPCParameterName const SDLRPCParameterNameButtonEventMode; extern SDLRPCParameterName const SDLRPCParameterNameButtonName; extern SDLRPCParameterName const SDLRPCParameterNameButtonPressMode; extern SDLRPCParameterName const SDLRPCParameterNameCancelID; +extern SDLRPCParameterName const SDLRPCParameterNameCapacity; +extern SDLRPCParameterName const SDLRPCParameterNameCapacityUnit; extern SDLRPCParameterName const SDLRPCParameterNameColor; extern SDLRPCParameterName const SDLRPCParameterNameCol; extern SDLRPCParameterName const SDLRPCParameterNameColSpan; @@ -354,6 +356,7 @@ extern SDLRPCParameterName const SDLRPCParameterNameLength; extern SDLRPCParameterName const SDLRPCParameterNameLevel; extern SDLRPCParameterName const SDLRPCParameterNameLevels; extern SDLRPCParameterName const SDLRPCParameterNameLevelSpan; +extern SDLRPCParameterName const SDLRPCParameterNameLevelState; extern SDLRPCParameterName const SDLRPCParameterNameLightControlCapabilities; extern SDLRPCParameterName const SDLRPCParameterNameLightControlData; extern SDLRPCParameterName const SDLRPCParameterNameLightState; diff --git a/SmartDeviceLink/SDLRPCParameterNames.m b/SmartDeviceLink/SDLRPCParameterNames.m index 671436c4c..5003a805e 100644 --- a/SmartDeviceLink/SDLRPCParameterNames.m +++ b/SmartDeviceLink/SDLRPCParameterNames.m @@ -115,6 +115,8 @@ SDLRPCParameterName const SDLRPCParameterNameButtonEventMode = @"buttonEventMode SDLRPCParameterName const SDLRPCParameterNameButtonName = @"buttonName"; SDLRPCParameterName const SDLRPCParameterNameButtonPressMode = @"buttonPressMode"; SDLRPCParameterName const SDLRPCParameterNameCancelID = @"cancelID"; +SDLRPCParameterName const SDLRPCParameterNameCapacity = @"capacity"; +SDLRPCParameterName const SDLRPCParameterNameCapacityUnit = @"capacityUnit"; SDLRPCParameterName const SDLRPCParameterNameCoolingEnabled = @"coolingEnabled"; SDLRPCParameterName const SDLRPCParameterNameCoolingEnabledAvailable = @"coolingEnabledAvailable"; SDLRPCParameterName const SDLRPCParameterNameCoolingLevel = @"coolingLevel"; @@ -351,6 +353,7 @@ SDLRPCParameterName const SDLRPCParameterNameLength = @"length"; SDLRPCParameterName const SDLRPCParameterNameLevel = @"level"; SDLRPCParameterName const SDLRPCParameterNameLevels = @"levels"; SDLRPCParameterName const SDLRPCParameterNameLevelSpan = @"levelspan"; +SDLRPCParameterName const SDLRPCParameterNameLevelState = @"levelState"; SDLRPCParameterName const SDLRPCParameterNameLightControlCapabilities = @"lightControlCapabilities"; SDLRPCParameterName const SDLRPCParameterNameLightControlData = @"lightControlData"; SDLRPCParameterName const SDLRPCParameterNameLightState = @"lightState"; diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index a3db1c1de..e81ed7f2f 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN * @param wiperStatus Subscribe to wiperStatus * @return A SDLSubscribeVehicleData object */ -- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo emergencyEvent:(BOOL)emergencyEvent engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); +- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo emergencyEvent:(BOOL)emergencyEvent engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); /** * Convenience init for subscribing to all possible vehicle data items. @@ -83,7 +83,7 @@ NS_ASSUME_NONNULL_BEGIN * @param wiperStatus Subscribe to wiperStatus * @return A SDLSubscribeVehicleData object */ -- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); +- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); /** * Convenience init for subscribing to all possible vehicle data items. @@ -119,7 +119,7 @@ NS_ASSUME_NONNULL_BEGIN * @param wiperStatus Subscribe to wiperStatus * @return A SDLSubscribeVehicleData object */ -- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); +- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); /** * Convenience init for subscribing to all possible vehicle data items. @@ -127,8 +127,6 @@ NS_ASSUME_NONNULL_BEGIN * @param gps - gps * @param speed - speed * @param rpm - rpm - * @param fuelLevel - fuelLevel - * @param fuelLevel_State - fuelLevel_State * @param instantFuelConsumption - instantFuelConsumption * @param fuelRange - fuelRange * @param externalTemperature - externalTemperature @@ -156,7 +154,7 @@ NS_ASSUME_NONNULL_BEGIN * @param handsOffSteering - handsOffSteering * @return A SDLSubscribeVehicleData object */ -- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm fuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel fuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering; +- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering; /** * A boolean value. If true, subscribes GPS data. @@ -176,12 +174,12 @@ NS_ASSUME_NONNULL_BEGIN /** * A boolean value. If true, subscribes Fuel Level data. */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel __deprecated_msg("use fuelRange instead on 7.0+ RPC version connections"); /** * A boolean value. If true, subscribes Fuel Level State data. */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel_State; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel_State __deprecated_msg("use fuelRange instead on 7.0+ RPC version connections"); /** * A boolean value. If true, subscribes Fuel Range data. @@ -320,7 +318,7 @@ NS_ASSUME_NONNULL_BEGIN /** Gets the OEM custom vehicle data value for any given OEM custom vehicle data name. - + @param vehicleDataName The name of the OEM custom vehicle data item. @return The state of an OEM custom vehicle data item for the given vehicle data name. diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m index 5f3ad421d..5ab5f9a1d 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.m +++ b/SmartDeviceLink/SDLSubscribeVehicleData.m @@ -24,18 +24,45 @@ NS_ASSUME_NONNULL_BEGIN #pragma clang diagnostic pop - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo emergencyEvent:(BOOL)emergencyEvent engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure wiperStatus:(BOOL)wiperStatus { - return [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) fuelLevel:@(fuelLevel) fuelLevel_State:@(fuelLevelState) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(NO) externalTemperature:@(externalTemperature) turnSignal:@(NO) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(NO) electronicParkBrakeStatus:@(NO) cloudAppVehicleID:@(NO) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:@(NO)]; + self = [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(NO) externalTemperature:@(externalTemperature) turnSignal:@(NO) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(NO) electronicParkBrakeStatus:@(NO) cloudAppVehicleID:@(NO) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:nil]; + if (self) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + self.fuelLevel = @(fuelLevel); + self.fuelLevel_State = @(fuelLevelState); +#pragma clang diagnostic pop + } + + return self; } - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus { - return [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) fuelLevel:@(fuelLevel) fuelLevel_State:@(fuelLevelState) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(fuelRange) externalTemperature:@(externalTemperature) turnSignal:@(turnSignal) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(engineOilLife) electronicParkBrakeStatus:@(electronicParkBrakeStatus) cloudAppVehicleID:@(NO) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:@(NO)]; + self = [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(fuelRange) externalTemperature:@(externalTemperature) turnSignal:@(turnSignal) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(engineOilLife) electronicParkBrakeStatus:@(electronicParkBrakeStatus) cloudAppVehicleID:nil eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:nil]; + if (self) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + self.fuelLevel = @(fuelLevel); + self.fuelLevel_State = @(fuelLevelState); +#pragma clang diagnostic pop + } + + return self; } - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus { - return [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) fuelLevel:@(fuelLevel) fuelLevel_State:@(fuelLevelState) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(fuelRange) externalTemperature:@(externalTemperature) turnSignal:@(turnSignal) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(engineOilLife) electronicParkBrakeStatus:@(electronicParkBrakeStatus) cloudAppVehicleID:@(cloudAppVehicleID) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:@(NO)]; + self = [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(fuelRange) externalTemperature:@(externalTemperature) turnSignal:@(turnSignal) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(engineOilLife) electronicParkBrakeStatus:@(electronicParkBrakeStatus) cloudAppVehicleID:@(cloudAppVehicleID) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:nil]; + if (self) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + self.fuelLevel = @(fuelLevel); + self.fuelLevel_State = @(fuelLevelState); +#pragma clang diagnostic pop + } + + return self; } -- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm fuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel fuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering { +- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering { self = [self init]; if (!self) { return nil; @@ -43,8 +70,6 @@ NS_ASSUME_NONNULL_BEGIN self.gps = gps; self.speed = speed; self.rpm = rpm; - self.fuelLevel = fuelLevel; - self.fuelLevel_State = fuelLevel_State; self.instantFuelConsumption = instantFuelConsumption; self.fuelRange = fuelRange; self.externalTemperature = externalTemperature; diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 0f6d9e0e4..702ca901f 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -17,13 +17,11 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLSubscribeVehicleDataResponse : SDLRPCResponse /** - * Convenience initializer, initializes a new allocated object of the class SDLSubscribeVehicleDataResponse + * Convenience init for setting all data on vehicle data items. * * @param gps - gps * @param speed - speed * @param rpm - rpm - * @param fuelLevel - fuelLevel - * @param fuelLevel_State - fuelLevel_State * @param instantFuelConsumption - instantFuelConsumption * @param fuelRange - fuelRange * @param externalTemperature - externalTemperature @@ -51,7 +49,7 @@ NS_ASSUME_NONNULL_BEGIN * @param handsOffSteering - handsOffSteering * @return A SDLSubscribeVehicleDataResponse object */ -- (instancetype)initWithGps:(nullable SDLVehicleDataResult *)gps speed:(nullable SDLVehicleDataResult *)speed rpm:(nullable SDLVehicleDataResult *)rpm fuelLevel:(nullable SDLVehicleDataResult *)fuelLevel fuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State instantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption fuelRange:(nullable SDLVehicleDataResult *)fuelRange externalTemperature:(nullable SDLVehicleDataResult *)externalTemperature turnSignal:(nullable SDLVehicleDataResult *)turnSignal prndl:(nullable SDLVehicleDataResult *)prndl tirePressure:(nullable SDLVehicleDataResult *)tirePressure odometer:(nullable SDLVehicleDataResult *)odometer beltStatus:(nullable SDLVehicleDataResult *)beltStatus bodyInformation:(nullable SDLVehicleDataResult *)bodyInformation deviceStatus:(nullable SDLVehicleDataResult *)deviceStatus driverBraking:(nullable SDLVehicleDataResult *)driverBraking wiperStatus:(nullable SDLVehicleDataResult *)wiperStatus headLampStatus:(nullable SDLVehicleDataResult *)headLampStatus engineTorque:(nullable SDLVehicleDataResult *)engineTorque accPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition steeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle engineOilLife:(nullable SDLVehicleDataResult *)engineOilLife electronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus cloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID eCallInfo:(nullable SDLVehicleDataResult *)eCallInfo airbagStatus:(nullable SDLVehicleDataResult *)airbagStatus emergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent clusterModes:(nullable SDLVehicleDataResult *)clusterModes myKey:(nullable SDLVehicleDataResult *)myKey handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering; +- (instancetype)initWithGps:(nullable SDLVehicleDataResult *)gps speed:(nullable SDLVehicleDataResult *)speed rpm:(nullable SDLVehicleDataResult *)rpm instantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption fuelRange:(nullable SDLVehicleDataResult *)fuelRange externalTemperature:(nullable SDLVehicleDataResult *)externalTemperature turnSignal:(nullable SDLVehicleDataResult *)turnSignal prndl:(nullable SDLVehicleDataResult *)prndl tirePressure:(nullable SDLVehicleDataResult *)tirePressure odometer:(nullable SDLVehicleDataResult *)odometer beltStatus:(nullable SDLVehicleDataResult *)beltStatus bodyInformation:(nullable SDLVehicleDataResult *)bodyInformation deviceStatus:(nullable SDLVehicleDataResult *)deviceStatus driverBraking:(nullable SDLVehicleDataResult *)driverBraking wiperStatus:(nullable SDLVehicleDataResult *)wiperStatus headLampStatus:(nullable SDLVehicleDataResult *)headLampStatus engineTorque:(nullable SDLVehicleDataResult *)engineTorque accPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition steeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle engineOilLife:(nullable SDLVehicleDataResult *)engineOilLife electronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus cloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID eCallInfo:(nullable SDLVehicleDataResult *)eCallInfo airbagStatus:(nullable SDLVehicleDataResult *)airbagStatus emergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent clusterModes:(nullable SDLVehicleDataResult *)clusterModes myKey:(nullable SDLVehicleDataResult *)myKey handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering; /** The result of requesting to subscribe to the GPSData. @@ -79,14 +77,14 @@ NS_ASSUME_NONNULL_BEGIN Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel __deprecated_msg("use fuelRange instead on 7.0+ RPC version connections"); /** The result of requesting to subscribe to the fuel level state. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel_State; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel_State __deprecated_msg("use fuelRange instead on 7.0+ RPC version connections"); /** The result of requesting to subscribe to the fuel range. diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m index 6e73fe0c7..d57a45146 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m @@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN } #pragma clang diagnostic pop -- (instancetype)initWithGps:(nullable SDLVehicleDataResult *)gps speed:(nullable SDLVehicleDataResult *)speed rpm:(nullable SDLVehicleDataResult *)rpm fuelLevel:(nullable SDLVehicleDataResult *)fuelLevel fuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State instantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption fuelRange:(nullable SDLVehicleDataResult *)fuelRange externalTemperature:(nullable SDLVehicleDataResult *)externalTemperature turnSignal:(nullable SDLVehicleDataResult *)turnSignal prndl:(nullable SDLVehicleDataResult *)prndl tirePressure:(nullable SDLVehicleDataResult *)tirePressure odometer:(nullable SDLVehicleDataResult *)odometer beltStatus:(nullable SDLVehicleDataResult *)beltStatus bodyInformation:(nullable SDLVehicleDataResult *)bodyInformation deviceStatus:(nullable SDLVehicleDataResult *)deviceStatus driverBraking:(nullable SDLVehicleDataResult *)driverBraking wiperStatus:(nullable SDLVehicleDataResult *)wiperStatus headLampStatus:(nullable SDLVehicleDataResult *)headLampStatus engineTorque:(nullable SDLVehicleDataResult *)engineTorque accPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition steeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle engineOilLife:(nullable SDLVehicleDataResult *)engineOilLife electronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus cloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID eCallInfo:(nullable SDLVehicleDataResult *)eCallInfo airbagStatus:(nullable SDLVehicleDataResult *)airbagStatus emergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent clusterModes:(nullable SDLVehicleDataResult *)clusterModes myKey:(nullable SDLVehicleDataResult *)myKey handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering { +- (instancetype)initWithGps:(nullable SDLVehicleDataResult *)gps speed:(nullable SDLVehicleDataResult *)speed rpm:(nullable SDLVehicleDataResult *)rpm instantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption fuelRange:(nullable SDLVehicleDataResult *)fuelRange externalTemperature:(nullable SDLVehicleDataResult *)externalTemperature turnSignal:(nullable SDLVehicleDataResult *)turnSignal prndl:(nullable SDLVehicleDataResult *)prndl tirePressure:(nullable SDLVehicleDataResult *)tirePressure odometer:(nullable SDLVehicleDataResult *)odometer beltStatus:(nullable SDLVehicleDataResult *)beltStatus bodyInformation:(nullable SDLVehicleDataResult *)bodyInformation deviceStatus:(nullable SDLVehicleDataResult *)deviceStatus driverBraking:(nullable SDLVehicleDataResult *)driverBraking wiperStatus:(nullable SDLVehicleDataResult *)wiperStatus headLampStatus:(nullable SDLVehicleDataResult *)headLampStatus engineTorque:(nullable SDLVehicleDataResult *)engineTorque accPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition steeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle engineOilLife:(nullable SDLVehicleDataResult *)engineOilLife electronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus cloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID eCallInfo:(nullable SDLVehicleDataResult *)eCallInfo airbagStatus:(nullable SDLVehicleDataResult *)airbagStatus emergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent clusterModes:(nullable SDLVehicleDataResult *)clusterModes myKey:(nullable SDLVehicleDataResult *)myKey handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering { self = [self init]; if (!self) { return nil; @@ -32,8 +32,6 @@ NS_ASSUME_NONNULL_BEGIN self.gps = gps; self.speed = speed; self.rpm = rpm; - self.fuelLevel = fuelLevel; - self.fuelLevel_State = fuelLevel_State; self.instantFuelConsumption = instantFuelConsumption; self.fuelRange = fuelRange; self.externalTemperature = externalTemperature; diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index b87ac7da6..0d135a163 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN * @param wiperStatus Unsubscribe to wiperStatus * @return A SDLUnsubscribeVehicleData object */ -- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo emergencyEvent:(BOOL)emergencyEvent engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); +- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo emergencyEvent:(BOOL)emergencyEvent engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); /** * Convenience init for unsubscribing to all possible vehicle data items. @@ -85,7 +85,7 @@ NS_ASSUME_NONNULL_BEGIN * @param wiperStatus Unsubscribe to wiperStatus * @return A SDLUnsubscribeVehicleData object */ -- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); +- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); /** * Convenience init for unsubscribing to all possible vehicle data items. @@ -121,16 +121,14 @@ NS_ASSUME_NONNULL_BEGIN * @param wiperStatus Unsubscribe to wiperStatus * @return A SDLUnsubscribeVehicleData object */ -- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); +- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering: instead"); /** - * Convenience init for unsubscribing to all possible vehicle data items. + * Convenience init for unsubscribing from all possible vehicle data items. * * @param gps - gps * @param speed - speed * @param rpm - rpm - * @param fuelLevel - fuelLevel - * @param fuelLevel_State - fuelLevel_State * @param instantFuelConsumption - instantFuelConsumption * @param fuelRange - fuelRange * @param externalTemperature - externalTemperature @@ -158,7 +156,7 @@ NS_ASSUME_NONNULL_BEGIN * @param handsOffSteering - handsOffSteering * @return A SDLUnsubscribeVehicleData object */ -- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm fuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel fuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering; +- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering; /** * If true, unsubscribes from GPS @@ -178,12 +176,12 @@ NS_ASSUME_NONNULL_BEGIN /** * If true, unsubscribes from Fuel Level */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel __deprecated_msg("use fuelRange instead on 7.0+ RPC version connections"); /** * If true, unsubscribes from Fuel Level State */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel_State; +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel_State __deprecated_msg("use fuelRange instead on 7.0+ RPC version connections"); /** * If true, unsubscribes from Fuel Range @@ -312,7 +310,7 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - + @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState A boolean value. If true, requests an unsubscribes of the OEM custom vehicle data item. @@ -322,7 +320,7 @@ NS_ASSUME_NONNULL_BEGIN /** Gets the OEM custom vehicle data state for any given OEM custom vehicle data name. - + @param vehicleDataName The name of the OEM custom vehicle data item to unsubscribe for. @return A boolean value indicating if an unsubscribe request will occur for the OEM custom vehicle data item. diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m index e4f40bbc2..978b12a17 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m @@ -24,19 +24,42 @@ NS_ASSUME_NONNULL_BEGIN #pragma clang diagnostic pop - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo emergencyEvent:(BOOL)emergencyEvent engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure wiperStatus:(BOOL)wiperStatus { - return [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) fuelLevel:@(fuelLevel) fuelLevel_State:@(fuelLevelState) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(NO) externalTemperature:@(externalTemperature) turnSignal:@(NO) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(NO) electronicParkBrakeStatus:@(NO) cloudAppVehicleID:@(NO) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:@(NO)]; + self = [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) instantFuelConsumption:@(instantFuelConsumption) fuelRange:nil externalTemperature:@(externalTemperature) turnSignal:nil prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:nil electronicParkBrakeStatus:nil cloudAppVehicleID:nil eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:nil]; + if (self) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + self.fuelLevel = @(fuelLevel); + self.fuelLevel_State = @(fuelLevelState); +#pragma clang diagnostic pop + } + return self; } - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus { - return [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) fuelLevel:@(fuelLevel) fuelLevel_State:@(fuelLevelState) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(fuelRange) externalTemperature:@(externalTemperature) turnSignal:@(turnSignal) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(engineOilLife) electronicParkBrakeStatus:@(electronicParkBrakeStatus) cloudAppVehicleID:@(NO) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:@(NO)]; + self = [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(fuelRange) externalTemperature:@(externalTemperature) turnSignal:@(turnSignal) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(engineOilLife) electronicParkBrakeStatus:@(electronicParkBrakeStatus) cloudAppVehicleID:nil eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:nil]; + if (self) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + self.fuelLevel = @(fuelLevel); + self.fuelLevel_State = @(fuelLevelState); +#pragma clang diagnostic pop + } + return self; } - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus { - return [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) fuelLevel:@(fuelLevel) fuelLevel_State:@(fuelLevelState) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(fuelRange) externalTemperature:@(externalTemperature) turnSignal:@(turnSignal) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(engineOilLife) electronicParkBrakeStatus:@(electronicParkBrakeStatus) cloudAppVehicleID:@(cloudAppVehicleID) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:@(NO)]; - + self = [self initWithGps:@(gps) speed:@(speed) rpm:@(rpm) instantFuelConsumption:@(instantFuelConsumption) fuelRange:@(fuelRange) externalTemperature:@(externalTemperature) turnSignal:@(turnSignal) prndl:@(prndl) tirePressure:@(tirePressure) odometer:@(odometer) beltStatus:@(beltStatus) bodyInformation:@(bodyInformation) deviceStatus:@(deviceStatus) driverBraking:@(driverBraking) wiperStatus:@(wiperStatus) headLampStatus:@(headLampStatus) engineTorque:@(engineTorque) accPedalPosition:@(accelerationPedalPosition) steeringWheelAngle:@(steeringWheelAngle) engineOilLife:@(engineOilLife) electronicParkBrakeStatus:@(electronicParkBrakeStatus) cloudAppVehicleID:@(cloudAppVehicleID) eCallInfo:@(eCallInfo) airbagStatus:@(airbagStatus) emergencyEvent:@(emergencyEvent) clusterModeStatus:@(clusterModeStatus) myKey:@(myKey) handsOffSteering:nil]; + if (self) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + self.fuelLevel = @(fuelLevel); + self.fuelLevel_State = @(fuelLevelState); +#pragma clang diagnostic pop + } + return self; } -- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm fuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel fuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering { +- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering { self = [self init]; if (!self) { return nil; @@ -44,8 +67,6 @@ NS_ASSUME_NONNULL_BEGIN self.gps = gps; self.speed = speed; self.rpm = rpm; - self.fuelLevel = fuelLevel; - self.fuelLevel_State = fuelLevel_State; self.instantFuelConsumption = instantFuelConsumption; self.fuelRange = fuelRange; self.externalTemperature = externalTemperature; diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index fb355316d..0e4a2c299 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -16,13 +16,11 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLUnsubscribeVehicleDataResponse : SDLRPCResponse /** - * Convenience initializer, initializes a new allocated object of the class SDLUnsubscribeVehicleDataResponse + * Convenience init for setting all data on vehicle data items. * * @param gps - gps * @param speed - speed * @param rpm - rpm - * @param fuelLevel - fuelLevel - * @param fuelLevel_State - fuelLevel_State * @param instantFuelConsumption - instantFuelConsumption * @param fuelRange - fuelRange * @param externalTemperature - externalTemperature @@ -50,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN * @param handsOffSteering - handsOffSteering * @return A SDLUnsubscribeVehicleDataResponse object */ -- (instancetype)initWithGps:(nullable SDLVehicleDataResult *)gps speed:(nullable SDLVehicleDataResult *)speed rpm:(nullable SDLVehicleDataResult *)rpm fuelLevel:(nullable SDLVehicleDataResult *)fuelLevel fuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State instantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption fuelRange:(nullable SDLVehicleDataResult *)fuelRange externalTemperature:(nullable SDLVehicleDataResult *)externalTemperature turnSignal:(nullable SDLVehicleDataResult *)turnSignal prndl:(nullable SDLVehicleDataResult *)prndl tirePressure:(nullable SDLVehicleDataResult *)tirePressure odometer:(nullable SDLVehicleDataResult *)odometer beltStatus:(nullable SDLVehicleDataResult *)beltStatus bodyInformation:(nullable SDLVehicleDataResult *)bodyInformation deviceStatus:(nullable SDLVehicleDataResult *)deviceStatus driverBraking:(nullable SDLVehicleDataResult *)driverBraking wiperStatus:(nullable SDLVehicleDataResult *)wiperStatus headLampStatus:(nullable SDLVehicleDataResult *)headLampStatus engineTorque:(nullable SDLVehicleDataResult *)engineTorque accPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition steeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle engineOilLife:(nullable SDLVehicleDataResult *)engineOilLife electronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus cloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID eCallInfo:(nullable SDLVehicleDataResult *)eCallInfo airbagStatus:(nullable SDLVehicleDataResult *)airbagStatus emergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent clusterModes:(nullable SDLVehicleDataResult *)clusterModes myKey:(nullable SDLVehicleDataResult *)myKey handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering; +- (instancetype)initWithGps:(nullable SDLVehicleDataResult *)gps speed:(nullable SDLVehicleDataResult *)speed rpm:(nullable SDLVehicleDataResult *)rpm instantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption fuelRange:(nullable SDLVehicleDataResult *)fuelRange externalTemperature:(nullable SDLVehicleDataResult *)externalTemperature turnSignal:(nullable SDLVehicleDataResult *)turnSignal prndl:(nullable SDLVehicleDataResult *)prndl tirePressure:(nullable SDLVehicleDataResult *)tirePressure odometer:(nullable SDLVehicleDataResult *)odometer beltStatus:(nullable SDLVehicleDataResult *)beltStatus bodyInformation:(nullable SDLVehicleDataResult *)bodyInformation deviceStatus:(nullable SDLVehicleDataResult *)deviceStatus driverBraking:(nullable SDLVehicleDataResult *)driverBraking wiperStatus:(nullable SDLVehicleDataResult *)wiperStatus headLampStatus:(nullable SDLVehicleDataResult *)headLampStatus engineTorque:(nullable SDLVehicleDataResult *)engineTorque accPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition steeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle engineOilLife:(nullable SDLVehicleDataResult *)engineOilLife electronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus cloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID eCallInfo:(nullable SDLVehicleDataResult *)eCallInfo airbagStatus:(nullable SDLVehicleDataResult *)airbagStatus emergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent clusterModes:(nullable SDLVehicleDataResult *)clusterModes myKey:(nullable SDLVehicleDataResult *)myKey handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering; /** The result of requesting to unsubscribe to the GPSData. @@ -78,14 +76,14 @@ NS_ASSUME_NONNULL_BEGIN Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel __deprecated_msg("use fuelRange instead on 7.0+ RPC version connections"); /** The result of requesting to unsubscribe to the fuel level state. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel_State; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel_State __deprecated_msg("use fuelRange instead on 7.0+ RPC version connections"); /** The result of requesting to unsubscribe to the fuel range. diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m index dcca4a34b..4abed6683 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m @@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN } #pragma clang diagnostic pop -- (instancetype)initWithGps:(nullable SDLVehicleDataResult *)gps speed:(nullable SDLVehicleDataResult *)speed rpm:(nullable SDLVehicleDataResult *)rpm fuelLevel:(nullable SDLVehicleDataResult *)fuelLevel fuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State instantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption fuelRange:(nullable SDLVehicleDataResult *)fuelRange externalTemperature:(nullable SDLVehicleDataResult *)externalTemperature turnSignal:(nullable SDLVehicleDataResult *)turnSignal prndl:(nullable SDLVehicleDataResult *)prndl tirePressure:(nullable SDLVehicleDataResult *)tirePressure odometer:(nullable SDLVehicleDataResult *)odometer beltStatus:(nullable SDLVehicleDataResult *)beltStatus bodyInformation:(nullable SDLVehicleDataResult *)bodyInformation deviceStatus:(nullable SDLVehicleDataResult *)deviceStatus driverBraking:(nullable SDLVehicleDataResult *)driverBraking wiperStatus:(nullable SDLVehicleDataResult *)wiperStatus headLampStatus:(nullable SDLVehicleDataResult *)headLampStatus engineTorque:(nullable SDLVehicleDataResult *)engineTorque accPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition steeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle engineOilLife:(nullable SDLVehicleDataResult *)engineOilLife electronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus cloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID eCallInfo:(nullable SDLVehicleDataResult *)eCallInfo airbagStatus:(nullable SDLVehicleDataResult *)airbagStatus emergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent clusterModes:(nullable SDLVehicleDataResult *)clusterModes myKey:(nullable SDLVehicleDataResult *)myKey handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering { +- (instancetype)initWithGps:(nullable SDLVehicleDataResult *)gps speed:(nullable SDLVehicleDataResult *)speed rpm:(nullable SDLVehicleDataResult *)rpm instantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption fuelRange:(nullable SDLVehicleDataResult *)fuelRange externalTemperature:(nullable SDLVehicleDataResult *)externalTemperature turnSignal:(nullable SDLVehicleDataResult *)turnSignal prndl:(nullable SDLVehicleDataResult *)prndl tirePressure:(nullable SDLVehicleDataResult *)tirePressure odometer:(nullable SDLVehicleDataResult *)odometer beltStatus:(nullable SDLVehicleDataResult *)beltStatus bodyInformation:(nullable SDLVehicleDataResult *)bodyInformation deviceStatus:(nullable SDLVehicleDataResult *)deviceStatus driverBraking:(nullable SDLVehicleDataResult *)driverBraking wiperStatus:(nullable SDLVehicleDataResult *)wiperStatus headLampStatus:(nullable SDLVehicleDataResult *)headLampStatus engineTorque:(nullable SDLVehicleDataResult *)engineTorque accPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition steeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle engineOilLife:(nullable SDLVehicleDataResult *)engineOilLife electronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus cloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID eCallInfo:(nullable SDLVehicleDataResult *)eCallInfo airbagStatus:(nullable SDLVehicleDataResult *)airbagStatus emergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent clusterModes:(nullable SDLVehicleDataResult *)clusterModes myKey:(nullable SDLVehicleDataResult *)myKey handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering { self = [self init]; if (!self) { return nil; @@ -32,8 +32,6 @@ NS_ASSUME_NONNULL_BEGIN self.gps = gps; self.speed = speed; self.rpm = rpm; - self.fuelLevel = fuelLevel; - self.fuelLevel_State = fuelLevel_State; self.instantFuelConsumption = instantFuelConsumption; self.fuelRange = fuelRange; self.externalTemperature = externalTemperature; diff --git a/SmartDeviceLink/SDLVehicleDataType.h b/SmartDeviceLink/SDLVehicleDataType.h index ca30728f7..8343aa567 100644 --- a/SmartDeviceLink/SDLVehicleDataType.h +++ b/SmartDeviceLink/SDLVehicleDataType.h @@ -27,12 +27,12 @@ extern SDLVehicleDataType const SDLVehicleDataTypeRPM; /** Vehicle fuel level data */ -extern SDLVehicleDataType const SDLVehicleDataTypeFuelLevel; +extern SDLVehicleDataType const SDLVehicleDataTypeFuelLevel __deprecated_msg("use SDLVehicleDataTypeFuelRange on RPC 7.0+ connections"); /** Vehicle fuel level state data */ -extern SDLVehicleDataType const SDLVehicleDataTypeFuelLevelState; +extern SDLVehicleDataType const SDLVehicleDataTypeFuelLevelState __deprecated_msg("use SDLVehicleDataTypeFuelRange on RPC 7.0+ connections"); /** Vehicle fuel consumption data diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCapacityUnitSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCapacityUnitSpec.m new file mode 100644 index 000000000..8dc19f03e --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCapacityUnitSpec.m @@ -0,0 +1,21 @@ +// +// SDLCapacityUnitSpec.m +// SmartDeviceLinkTests +// + +#import <Nimble/Nimble.h> +#import <Quick/Quick.h> + +#import "SDLCapacityUnit.h" + +QuickSpecBegin(SDLCapacityUnitSpec) + +describe(@"Individual Enum Value Tests", ^ { + it(@"Should match internal values", ^ { + expect(SDLCapacityUnitKilograms).to(equal(@"KILOGRAMS")); + expect(SDLCapacityUnitKilowatthours).to(equal(@"KILOWATTHOURS")); + expect(SDLCapacityUnitLiters).to(equal(@"LITERS")); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m index 25936ebed..7daa898ce 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m @@ -17,8 +17,11 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLVehicleDataTypeGPS).to(equal(@"VEHICLEDATA_GPS")); expect(SDLVehicleDataTypeSpeed).to(equal(@"VEHICLEDATA_SPEED")); expect(SDLVehicleDataTypeRPM).to(equal(@"VEHICLEDATA_RPM")); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(SDLVehicleDataTypeFuelLevel).to(equal(@"VEHICLEDATA_FUELLEVEL")); expect(SDLVehicleDataTypeFuelLevelState).to(equal(@"VEHICLEDATA_FUELLEVEL_STATE")); +#pragma clang diagnostic pop expect(SDLVehicleDataTypeFuelConsumption).to(equal(@"VEHICLEDATA_FUELCONSUMPTION")); expect(SDLVehicleDataTypeFuelRange).to(equal(@"VEHICLEDATA_FUELRANGE")); expect(SDLVehicleDataTypeExternalTemperature).to(equal(@"VEHICLEDATA_EXTERNTEMP")); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m index 2b0f14f72..fedeaae96 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m @@ -14,45 +14,44 @@ QuickSpecBegin(SDLOnVehicleDataSpec) +SDLGPSData* gps = [[SDLGPSData alloc] init]; +SDLTireStatus* tires = [[SDLTireStatus alloc] init]; +SDLBeltStatus* belt = [[SDLBeltStatus alloc] init]; +SDLBodyInformation* body = [[SDLBodyInformation alloc] init]; +SDLDeviceStatus* device = [[SDLDeviceStatus alloc] init]; +SDLHeadLampStatus* headLamp = [[SDLHeadLampStatus alloc] init]; +SDLECallInfo* eCall = [[SDLECallInfo alloc] init]; +SDLAirbagStatus* airbag = [[SDLAirbagStatus alloc] init]; +SDLEmergencyEvent* event = [[SDLEmergencyEvent alloc] init]; +SDLClusterModeStatus* clusterMode = [[SDLClusterModeStatus alloc] init]; +SDLMyKey* myKey = [[SDLMyKey alloc] init]; +SDLFuelRange* fuelRange = [[SDLFuelRange alloc] init]; +NSArray *fuelRangeArray = @[fuelRange, fuelRange]; +NSString *const cloudAppVehicleID = @"testCloudAppVehicleID"; +NSString *const vin = @"6574839201a"; +const float speed = 123.45; +const NSUInteger rpm = 3500; +const float instantFuelConsumption = 67.88; +const float externalTemperature = 37.7; +SDLTurnSignal turnSignal = SDLTurnSignalLeft; +SDLPRNDL prndl = SDLPRNDLPark; +const NSUInteger odometer = 98765; +SDLVehicleDataEventStatus driverBraking = SDLVehicleDataEventStatusNoEvent; +SDLWiperStatus wiperStatus = SDLWiperStatusManualLow; +const float fuelLevel = 98.76; +SDLComponentVolumeStatus fuelLevel_State = SDLComponentVolumeStatusNormal; +const float engineTorque = 765.56; +const float accPedalPosition = 34.56; +const float steeringWheelAngle = 56.78; +const float engineOilLife = 67.89; +SDLElectronicParkBrakeStatus electronicParkBrakeStatus = SDLElectronicParkBrakeStatusClosed; +const BOOL handsOffSteering = YES; describe(@"getter/setter tests", ^ { - SDLGPSData* gps = [[SDLGPSData alloc] init]; - SDLTireStatus* tires = [[SDLTireStatus alloc] init]; - SDLBeltStatus* belt = [[SDLBeltStatus alloc] init]; - SDLBodyInformation* body = [[SDLBodyInformation alloc] init]; - SDLDeviceStatus* device = [[SDLDeviceStatus alloc] init]; - SDLHeadLampStatus* headLamp = [[SDLHeadLampStatus alloc] init]; - SDLECallInfo* eCall = [[SDLECallInfo alloc] init]; - SDLAirbagStatus* airbag = [[SDLAirbagStatus alloc] init]; - SDLEmergencyEvent* event = [[SDLEmergencyEvent alloc] init]; - SDLClusterModeStatus* clusterMode = [[SDLClusterModeStatus alloc] init]; - SDLMyKey *myKey = [[SDLMyKey alloc] init]; - SDLFuelRange* fuelRange = [[SDLFuelRange alloc] init]; - NSString *cloudAppVehicleID = @"testCloudAppVehicleID"; - const float speed = 123.45; - const NSUInteger rpm = 42; - const float fuelLevel = 10.3; - SDLComponentVolumeStatus fuelLevel_State = SDLComponentVolumeStatusAlert; - const float instantFuelConsumption = 4000.63; - NSArray *fuelRangeArray = @[fuelRange, fuelRange]; - const float externalTemperature = -10.5; - NSString *const vin = @"222222222722"; - SDLTurnSignal turnSignal = SDLTurnSignalOff; - SDLPRNDL prndl = SDLPRNDLDrive; - NSUInteger odometer = 100500; - SDLVehicleDataEventStatus driverBraking = SDLVehicleDataEventStatusYes; - SDLWiperStatus wiperStatus = SDLWiperStatusStalled; - const float engineTorque = -200.124; - const float accPedalPosition = 99.99999999; - const float steeringWheelAngle = M_PI_4; - const float engineOilLife = 34.45; - SDLElectronicParkBrakeStatus electronicParkBrakeStatus = SDLElectronicParkBrakeStatusDriveActive; - const BOOL handsOffSteering = YES; - it(@"should correctly initialize with init", ^ { SDLOnVehicleData* testNotification = [[SDLOnVehicleData alloc] init]; - testNotification.accPedalPosition = @99.99999999; + testNotification.accPedalPosition = @(accPedalPosition); testNotification.airbagStatus = airbag; testNotification.beltStatus = belt; testNotification.bodyInformation = body; @@ -63,28 +62,31 @@ describe(@"getter/setter tests", ^ { testNotification.eCallInfo = eCall; testNotification.electronicParkBrakeStatus = SDLElectronicParkBrakeStatusDriveActive; testNotification.emergencyEvent = event; - testNotification.engineOilLife = @34.45; - testNotification.engineTorque = @-200.124; - testNotification.externalTemperature = @-10; - testNotification.fuelLevel = @10.3; - testNotification.fuelLevel_State = SDLComponentVolumeStatusAlert; - testNotification.fuelRange = @[fuelRange, fuelRange]; + testNotification.engineOilLife = @(engineOilLife); + testNotification.engineTorque = @(engineTorque); + testNotification.externalTemperature = @(externalTemperature); testNotification.gps = gps; testNotification.handsOffSteering = @YES; testNotification.headLampStatus = headLamp; - testNotification.instantFuelConsumption = @4000.63; + testNotification.instantFuelConsumption = @(instantFuelConsumption); testNotification.myKey = myKey; - testNotification.odometer = @100050; - testNotification.prndl = SDLPRNDLDrive; - testNotification.rpm = @4242; - testNotification.speed = @70.1; - testNotification.steeringWheelAngle = @0.000000001; + testNotification.odometer = @(odometer); + testNotification.prndl = prndl; + testNotification.rpm = @(rpm); + testNotification.speed = @(speed); + testNotification.steeringWheelAngle = @(steeringWheelAngle); testNotification.tirePressure = tires; - testNotification.turnSignal = SDLTurnSignalRight; - testNotification.vin = @"222222222722"; - testNotification.wiperStatus = SDLWiperStatusStalled; + testNotification.turnSignal = turnSignal; + testNotification.vin = vin; + testNotification.wiperStatus = wiperStatus; + testNotification.fuelRange = fuelRangeArray; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + testNotification.fuelLevel = @(fuelLevel); + testNotification.fuelLevel_State = fuelLevel_State; +#pragma clang diagnostic pop - expect(testNotification.accPedalPosition).to(equal(@99.99999999)); + expect(testNotification.accPedalPosition).to(equal(@(accPedalPosition))); expect(testNotification.airbagStatus).to(equal(airbag)); expect(testNotification.beltStatus).to(equal(belt)); expect(testNotification.bodyInformation).to(equal(body)); @@ -95,62 +97,65 @@ describe(@"getter/setter tests", ^ { expect(testNotification.eCallInfo).to(equal(eCall)); expect(testNotification.electronicParkBrakeStatus).to(equal(SDLElectronicParkBrakeStatusDriveActive)); expect(testNotification.emergencyEvent).to(equal(event)); - expect(testNotification.engineOilLife).to(equal(@34.45)); - expect(testNotification.engineTorque).to(equal(@-200.124)); - expect(testNotification.externalTemperature).to(equal(@-10)); - expect(testNotification.fuelLevel).to(equal(@10.3)); - expect(testNotification.fuelLevel_State).to(equal(SDLComponentVolumeStatusAlert)); - expect(testNotification.fuelRange).to(equal(@[fuelRange, fuelRange])); + expect(testNotification.engineOilLife).to(equal(@(engineOilLife))); + expect(testNotification.engineTorque).to(equal(@(engineTorque))); + expect(testNotification.externalTemperature).to(equal(@(externalTemperature))); expect(testNotification.gps).to(equal(gps)); expect(testNotification.headLampStatus).to(equal(headLamp)); - expect(testNotification.instantFuelConsumption).to(equal(@4000.63)); + expect(testNotification.instantFuelConsumption).to(equal(@(instantFuelConsumption))); expect(testNotification.myKey).to(equal(myKey)); - expect(testNotification.odometer).to(equal(@100050)); - expect(testNotification.prndl).to(equal(SDLPRNDLDrive)); - expect(testNotification.rpm).to(equal(@4242)); - expect(testNotification.speed).to(equal(@70.1)); - expect(testNotification.steeringWheelAngle).to(equal(@0.000000001)); + expect(testNotification.odometer).to(equal(@(odometer))); + expect(testNotification.prndl).to(equal(prndl)); + expect(testNotification.rpm).to(equal(@(rpm))); + expect(testNotification.speed).to(equal(@(speed))); + expect(testNotification.steeringWheelAngle).to(equal(@(steeringWheelAngle))); expect(testNotification.tirePressure).to(equal(tires)); - expect(testNotification.turnSignal).to(equal(SDLTurnSignalRight)); - expect(testNotification.vin).to(equal(@"222222222722")); - expect(testNotification.wiperStatus).to(equal(SDLWiperStatusStalled)); - expect(testNotification.handsOffSteering).to(equal(@YES)); + expect(testNotification.turnSignal).to(equal(turnSignal)); + expect(testNotification.vin).to(equal(vin)); + expect(testNotification.wiperStatus).to(equal(wiperStatus)); + expect(testNotification.handsOffSteering).to(equal(@(handsOffSteering))); + expect(testNotification.fuelRange).to(equal(fuelRangeArray)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testNotification.fuelLevel).to(equal(@(fuelLevel))); + expect(testNotification.fuelLevel_State).to(equal(fuelLevel_State)); +#pragma clang diagnostic pop }); it(@"should get correctly when initialized", ^ { NSDictionary* dict = @{SDLRPCParameterNameNotification: @{SDLRPCParameterNameParameters: - @{SDLRPCParameterNameAccelerationPedalPosition:@99.99999999, + @{SDLRPCParameterNameAccelerationPedalPosition:@(accPedalPosition), SDLRPCParameterNameAirbagStatus:airbag, SDLRPCParameterNameBeltStatus:belt, SDLRPCParameterNameBodyInformation:body, SDLRPCParameterNameCloudAppVehicleID:cloudAppVehicleID, SDLRPCParameterNameClusterModeStatus:clusterMode, SDLRPCParameterNameDeviceStatus:device, - SDLRPCParameterNameDriverBraking:SDLVehicleDataEventStatusYes, + SDLRPCParameterNameDriverBraking:driverBraking, SDLRPCParameterNameECallInfo:eCall, - SDLRPCParameterNameElectronicParkBrakeStatus:SDLElectronicParkBrakeStatusDriveActive, + SDLRPCParameterNameElectronicParkBrakeStatus:electronicParkBrakeStatus, SDLRPCParameterNameEmergencyEvent:event, - SDLRPCParameterNameEngineOilLife:@45.1, - SDLRPCParameterNameEngineTorque:@-200.124, - SDLRPCParameterNameExternalTemperature:@-10, - SDLRPCParameterNameFuelLevel:@10.3, - SDLRPCParameterNameFuelLevelState:SDLComponentVolumeStatusAlert, - SDLRPCParameterNameFuelRange:@[fuelRange], + SDLRPCParameterNameEngineOilLife:@(engineOilLife), + SDLRPCParameterNameEngineTorque:@(engineTorque), + SDLRPCParameterNameExternalTemperature:@(externalTemperature), + SDLRPCParameterNameFuelLevel:@(fuelLevel), + SDLRPCParameterNameFuelLevelState:fuelLevel_State, + SDLRPCParameterNameFuelRange:fuelRangeArray, SDLRPCParameterNameGPS:gps, SDLRPCParameterNameHeadLampStatus:headLamp, - SDLRPCParameterNameInstantFuelConsumption:@4000.63, + SDLRPCParameterNameInstantFuelConsumption:@(instantFuelConsumption), SDLRPCParameterNameMyKey:myKey, - SDLRPCParameterNameOdometer:@100050, - SDLRPCParameterNamePRNDL:SDLPRNDLDrive, - SDLRPCParameterNameRPM:@4242, - SDLRPCParameterNameSpeed:@70.1, - SDLRPCParameterNameSteeringWheelAngle:@0.000000001, + SDLRPCParameterNameOdometer:@(odometer), + SDLRPCParameterNamePRNDL:prndl, + SDLRPCParameterNameRPM:@(rpm), + SDLRPCParameterNameSpeed:@(speed), + SDLRPCParameterNameSteeringWheelAngle:@(steeringWheelAngle), SDLRPCParameterNameTirePressure:tires, - SDLRPCParameterNameTurnSignal:SDLTurnSignalOff, - SDLRPCParameterNameVIN:@"222222222722", - SDLRPCParameterNameWiperStatus:SDLWiperStatusStalled, - SDLRPCParameterNameHandsOffSteering:@YES + SDLRPCParameterNameTurnSignal:turnSignal, + SDLRPCParameterNameVIN:vin, + SDLRPCParameterNameWiperStatus:wiperStatus, + SDLRPCParameterNameHandsOffSteering:@(handsOffSteering) }, SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnVehicleData}}; #pragma clang diagnostic push @@ -158,37 +163,40 @@ describe(@"getter/setter tests", ^ { SDLOnVehicleData* testNotification = [[SDLOnVehicleData alloc] initWithDictionary:dict]; #pragma clang diagnostic pop - expect(testNotification.accPedalPosition).to(equal(@99.99999999)); + expect(testNotification.accPedalPosition).to(equal(@(accPedalPosition))); expect(testNotification.airbagStatus).to(equal(airbag)); expect(testNotification.beltStatus).to(equal(belt)); expect(testNotification.bodyInformation).to(equal(body)); expect(testNotification.cloudAppVehicleID).to(equal(cloudAppVehicleID)); expect(testNotification.clusterModeStatus).to(equal(clusterMode)); expect(testNotification.deviceStatus).to(equal(device)); - expect(testNotification.driverBraking).to(equal(SDLVehicleDataEventStatusYes)); + expect(testNotification.driverBraking).to(equal(driverBraking)); expect(testNotification.eCallInfo).to(equal(eCall)); - expect(testNotification.electronicParkBrakeStatus).to(equal(SDLElectronicParkBrakeStatusDriveActive)); + expect(testNotification.electronicParkBrakeStatus).to(equal(electronicParkBrakeStatus)); expect(testNotification.emergencyEvent).to(equal(event)); - expect(testNotification.engineOilLife).to(equal(@45.1)); - expect(testNotification.engineTorque).to(equal(@-200.124)); - expect(testNotification.externalTemperature).to(equal(@-10)); - expect(testNotification.fuelLevel).to(equal(@10.3)); - expect(testNotification.fuelLevel_State).to(equal(SDLComponentVolumeStatusAlert)); - expect(testNotification.fuelRange).to(equal(@[fuelRange])); + expect(testNotification.engineOilLife).to(equal(@(engineOilLife))); + expect(testNotification.engineTorque).to(equal(@(engineTorque))); + expect(testNotification.externalTemperature).to(equal(@(externalTemperature))); expect(testNotification.gps).to(equal(gps)); - expect(testNotification.handsOffSteering).to(equal(@YES)); + expect(testNotification.handsOffSteering).to(equal(@(handsOffSteering))); expect(testNotification.headLampStatus).to(equal(headLamp)); - expect(testNotification.instantFuelConsumption).to(equal(@4000.63)); + expect(testNotification.instantFuelConsumption).to(equal(@(instantFuelConsumption))); expect(testNotification.myKey).to(equal(myKey)); - expect(testNotification.odometer).to(equal(@100050)); - expect(testNotification.prndl).to(equal(SDLPRNDLDrive)); - expect(testNotification.rpm).to(equal(@4242)); - expect(testNotification.speed).to(equal(@70.1)); - expect(testNotification.steeringWheelAngle).to(equal(@0.000000001)); + expect(testNotification.odometer).to(equal(@(odometer))); + expect(testNotification.prndl).to(equal(prndl)); + expect(testNotification.rpm).to(equal(@(rpm))); + expect(testNotification.speed).to(equal(@(speed))); + expect(testNotification.steeringWheelAngle).to(equal(@(steeringWheelAngle))); expect(testNotification.tirePressure).to(equal(tires)); - expect(testNotification.turnSignal).to(equal(SDLTurnSignalOff)); - expect(testNotification.vin).to(equal(@"222222222722")); - expect(testNotification.wiperStatus).to(equal(SDLWiperStatusStalled)); + expect(testNotification.turnSignal).to(equal(turnSignal)); + expect(testNotification.vin).to(equal(vin)); + expect(testNotification.wiperStatus).to(equal(wiperStatus)); + expect(testNotification.fuelRange).to(equal(fuelRangeArray)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testNotification.fuelLevel).to(equal(@(fuelLevel))); + expect(testNotification.fuelLevel_State).to(equal(fuelLevel_State)); +#pragma clang diagnostic pop }); it(@"should return nil if not set", ^ { @@ -208,9 +216,6 @@ describe(@"getter/setter tests", ^ { expect(testNotification.engineOilLife).to(beNil()); expect(testNotification.engineTorque).to(beNil()); expect(testNotification.externalTemperature).to(beNil()); - expect(testNotification.fuelLevel).to(beNil()); - expect(testNotification.fuelLevel_State).to(beNil()); - expect(testNotification.fuelRange).to(beNil()); expect(testNotification.gps).to(beNil()); expect(testNotification.handsOffSteering).to(beNil()); expect(testNotification.headLampStatus).to(beNil()); @@ -225,18 +230,16 @@ describe(@"getter/setter tests", ^ { expect(testNotification.turnSignal).to(beNil()); expect(testNotification.vin).to(beNil()); expect(testNotification.wiperStatus).to(beNil()); + expect(testNotification.fuelRange).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testNotification.fuelLevel).to(beNil()); + expect(testNotification.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop }); - it(@"should set and get OEM Custom Vehicle Data", ^{ - SDLOnVehicleData *testRequest = [[SDLOnVehicleData alloc] init]; - - [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:@"oemVehicleData"]; - - expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@"oemVehicleData")); - }); - - context(@"initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:vin:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering:", ^{ - SDLOnVehicleData *onVehicleData = [[SDLOnVehicleData alloc] initWithGps:gps speed:speed rpm:@(rpm) fuelLevel:fuelLevel fuelLevel_State:fuelLevel_State instantFuelConsumption:instantFuelConsumption fuelRange:fuelRangeArray externalTemperature:externalTemperature turnSignal:turnSignal vin:vin prndl:prndl tirePressure:tires odometer:@(odometer) beltStatus:belt bodyInformation:body deviceStatus:device driverBraking:driverBraking wiperStatus:wiperStatus headLampStatus:headLamp engineTorque:engineTorque accPedalPosition:accPedalPosition steeringWheelAngle:steeringWheelAngle engineOilLife:engineOilLife electronicParkBrakeStatus:electronicParkBrakeStatus cloudAppVehicleID:cloudAppVehicleID eCallInfo:eCall airbagStatus:airbag emergencyEvent:event clusterModeStatus:clusterMode myKey:myKey handsOffSteering:@(handsOffSteering)]; + context(@"initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:vin:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering:", ^{ + SDLOnVehicleData *onVehicleData = [[SDLOnVehicleData alloc] initWithGps:gps speed:speed rpm:@(rpm) instantFuelConsumption:instantFuelConsumption fuelRange:fuelRangeArray externalTemperature:externalTemperature turnSignal:turnSignal vin:vin prndl:prndl tirePressure:tires odometer:@(odometer) beltStatus:belt bodyInformation:body deviceStatus:device driverBraking:driverBraking wiperStatus:wiperStatus headLampStatus:headLamp engineTorque:engineTorque accPedalPosition:accPedalPosition steeringWheelAngle:steeringWheelAngle engineOilLife:engineOilLife electronicParkBrakeStatus:electronicParkBrakeStatus cloudAppVehicleID:cloudAppVehicleID eCallInfo:eCall airbagStatus:airbag emergencyEvent:event clusterModeStatus:clusterMode myKey:myKey handsOffSteering:@(handsOffSteering)]; it(@"should initialize an object correctly", ^{ expect(onVehicleData.accPedalPosition).to(equal(@(accPedalPosition))); expect(onVehicleData.airbagStatus).to(equal(airbag)); @@ -252,8 +255,11 @@ describe(@"getter/setter tests", ^ { expect(onVehicleData.engineOilLife).to(equal(@(engineOilLife))); expect(onVehicleData.engineTorque).to(equal(@(engineTorque))); expect(onVehicleData.externalTemperature).to(equal(@(externalTemperature))); - expect(onVehicleData.fuelLevel).to(equal(@(fuelLevel))); - expect(onVehicleData.fuelLevel_State).to(equal(fuelLevel_State)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(onVehicleData.fuelLevel).to(beNil()); + expect(onVehicleData.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop expect(onVehicleData.fuelRange).to(equal(fuelRangeArray)); expect(onVehicleData.gps).to(equal(gps)); expect(onVehicleData.handsOffSteering).to(equal(@(handsOffSteering))); @@ -270,6 +276,13 @@ describe(@"getter/setter tests", ^ { expect(onVehicleData.vin).to(equal(vin)); expect(onVehicleData.wiperStatus).to(equal(wiperStatus)); }); + + it(@"should set and get OEM Custom Vehicle Data", ^{ + SDLOnVehicleData *testRequest = [[SDLOnVehicleData alloc] init]; + [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:@"oemVehicleData"]; + + expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@"oemVehicleData")); + }); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index 45e63d46f..b2b2bf913 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -14,74 +14,80 @@ QuickSpecBegin(SDLGetVehicleDataSpec) -describe(@"Getter/Setter Tests", ^ { - it(@"Should set and get correctly", ^ { +describe(@"getter/setter tests", ^{ + it(@"should set and get correctly", ^{ SDLGetVehicleData* testRequest = [[SDLGetVehicleData alloc] init]; testRequest.accPedalPosition = @YES; - testRequest.airbagStatus = @NO; - testRequest.beltStatus = @NO; + testRequest.airbagStatus = @YES; + testRequest.beltStatus = @YES; testRequest.bodyInformation = @YES; testRequest.cloudAppVehicleID = @YES; - testRequest.clusterModeStatus = @NO; - testRequest.deviceStatus = @NO; + testRequest.clusterModeStatus = @YES; + testRequest.deviceStatus = @YES; testRequest.driverBraking = @YES; testRequest.eCallInfo = @YES; testRequest.electronicParkBrakeStatus = @YES; testRequest.emergencyEvent = @YES; testRequest.engineOilLife = @YES; - testRequest.engineTorque = @NO; + testRequest.engineTorque = @YES; testRequest.externalTemperature = @YES; - testRequest.fuelLevel = @NO; - testRequest.fuelLevel_State = @YES; - testRequest.fuelRange = @YES; - testRequest.gps = @NO; + testRequest.gps = @YES; testRequest.headLampStatus = @YES; - testRequest.instantFuelConsumption = @NO; + testRequest.instantFuelConsumption = @YES; testRequest.myKey = @YES; testRequest.odometer = @YES; testRequest.prndl = @YES; testRequest.rpm = @YES; - testRequest.speed = @NO; - testRequest.steeringWheelAngle = @NO; - testRequest.tirePressure = @NO; + testRequest.speed = @YES; + testRequest.steeringWheelAngle = @YES; + testRequest.tirePressure = @YES; testRequest.turnSignal = @YES; - testRequest.wiperStatus = @NO; + testRequest.wiperStatus = @YES; testRequest.handsOffSteering = @YES; + testRequest.fuelRange = @YES; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + testRequest.fuelLevel = @YES; + testRequest.fuelLevel_State = @YES; +#pragma clang diagnostic pop expect(testRequest.accPedalPosition).to(equal(@YES)); - expect(testRequest.airbagStatus).to(equal(@NO)); - expect(testRequest.beltStatus).to(equal(@NO)); + expect(testRequest.airbagStatus).to(equal(@YES)); + expect(testRequest.beltStatus).to(equal(@YES)); expect(testRequest.bodyInformation).to(equal(@YES)); expect(testRequest.cloudAppVehicleID).to(equal(@YES)); - expect(testRequest.clusterModeStatus).to(equal(@NO)); - expect(testRequest.deviceStatus).to(equal(@NO)); + expect(testRequest.clusterModeStatus).to(equal(@YES)); + expect(testRequest.deviceStatus).to(equal(@YES)); expect(testRequest.driverBraking).to(equal(@YES)); expect(testRequest.eCallInfo).to(equal(@YES)); expect(testRequest.electronicParkBrakeStatus).to(equal(@YES)); expect(testRequest.emergencyEvent).to(equal(@YES)); expect(testRequest.engineOilLife).to(equal(@YES)); - expect(testRequest.engineTorque).to(equal(@NO)); + expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@YES)); - expect(testRequest.fuelLevel).to(equal(@NO)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.fuelLevel).to(equal(@YES)); expect(testRequest.fuelLevel_State).to(equal(@YES)); - expect(testRequest.fuelRange).to(equal(@YES)); - expect(testRequest.gps).to(equal(@NO)); +#pragma clang diagnostic pop + expect(testRequest.gps).to(equal(@YES)); expect(testRequest.headLampStatus).to(equal(@YES)); - expect(testRequest.instantFuelConsumption).to(equal(@NO)); + expect(testRequest.instantFuelConsumption).to(equal(@YES)); expect(testRequest.myKey).to(equal(@YES)); expect(testRequest.odometer).to(equal(@YES)); expect(testRequest.prndl).to(equal(@YES)); expect(testRequest.rpm).to(equal(@YES)); - expect(testRequest.speed).to(equal(@NO)); - expect(testRequest.steeringWheelAngle).to(equal(@NO)); - expect(testRequest.tirePressure).to(equal(@NO)); + expect(testRequest.speed).to(equal(@YES)); + expect(testRequest.steeringWheelAngle).to(equal(@YES)); + expect(testRequest.tirePressure).to(equal(@YES)); expect(testRequest.turnSignal).to(equal(@YES)); - expect(testRequest.wiperStatus).to(equal(@NO)); + expect(testRequest.wiperStatus).to(equal(@YES)); expect(testRequest.handsOffSteering).to(equal(@YES)); + expect(testRequest.fuelRange).to(equal(@YES)); }); - it(@"Should get correctly when initialized", ^ { + it(@"should get correctly when initialized", ^ { NSDictionary<NSString *, id> *dict = @{SDLRPCParameterNameRequest: @{SDLRPCParameterNameParameters: @{SDLRPCParameterNameAccelerationPedalPosition:@YES, @@ -94,10 +100,10 @@ describe(@"Getter/Setter Tests", ^ { SDLRPCParameterNameDriverBraking:@YES, SDLRPCParameterNameECallInfo:@YES, SDLRPCParameterNameElectronicParkBrakeStatus:@YES, - SDLRPCParameterNameEmergencyEvent:@NO, + SDLRPCParameterNameEmergencyEvent:@YES, SDLRPCParameterNameEngineOilLife:@YES, SDLRPCParameterNameEngineTorque:@YES, - SDLRPCParameterNameExternalTemperature:@NO, + SDLRPCParameterNameExternalTemperature:@YES, SDLRPCParameterNameFuelLevel:@YES, SDLRPCParameterNameFuelLevelState:@YES, SDLRPCParameterNameFuelRange:@YES, @@ -109,9 +115,9 @@ describe(@"Getter/Setter Tests", ^ { SDLRPCParameterNamePRNDL:@YES, SDLRPCParameterNameRPM:@YES, SDLRPCParameterNameSpeed:@YES, - SDLRPCParameterNameSteeringWheelAngle:@NO, + SDLRPCParameterNameSteeringWheelAngle:@YES, SDLRPCParameterNameTirePressure:@YES, - SDLRPCParameterNameTurnSignal:@NO, + SDLRPCParameterNameTurnSignal:@YES, SDLRPCParameterNameWiperStatus:@YES, SDLRPCParameterNameHandsOffSteering:@YES }, @@ -131,14 +137,18 @@ describe(@"Getter/Setter Tests", ^ { expect(testRequest.driverBraking).to(equal(@YES)); expect(testRequest.eCallInfo).to(equal(@YES)); expect(testRequest.electronicParkBrakeStatus).to(equal(@YES)); - expect(testRequest.emergencyEvent).to(equal(@NO)); + expect(testRequest.emergencyEvent).to(equal(@YES)); expect(testRequest.engineOilLife).to(equal(@YES)); expect(testRequest.engineTorque).to(equal(@YES)); - expect(testRequest.externalTemperature).to(equal(@NO)); + expect(testRequest.externalTemperature).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.fuelLevel).to(equal(@YES)); expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic pop expect(testRequest.fuelRange).to(equal(@YES)); expect(testRequest.gps).to(equal(@YES)); + expect(testRequest.handsOffSteering).to(equal(@YES)); expect(testRequest.headLampStatus).to(equal(@YES)); expect(testRequest.instantFuelConsumption).to(equal(@YES)); expect(testRequest.myKey).to(equal(@YES)); @@ -146,11 +156,10 @@ describe(@"Getter/Setter Tests", ^ { expect(testRequest.prndl).to(equal(@YES)); expect(testRequest.rpm).to(equal(@YES)); expect(testRequest.speed).to(equal(@YES)); - expect(testRequest.steeringWheelAngle).to(equal(@NO)); + expect(testRequest.steeringWheelAngle).to(equal(@YES)); expect(testRequest.tirePressure).to(equal(@YES)); - expect(testRequest.turnSignal).to(equal(@NO)); + expect(testRequest.turnSignal).to(equal(@YES)); expect(testRequest.wiperStatus).to(equal(@YES)); - expect(testRequest.handsOffSteering).to(equal(@YES)); }); }); @@ -158,7 +167,7 @@ describe(@"initializers", ^{ context(@"init", ^{ SDLGetVehicleData* testRequest = [[SDLGetVehicleData alloc] init]; - it(@"should set all the parameters to nil", ^{ + it(@"expect all properties to be nil", ^{ expect(testRequest.accPedalPosition).to(beNil()); expect(testRequest.airbagStatus).to(beNil()); expect(testRequest.beltStatus).to(beNil()); @@ -173,10 +182,15 @@ describe(@"initializers", ^{ expect(testRequest.engineOilLife).to(beNil()); expect(testRequest.engineTorque).to(beNil()); expect(testRequest.externalTemperature).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.fuelLevel).to(beNil()); expect(testRequest.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop + expect(testRequest.fuelRange).to(beNil()); expect(testRequest.fuelRange).to(beNil()); expect(testRequest.gps).to(beNil()); + expect(testRequest.handsOffSteering).to(beNil()); expect(testRequest.headLampStatus).to(beNil()); expect(testRequest.instantFuelConsumption).to(beNil()); expect(testRequest.myKey).to(beNil()); @@ -188,35 +202,37 @@ describe(@"initializers", ^{ expect(testRequest.tirePressure).to(beNil()); expect(testRequest.turnSignal).to(beNil()); expect(testRequest.wiperStatus).to(beNil()); - expect(testRequest.handsOffSteering).to(beNil()); }); }); - context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:emergencyEvent:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:wiperStatus:", ^{ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:NO beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES emergencyEvent:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES vin:YES wiperStatus:YES]; + SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES emergencyEvent:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES vin:YES wiperStatus:YES]; #pragma clang diagnostic pop - it(@"should set all the parameters properly", ^{ + it(@"expect all properties to be set properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); - expect(testRequest.airbagStatus).to(equal(@NO)); + expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); expect(testRequest.bodyInformation).to(equal(@YES)); - expect(testRequest.cloudAppVehicleID).to(equal(@NO)); + expect(testRequest.cloudAppVehicleID).to(beNil()); expect(testRequest.clusterModeStatus).to(equal(@YES)); expect(testRequest.deviceStatus).to(equal(@YES)); expect(testRequest.driverBraking).to(equal(@YES)); expect(testRequest.eCallInfo).to(equal(@YES)); - expect(testRequest.electronicParkBrakeStatus).to(equal(@NO)); + expect(testRequest.electronicParkBrakeStatus).to(beNil()); expect(testRequest.emergencyEvent).to(equal(@YES)); - expect(testRequest.engineOilLife).to(equal(@NO)); + expect(testRequest.engineOilLife).to(beNil()); expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.fuelLevel).to(equal(@YES)); expect(testRequest.fuelLevel_State).to(equal(@YES)); - expect(testRequest.fuelRange).to(equal(@NO)); +#pragma clang diagnostic pop + expect(testRequest.fuelRange).to(beNil()); expect(testRequest.gps).to(equal(@YES)); + expect(testRequest.handsOffSteering).to(beNil()); expect(testRequest.headLampStatus).to(equal(@YES)); expect(testRequest.instantFuelConsumption).to(equal(@YES)); expect(testRequest.myKey).to(equal(@YES)); @@ -226,24 +242,22 @@ describe(@"initializers", ^{ expect(testRequest.speed).to(equal(@YES)); expect(testRequest.steeringWheelAngle).to(equal(@YES)); expect(testRequest.tirePressure).to(equal(@YES)); - expect(testRequest.turnSignal).to(equal(@NO)); + expect(testRequest.turnSignal).to(beNil()); expect(testRequest.wiperStatus).to(equal(@YES)); - expect(testRequest.handsOffSteering).to(equal(@NO)); }); }); - context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:wiperStatus:", ^{ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES electronicParkBrakeStatus:YES emergencyEvent:YES engineOilLife:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES fuelRange:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES turnSignal:YES vin:YES wiperStatus:YES]; #pragma clang diagnostic pop - it(@"should set all the parameters properly", ^{ + it(@"expect all properties to be set properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); expect(testRequest.bodyInformation).to(equal(@YES)); - expect(testRequest.cloudAppVehicleID).to(equal(@NO)); + expect(testRequest.cloudAppVehicleID).to(beNil()); expect(testRequest.clusterModeStatus).to(equal(@YES)); expect(testRequest.deviceStatus).to(equal(@YES)); expect(testRequest.driverBraking).to(equal(@YES)); @@ -253,10 +267,14 @@ describe(@"initializers", ^{ expect(testRequest.engineOilLife).to(equal(@YES)); expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@YES)); - expect(testRequest.fuelLevel).to(equal(@YES)); - expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.fuelLevel).to(equal(@YES)); + expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic push expect(testRequest.fuelRange).to(equal(@YES)); expect(testRequest.gps).to(equal(@YES)); + expect(testRequest.handsOffSteering).to(beNil()); expect(testRequest.headLampStatus).to(equal(@YES)); expect(testRequest.instantFuelConsumption).to(equal(@YES)); expect(testRequest.myKey).to(equal(@YES)); @@ -268,16 +286,16 @@ describe(@"initializers", ^{ expect(testRequest.tirePressure).to(equal(@YES)); expect(testRequest.turnSignal).to(equal(@YES)); expect(testRequest.wiperStatus).to(equal(@YES)); - expect(testRequest.handsOffSteering).to(equal(@NO)); }); }); + context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:wiperStatus:", ^{ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES cloudAppVehicleID:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES electronicParkBrakeStatus:YES emergencyEvent:YES engineOilLife:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES fuelRange:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES turnSignal:YES vin:YES wiperStatus:YES]; -#pragma clang diagnostic push +#pragma clang diagnostic pop - it(@"should set all the parameters properly", ^{ + it(@"expect all properties to be set properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); @@ -292,10 +310,14 @@ describe(@"initializers", ^{ expect(testRequest.engineOilLife).to(equal(@YES)); expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.fuelLevel).to(equal(@YES)); expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic pop expect(testRequest.fuelRange).to(equal(@YES)); expect(testRequest.gps).to(equal(@YES)); + expect(testRequest.handsOffSteering).to(beNil()); expect(testRequest.headLampStatus).to(equal(@YES)); expect(testRequest.instantFuelConsumption).to(equal(@YES)); expect(testRequest.myKey).to(equal(@YES)); @@ -307,13 +329,13 @@ describe(@"initializers", ^{ expect(testRequest.tirePressure).to(equal(@YES)); expect(testRequest.turnSignal).to(equal(@YES)); expect(testRequest.wiperStatus).to(equal(@YES)); - expect(testRequest.handsOffSteering).to(equal(@NO)); }); }); - context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:handsOffSteering:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:vin:wiperStatus:", ^{ - SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] initWithGps:@YES speed:@YES rpm:@YES fuelLevel:@YES fuelLevel_State:@YES instantFuelConsumption:@YES fuelRange:@YES externalTemperature:@YES turnSignal:@YES vin:@YES prndl:@YES tirePressure:@YES odometer:@YES beltStatus:@YES bodyInformation:@YES deviceStatus:@YES driverBraking:@YES wiperStatus:@YES headLampStatus:@YES engineTorque:@YES accPedalPosition:@YES steeringWheelAngle:@YES engineOilLife:@YES electronicParkBrakeStatus:@YES cloudAppVehicleID:@YES eCallInfo:@YES airbagStatus:@YES emergencyEvent:@YES clusterModeStatus:@YES myKey:@YES handsOffSteering:@YES]; - it(@"should set all the parameters to YES", ^{ + context(@"initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:vin:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering:", ^{ + SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] initWithGps:@YES speed:@YES rpm:@YES instantFuelConsumption:@YES fuelRange:@YES externalTemperature:@YES turnSignal:@YES vin:@YES prndl:@YES tirePressure:@YES odometer:@YES beltStatus:@YES bodyInformation:@YES deviceStatus:@YES driverBraking:@YES wiperStatus:@YES headLampStatus:@YES engineTorque:@YES accPedalPosition:@YES steeringWheelAngle:@YES engineOilLife:@YES electronicParkBrakeStatus:@YES cloudAppVehicleID:@YES eCallInfo:@YES airbagStatus:@YES emergencyEvent:@YES clusterModeStatus:@YES myKey:@YES handsOffSteering:@YES]; + + it(@"expect all properties to be set to YES", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); @@ -328,10 +350,14 @@ describe(@"initializers", ^{ expect(testRequest.engineOilLife).to(equal(@YES)); expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@YES)); - expect(testRequest.fuelLevel).to(equal(@YES)); - expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.fuelLevel).to(beNil()); + expect(testRequest.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop expect(testRequest.fuelRange).to(equal(@YES)); expect(testRequest.gps).to(equal(@YES)); + expect(testRequest.handsOffSteering).to(equal(@YES)); expect(testRequest.headLampStatus).to(equal(@YES)); expect(testRequest.instantFuelConsumption).to(equal(@YES)); expect(testRequest.myKey).to(equal(@YES)); @@ -343,17 +369,15 @@ describe(@"initializers", ^{ expect(testRequest.tirePressure).to(equal(@YES)); expect(testRequest.turnSignal).to(equal(@YES)); expect(testRequest.wiperStatus).to(equal(@YES)); - expect(testRequest.handsOffSteering).to(equal(@YES)); }); }); - context(@"Should set and get OEM Custom Vehicle Data", ^{ - SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] init]; - + context(@"should set and get OEM Custom Vehicle Data", ^{ + SDLGetVehicleData* testRequest = [[SDLGetVehicleData alloc] init]; [testRequest setOEMCustomVehicleData:@"OEMCustomVehicleData" withVehicleDataState:NO]; [testRequest setOEMCustomVehicleData:@"OEMCustomVehicleData1" withVehicleDataState:YES]; - it(@"Should set and get OEM Custom Vehicle Data", ^{ + it(@"expect all properties to be set properly", ^{ expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData"]).to(equal(@NO)); expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData1"]).to(equal(@YES)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m index 14dd3b3db..a2f2038a0 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -14,8 +14,8 @@ QuickSpecBegin(SDLSubscribeVehicleDataSpec) -describe(@"getter/setter tests", ^ { - it(@"should set and get correctly", ^ { +describe(@"getter/setter tests", ^{ + it(@"should set and get correctly", ^{ SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] init]; testRequest.accPedalPosition = @YES; @@ -32,10 +32,14 @@ describe(@"getter/setter tests", ^ { testRequest.engineOilLife = @YES; testRequest.engineTorque = @NO; testRequest.externalTemperature = @YES; - testRequest.fuelLevel = @NO; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + testRequest.fuelLevel = @YES; testRequest.fuelLevel_State = @YES; +#pragma clang diagnostic pop testRequest.fuelRange = @YES; testRequest.gps = @YES; + testRequest.handsOffSteering = @YES; testRequest.headLampStatus = @YES; testRequest.instantFuelConsumption = @NO; testRequest.myKey = @YES; @@ -47,7 +51,6 @@ describe(@"getter/setter tests", ^ { testRequest.tirePressure = @NO; testRequest.turnSignal = @YES; testRequest.wiperStatus = @NO; - testRequest.handsOffSteering = @YES; expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@NO)); @@ -63,10 +66,14 @@ describe(@"getter/setter tests", ^ { expect(testRequest.engineOilLife).to(equal(@YES)); expect(testRequest.engineTorque).to(equal(@NO)); expect(testRequest.externalTemperature).to(equal(@YES)); - expect(testRequest.fuelLevel).to(equal(@NO)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.fuelLevel).to(equal(@YES)); expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic pop expect(testRequest.fuelRange).to(equal(@YES)); expect(testRequest.gps).to(equal(@YES)); + expect(testRequest.handsOffSteering).to(equal(@YES)); expect(testRequest.headLampStatus).to(equal(@YES)); expect(testRequest.instantFuelConsumption).to(equal(@NO)); expect(testRequest.myKey).to(equal(@YES)); @@ -78,7 +85,6 @@ describe(@"getter/setter tests", ^ { expect(testRequest.tirePressure).to(equal(@NO)); expect(testRequest.turnSignal).to(equal(@YES)); expect(testRequest.wiperStatus).to(equal(@NO)); - expect(testRequest.handsOffSteering).to(equal(@YES)); }); it(@"should get correctly when initialized with a dictionary", ^ { @@ -120,7 +126,7 @@ describe(@"getter/setter tests", ^ { #pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithDictionary:dict]; #pragma clang diagnostic pop - + expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); @@ -135,8 +141,11 @@ describe(@"getter/setter tests", ^ { expect(testRequest.engineOilLife).to(equal(@YES)); expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@NO)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.fuelLevel).to(equal(@YES)); expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic pop expect(testRequest.fuelRange).to(equal(@YES)); expect(testRequest.gps).to(equal(@YES)); expect(testRequest.handsOffSteering).to(equal(@YES)); @@ -158,7 +167,7 @@ describe(@"initializers", ^{ context(@"init", ^{ SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] init]; - it(@"should set all the parameters to nil", ^{ + it(@"expect all properties to be set properly", ^{ expect(testRequest.accPedalPosition).to(beNil()); expect(testRequest.airbagStatus).to(beNil()); expect(testRequest.beltStatus).to(beNil()); @@ -173,8 +182,11 @@ describe(@"initializers", ^{ expect(testRequest.engineOilLife).to(beNil()); expect(testRequest.engineTorque).to(beNil()); expect(testRequest.externalTemperature).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.fuelLevel).to(beNil()); expect(testRequest.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop expect(testRequest.fuelRange).to(beNil()); expect(testRequest.gps).to(beNil()); expect(testRequest.handsOffSteering).to(beNil()); @@ -198,12 +210,12 @@ describe(@"initializers", ^{ SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES electronicParkBrakeStatus:YES emergencyEvent:YES engineOilLife:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES fuelRange:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES turnSignal:YES wiperStatus:YES]; #pragma clang diagnostic pop - it(@"should set all the parameters properly", ^{ + it(@"expect all properties to be set properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); expect(testRequest.bodyInformation).to(equal(@YES)); - expect(testRequest.cloudAppVehicleID).to(equal(@NO)); + expect(testRequest.cloudAppVehicleID).to(beNil()); expect(testRequest.clusterModeStatus).to(equal(@YES)); expect(testRequest.deviceStatus).to(equal(@YES)); expect(testRequest.driverBraking).to(equal(@YES)); @@ -213,11 +225,14 @@ describe(@"initializers", ^{ expect(testRequest.engineOilLife).to(equal(@YES)); expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.fuelLevel).to(equal(@YES)); expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic pop expect(testRequest.fuelRange).to(equal(@YES)); expect(testRequest.gps).to(equal(@YES)); - expect(testRequest.handsOffSteering).to(equal(@NO)); + expect(testRequest.handsOffSteering).to(beNil()); expect(testRequest.headLampStatus).to(equal(@YES)); expect(testRequest.instantFuelConsumption).to(equal(@YES)); expect(testRequest.myKey).to(equal(@YES)); @@ -229,15 +244,16 @@ describe(@"initializers", ^{ expect(testRequest.tirePressure).to(equal(@YES)); expect(testRequest.turnSignal).to(equal(@YES)); expect(testRequest.wiperStatus).to(equal(@YES)); + }); }); context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:emergencyEvent:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:wiperStatus:", ^{ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES emergencyEvent:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:NO gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES wiperStatus:YES]; + SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES emergencyEvent:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES wiperStatus:YES]; #pragma clang diagnostic pop - it(@"should set all the parameters properly", ^{ + it(@"expect all properties to be set properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); @@ -252,11 +268,14 @@ describe(@"initializers", ^{ expect(testRequest.engineOilLife).to(equal(@NO)); expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.fuelLevel).to(equal(@YES)); - expect(testRequest.fuelLevel_State).to(equal(@NO)); + expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic pop expect(testRequest.fuelRange).to(equal(@NO)); expect(testRequest.gps).to(equal(@YES)); - expect(testRequest.handsOffSteering).to(equal(@NO)); + expect(testRequest.handsOffSteering).to(beNil()); expect(testRequest.headLampStatus).to(equal(@YES)); expect(testRequest.instantFuelConsumption).to(equal(@YES)); expect(testRequest.myKey).to(equal(@YES)); @@ -271,8 +290,8 @@ describe(@"initializers", ^{ }); }); - context(@"initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering:", ^{ - SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithGps:@YES speed:@YES rpm:@YES fuelLevel:@YES fuelLevel_State:@YES instantFuelConsumption:@YES fuelRange:@YES externalTemperature:@YES turnSignal:@YES prndl:@YES tirePressure:@YES odometer:@YES beltStatus:@YES bodyInformation:@YES deviceStatus:@YES driverBraking:@YES wiperStatus:@YES headLampStatus:@YES engineTorque:@YES accPedalPosition:@YES steeringWheelAngle:@YES engineOilLife:@YES electronicParkBrakeStatus:@YES cloudAppVehicleID:@YES eCallInfo:@YES airbagStatus:@YES emergencyEvent:@YES clusterModeStatus:@YES myKey:@YES handsOffSteering:@YES]; + context(@"initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering:", ^{ + SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithGps:@YES speed:@YES rpm:@YES instantFuelConsumption:@YES fuelRange:@YES externalTemperature:@YES turnSignal:@YES prndl:@YES tirePressure:@YES odometer:@YES beltStatus:@YES bodyInformation:@YES deviceStatus:@YES driverBraking:@YES wiperStatus:@YES headLampStatus:@YES engineTorque:@YES accPedalPosition:@YES steeringWheelAngle:@YES engineOilLife:@YES electronicParkBrakeStatus:@YES cloudAppVehicleID:@YES eCallInfo:@YES airbagStatus:@YES emergencyEvent:@YES clusterModeStatus:@YES myKey:@YES handsOffSteering:@YES]; it(@"should set all the parameters properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); @@ -289,8 +308,11 @@ describe(@"initializers", ^{ expect(testRequest.engineOilLife).to(equal(@YES)); expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@YES)); - expect(testRequest.fuelLevel).to(equal(@YES)); - expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.fuelLevel).to(beNil()); + expect(testRequest.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop expect(testRequest.fuelRange).to(equal(@YES)); expect(testRequest.gps).to(equal(@YES)); expect(testRequest.handsOffSteering).to(equal(@YES)); @@ -313,7 +335,7 @@ describe(@"initializers", ^{ [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:NO]; [testRequest setOEMCustomVehicleData:@"customVehicleData1" withVehicleDataState:YES]; - it(@"should set the custom data properly", ^{ + it(@"expect OEM Custom Vehicle Data to be set properly", ^{ expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@NO)); expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(equal(@YES)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m index d2b7da878..4d4efc93a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -14,8 +14,8 @@ QuickSpecBegin(SDLUnsubscribeVehicleDataSpec) -describe(@"Getter/Setter Tests", ^ { - it(@"should set and get correctly", ^ { +describe(@"getter/setter tests", ^{ + it(@"should set and get correctly", ^{ SDLUnsubscribeVehicleData* testRequest = [[SDLUnsubscribeVehicleData alloc] init]; testRequest.accPedalPosition = @YES; @@ -32,8 +32,11 @@ describe(@"Getter/Setter Tests", ^ { testRequest.engineOilLife = @YES; testRequest.engineTorque = @YES; testRequest.externalTemperature = @YES; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" testRequest.fuelLevel = @YES; testRequest.fuelLevel_State = @YES; +#pragma clang diagnostic pop testRequest.fuelRange = @YES; testRequest.gps = @YES; testRequest.handsOffSteering = @YES; @@ -63,8 +66,11 @@ describe(@"Getter/Setter Tests", ^ { expect(testRequest.engineOilLife).to(equal(@YES)); expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.fuelLevel).to(equal(@YES)); expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic pop expect(testRequest.fuelRange).to(equal(@YES)); expect(testRequest.gps).to(equal(@YES)); expect(testRequest.handsOffSteering).to(equal(@YES)); @@ -135,8 +141,11 @@ describe(@"Getter/Setter Tests", ^ { expect(testRequest.engineOilLife).to(equal(@YES)); expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.fuelLevel).to(equal(@YES)); expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic pop expect(testRequest.fuelRange).to(equal(@YES)); expect(testRequest.gps).to(equal(@YES)); expect(testRequest.handsOffSteering).to(equal(@YES)); @@ -158,7 +167,7 @@ describe(@"initializers", ^{ context(@"init", ^{ SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] init]; - it(@"should set all the parameters to nil", ^{ + it(@"expect all properties to be set properly", ^{ expect(testRequest.accPedalPosition).to(beNil()); expect(testRequest.airbagStatus).to(beNil()); expect(testRequest.beltStatus).to(beNil()); @@ -173,8 +182,11 @@ describe(@"initializers", ^{ expect(testRequest.engineOilLife).to(beNil()); expect(testRequest.engineTorque).to(beNil()); expect(testRequest.externalTemperature).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.fuelLevel).to(beNil()); expect(testRequest.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop expect(testRequest.fuelRange).to(beNil()); expect(testRequest.gps).to(beNil()); expect(testRequest.handsOffSteering).to(beNil()); @@ -191,15 +203,19 @@ describe(@"initializers", ^{ expect(testRequest.wiperStatus).to(beNil()); }); }); - context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:", ^{ - SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] initWithGps:@YES speed:@YES rpm:@YES fuelLevel:@YES fuelLevel_State:@YES instantFuelConsumption:@YES fuelRange:@YES externalTemperature:@YES turnSignal:@YES prndl:@YES tirePressure:@YES odometer:@YES beltStatus:@YES bodyInformation:@YES deviceStatus:@YES driverBraking:@YES wiperStatus:@YES headLampStatus:@YES engineTorque:@YES accPedalPosition:@YES steeringWheelAngle:@YES engineOilLife:@YES electronicParkBrakeStatus:@YES cloudAppVehicleID:@YES eCallInfo:@YES airbagStatus:@YES emergencyEvent:@YES clusterModeStatus:@YES myKey:@YES handsOffSteering:@YES]; - it(@"should set all the parameters to YES", ^{ + context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES electronicParkBrakeStatus:YES emergencyEvent:YES engineOilLife:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES fuelRange:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES turnSignal:YES wiperStatus:YES]; +#pragma clang diagnostic pop + + it(@"expect all properties to be set properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); expect(testRequest.bodyInformation).to(equal(@YES)); - expect(testRequest.cloudAppVehicleID).to(equal(@YES)); + expect(testRequest.cloudAppVehicleID).to(beNil()); expect(testRequest.clusterModeStatus).to(equal(@YES)); expect(testRequest.deviceStatus).to(equal(@YES)); expect(testRequest.driverBraking).to(equal(@YES)); @@ -209,11 +225,14 @@ describe(@"initializers", ^{ expect(testRequest.engineOilLife).to(equal(@YES)); expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.fuelLevel).to(equal(@YES)); expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic push expect(testRequest.fuelRange).to(equal(@YES)); expect(testRequest.gps).to(equal(@YES)); - expect(testRequest.handsOffSteering).to(equal(@YES)); + expect(testRequest.handsOffSteering).to(beNil()); expect(testRequest.headLampStatus).to(equal(@YES)); expect(testRequest.instantFuelConsumption).to(equal(@YES)); expect(testRequest.myKey).to(equal(@YES)); @@ -227,10 +246,11 @@ describe(@"initializers", ^{ expect(testRequest.wiperStatus).to(equal(@YES)); }); }); - context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:", ^{ + + context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:", ^{ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES electronicParkBrakeStatus:YES emergencyEvent:YES engineOilLife:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES fuelRange:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES turnSignal:YES wiperStatus:YES]; + SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES cloudAppVehicleID:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES electronicParkBrakeStatus:YES emergencyEvent:YES engineOilLife:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES fuelRange:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES turnSignal:YES wiperStatus:YES]; #pragma clang diagnostic pop it(@"expect all properties to be set properly", ^{ @@ -238,7 +258,7 @@ describe(@"initializers", ^{ expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); expect(testRequest.bodyInformation).to(equal(@YES)); - expect(testRequest.cloudAppVehicleID).to(equal(@NO)); + expect(testRequest.cloudAppVehicleID).to(equal(@YES)); expect(testRequest.clusterModeStatus).to(equal(@YES)); expect(testRequest.deviceStatus).to(equal(@YES)); expect(testRequest.driverBraking).to(equal(@YES)); @@ -248,10 +268,14 @@ describe(@"initializers", ^{ expect(testRequest.engineOilLife).to(equal(@YES)); expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@YES)); - expect(testRequest.fuelLevel).to(equal(@YES)); - expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.fuelLevel).to(equal(@YES)); + expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic push expect(testRequest.fuelRange).to(equal(@YES)); expect(testRequest.gps).to(equal(@YES)); + expect(testRequest.handsOffSteering).to(beNil()); expect(testRequest.headLampStatus).to(equal(@YES)); expect(testRequest.instantFuelConsumption).to(equal(@YES)); expect(testRequest.myKey).to(equal(@YES)); @@ -263,11 +287,10 @@ describe(@"initializers", ^{ expect(testRequest.tirePressure).to(equal(@YES)); expect(testRequest.turnSignal).to(equal(@YES)); expect(testRequest.wiperStatus).to(equal(@YES)); - expect(testRequest.handsOffSteering).to(equal(@NO)); }); }); - context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:emergencyEvent:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:wiperStatus:", ^{ + context (@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:emergencyEvent:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:wiperStatus:", ^{ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES emergencyEvent:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES gps:YES headLampStatus:NO instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES wiperStatus:YES]; @@ -278,20 +301,24 @@ describe(@"initializers", ^{ expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); expect(testRequest.bodyInformation).to(equal(@YES)); + expect(testRequest.cloudAppVehicleID).to(beNil()); expect(testRequest.clusterModeStatus).to(equal(@YES)); expect(testRequest.deviceStatus).to(equal(@YES)); expect(testRequest.driverBraking).to(equal(@YES)); expect(testRequest.eCallInfo).to(equal(@YES)); - expect(testRequest.electronicParkBrakeStatus).to(equal(@NO)); + expect(testRequest.electronicParkBrakeStatus).to(beNil()); expect(testRequest.emergencyEvent).to(equal(@YES)); - expect(testRequest.engineOilLife).to(equal(@NO)); + expect(testRequest.engineOilLife).to(beNil()); expect(testRequest.engineTorque).to(equal(@YES)); expect(testRequest.externalTemperature).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.fuelLevel).to(equal(@YES)); expect(testRequest.fuelLevel_State).to(equal(@YES)); - expect(testRequest.fuelRange).to(equal(@NO)); +#pragma clang diagnostic push + expect(testRequest.fuelRange).to(beNil()); expect(testRequest.gps).to(equal(@YES)); - expect(testRequest.handsOffSteering).to(equal(@NO)); + expect(testRequest.handsOffSteering).to(beNil()); expect(testRequest.headLampStatus).to(equal(@NO)); expect(testRequest.instantFuelConsumption).to(equal(@YES)); expect(testRequest.myKey).to(equal(@YES)); @@ -301,19 +328,62 @@ describe(@"initializers", ^{ expect(testRequest.speed).to(equal(@YES)); expect(testRequest.steeringWheelAngle).to(equal(@YES)); expect(testRequest.tirePressure).to(equal(@YES)); - expect(testRequest.turnSignal).to(equal(@NO)); + expect(testRequest.turnSignal).to(beNil()); expect(testRequest.wiperStatus).to(equal(@YES)); }); }); + context (@"initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering:", ^{ + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] initWithGps:@YES speed:@YES rpm:@YES instantFuelConsumption:@YES fuelRange:@YES externalTemperature:@YES turnSignal:@YES prndl:@YES tirePressure:@YES odometer:@YES beltStatus:@YES bodyInformation:@YES deviceStatus:@YES driverBraking:@YES wiperStatus:@YES headLampStatus:@YES engineTorque:@YES accPedalPosition:@YES steeringWheelAngle:@YES engineOilLife:@YES electronicParkBrakeStatus:@YES cloudAppVehicleID:@YES eCallInfo:@YES airbagStatus:@YES emergencyEvent:@YES clusterModeStatus:@YES myKey:@YES handsOffSteering:@YES]; + #pragma clang diagnostic pop + + it(@"expect all properties to be set properly", ^{ + expect(testRequest.accPedalPosition).to(equal(@YES)); + expect(testRequest.airbagStatus).to(equal(@YES)); + expect(testRequest.beltStatus).to(equal(@YES)); + expect(testRequest.bodyInformation).to(equal(@YES)); + expect(testRequest.cloudAppVehicleID).to(equal(@YES)); + expect(testRequest.clusterModeStatus).to(equal(@YES)); + expect(testRequest.deviceStatus).to(equal(@YES)); + expect(testRequest.driverBraking).to(equal(@YES)); + expect(testRequest.eCallInfo).to(equal(@YES)); + expect(testRequest.electronicParkBrakeStatus).to(equal(@YES)); + expect(testRequest.emergencyEvent).to(equal(@YES)); + expect(testRequest.engineOilLife).to(equal(@YES)); + expect(testRequest.engineTorque).to(equal(@YES)); + expect(testRequest.externalTemperature).to(equal(@YES)); + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.fuelLevel).to(beNil()); + expect(testRequest.fuelLevel_State).to(beNil()); + #pragma clang diagnostic push + expect(testRequest.fuelRange).to(equal(@YES)); + expect(testRequest.gps).to(equal(@YES)); + expect(testRequest.handsOffSteering).to(equal(@YES)); + expect(testRequest.headLampStatus).to(equal(@YES)); + expect(testRequest.instantFuelConsumption).to(equal(@YES)); + expect(testRequest.myKey).to(equal(@YES)); + expect(testRequest.odometer).to(equal(@YES)); + expect(testRequest.prndl).to(equal(@YES)); + expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.speed).to(equal(@YES)); + expect(testRequest.steeringWheelAngle).to(equal(@YES)); + expect(testRequest.tirePressure).to(equal(@YES)); + expect(testRequest.turnSignal).to(equal(@YES)); + expect(testRequest.wiperStatus).to(equal(@YES)); + }); + }); + context(@"should set and get OEM Custom Vehicle Data", ^{ SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] init]; [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:NO]; [testRequest setOEMCustomVehicleData:@"customVehicleData1" withVehicleDataState:YES]; - it(@"should set all the custom data properly", ^{ - expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@NO)); - expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(equal(@YES)); + it(@"expect OEM Custom Vehicle Data to be set properly", ^{ + expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(beFalse()); + expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(beTrue()); }); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index 75541a125..539a061e5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -14,144 +14,152 @@ QuickSpecBegin(SDLGetVehicleDataResponseSpec) +SDLGPSData* gps = [[SDLGPSData alloc] init]; +SDLTireStatus* tires = [[SDLTireStatus alloc] init]; +SDLBeltStatus* belt = [[SDLBeltStatus alloc] init]; +SDLBodyInformation* body = [[SDLBodyInformation alloc] init]; +SDLDeviceStatus* device = [[SDLDeviceStatus alloc] init]; +SDLHeadLampStatus* headLamp = [[SDLHeadLampStatus alloc] init]; +SDLECallInfo* eCall = [[SDLECallInfo alloc] init]; +SDLAirbagStatus* airbag = [[SDLAirbagStatus alloc] init]; +SDLEmergencyEvent* event = [[SDLEmergencyEvent alloc] init]; +SDLClusterModeStatus* clusterMode = [[SDLClusterModeStatus alloc] init]; +SDLMyKey* myKey = [[SDLMyKey alloc] init]; +SDLFuelRange* fuelRange = [[SDLFuelRange alloc] init]; +NSArray *fuelRangeArray = @[fuelRange, fuelRange]; +NSString *const vin = @"6574839201a"; +NSString *const cloudAppVehicleID = @"cloudAppVehicleID"; +const float speed = 123.45; +const NSUInteger rpm = 42; +const float fuelLevel = 10.3; +SDLComponentVolumeStatus fuelLevel_State = SDLComponentVolumeStatusAlert; +const float instantFuelConsumption = 4000.63; +const float externalTemperature = -10.5; +SDLTurnSignal turnSignal = SDLTurnSignalOff; +SDLPRNDL prndl = SDLPRNDLDrive; +NSUInteger odometer = 100500; +SDLVehicleDataEventStatus driverBraking = SDLVehicleDataEventStatusYes; +SDLWiperStatus wiperStatus = SDLWiperStatusStalled; +const float engineTorque = -200.124; +const float accPedalPosition = 99.99999999; +const float steeringWheelAngle = M_PI_4; +const float engineOilLife = 34.45; +SDLElectronicParkBrakeStatus electronicParkBrakeStatus = SDLElectronicParkBrakeStatusDriveActive; +const BOOL handsOffSteering = YES; -describe(@"getter/setter tests", ^ { - SDLGPSData* gps = [[SDLGPSData alloc] init]; - SDLTireStatus* tires = [[SDLTireStatus alloc] init]; - SDLBeltStatus* belt = [[SDLBeltStatus alloc] init]; - SDLBodyInformation* body = [[SDLBodyInformation alloc] init]; - SDLDeviceStatus* device = [[SDLDeviceStatus alloc] init]; - SDLHeadLampStatus* headLamp = [[SDLHeadLampStatus alloc] init]; - SDLECallInfo* eCall = [[SDLECallInfo alloc] init]; - SDLAirbagStatus* airbag = [[SDLAirbagStatus alloc] init]; - SDLEmergencyEvent* event = [[SDLEmergencyEvent alloc] init]; - SDLClusterModeStatus* clusterMode = [[SDLClusterModeStatus alloc] init]; - SDLMyKey* myKey = [[SDLMyKey alloc] init]; - SDLFuelRange* fuelRange = [[SDLFuelRange alloc] init]; - NSString *const vin = @"6574839201a"; - NSString *const cloudAppVehicleID = @"cloudAppVehicleID"; - const float speed = 123.45; - const NSUInteger rpm = 42; - const float fuelLevel = 10.3; - SDLComponentVolumeStatus fuelLevel_State = SDLComponentVolumeStatusAlert; - const float instantFuelConsumption = 4000.63; - NSArray *fuelRangeArray = @[fuelRange, fuelRange]; - const float externalTemperature = -10.5; - SDLTurnSignal turnSignal = SDLTurnSignalOff; - SDLPRNDL prndl = SDLPRNDLDrive; - NSUInteger odometer = 100500; - SDLVehicleDataEventStatus driverBraking = SDLVehicleDataEventStatusYes; - SDLWiperStatus wiperStatus = SDLWiperStatusStalled; - const float engineTorque = -200.124; - const float accPedalPosition = 99.99999999; - const float steeringWheelAngle = M_PI_4; - const float engineOilLife = 34.45; - SDLElectronicParkBrakeStatus electronicParkBrakeStatus = SDLElectronicParkBrakeStatusDriveActive; - const BOOL handsOffSteering = YES; - - it(@"should set and get correctly", ^ { +describe(@"getter/setter tests", ^{ + context(@"init", ^{ SDLGetVehicleDataResponse* testResponse = [[SDLGetVehicleDataResponse alloc] init]; + it(@"should set and get correctly", ^{ - testResponse.accPedalPosition = @0; - testResponse.airbagStatus = airbag; - testResponse.beltStatus = belt; - testResponse.bodyInformation = body; - testResponse.cloudAppVehicleID = cloudAppVehicleID; - testResponse.clusterModeStatus = clusterMode; - testResponse.deviceStatus = device; - testResponse.driverBraking = SDLVehicleDataEventStatusNoEvent; - testResponse.eCallInfo = eCall; - testResponse.electronicParkBrakeStatus = SDLElectronicParkBrakeStatusDriveActive; - testResponse.emergencyEvent = event; - testResponse.engineOilLife = @56.3; - testResponse.engineTorque = @630.4; - testResponse.externalTemperature = @0; - testResponse.fuelLevel = @99.9999; - testResponse.fuelLevel_State = SDLComponentVolumeStatusFault; - testResponse.fuelRange = @[fuelRange, fuelRange]; - testResponse.gps = gps; - testResponse.handsOffSteering = @YES; - testResponse.headLampStatus = headLamp; - testResponse.instantFuelConsumption = @40.7; - testResponse.myKey = myKey; - testResponse.odometer = @70000; - testResponse.prndl = SDLPRNDLPark; - testResponse.rpm = @3; - testResponse.speed = @100; - testResponse.steeringWheelAngle = @-1500; - testResponse.tirePressure = tires; - testResponse.turnSignal = SDLTurnSignalBoth; - testResponse.vin = vin; - testResponse.wiperStatus = SDLWiperStatusAutomaticHigh; + testResponse.accPedalPosition = @(accPedalPosition); + testResponse.airbagStatus = airbag; + testResponse.beltStatus = belt; + testResponse.bodyInformation = body; + testResponse.cloudAppVehicleID = cloudAppVehicleID; + testResponse.clusterModeStatus = clusterMode; + testResponse.deviceStatus = device; + testResponse.driverBraking = driverBraking; + testResponse.eCallInfo = eCall; + testResponse.electronicParkBrakeStatus = electronicParkBrakeStatus; + testResponse.emergencyEvent = event; + testResponse.engineOilLife = @(engineOilLife); + testResponse.engineTorque = @(engineTorque); + testResponse.externalTemperature = @(externalTemperature); + testResponse.gps = gps; + testResponse.handsOffSteering = @(handsOffSteering); + testResponse.headLampStatus = headLamp; + testResponse.instantFuelConsumption = @(instantFuelConsumption); + testResponse.myKey = myKey; + testResponse.odometer = @(odometer); + testResponse.prndl = prndl; + testResponse.rpm = @(rpm); + testResponse.speed = @(speed); + testResponse.steeringWheelAngle = @(steeringWheelAngle); + testResponse.tirePressure = tires; + testResponse.turnSignal = turnSignal; + testResponse.vin = vin; + testResponse.wiperStatus = wiperStatus; + testResponse.fuelRange = fuelRangeArray; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + testResponse.fuelLevel = @(fuelLevel); + testResponse.fuelLevel_State = fuelLevel_State; +#pragma clang diagnostic pop - expect(testResponse.accPedalPosition).to(equal(@0)); - expect(testResponse.airbagStatus).to(equal(airbag)); - expect(testResponse.beltStatus).to(equal(belt)); - expect(testResponse.bodyInformation).to(equal(body)); - expect(testResponse.cloudAppVehicleID).to(equal(cloudAppVehicleID)); - expect(testResponse.clusterModeStatus).to(equal(clusterMode)); - expect(testResponse.deviceStatus).to(equal(device)); - expect(testResponse.driverBraking).to(equal(SDLVehicleDataEventStatusNoEvent)); - expect(testResponse.eCallInfo).to(equal(eCall)); - expect(testResponse.electronicParkBrakeStatus).to(equal(SDLElectronicParkBrakeStatusDriveActive)); - expect(testResponse.emergencyEvent).to(equal(event)); - expect(testResponse.engineOilLife).to(equal(@56.3)); - expect(testResponse.engineTorque).to(equal(@630.4)); - expect(testResponse.externalTemperature).to(equal(@0)); - expect(testResponse.fuelLevel).to(equal(@99.9999)); - expect(testResponse.fuelLevel_State).to(equal(SDLComponentVolumeStatusFault)); - expect(testResponse.fuelRange).to(equal(@[fuelRange, fuelRange])); - expect(testResponse.gps).to(equal(gps)); - expect(testResponse.handsOffSteering).to(equal(@YES)); - expect(testResponse.headLampStatus).to(equal(headLamp)); - expect(testResponse.instantFuelConsumption).to(equal(@40.7)); - expect(testResponse.myKey).to(equal(myKey)); - expect(testResponse.odometer).to(equal(@70000)); - expect(testResponse.prndl).to(equal(SDLPRNDLPark)); - expect(testResponse.rpm).to(equal(@3)); - expect(testResponse.speed).to(equal(@100)); - expect(testResponse.steeringWheelAngle).to(equal(@-1500)); - expect(testResponse.tirePressure).to(equal(tires)); - expect(testResponse.turnSignal).to(equal(SDLTurnSignalBoth)); - expect(testResponse.vin).to(equal(vin)); - expect(testResponse.wiperStatus).to(equal(SDLWiperStatusAutomaticHigh)); + expect(testResponse.accPedalPosition).to(equal(@(accPedalPosition))); + expect(testResponse.airbagStatus).to(equal(airbag)); + expect(testResponse.beltStatus).to(equal(belt)); + expect(testResponse.bodyInformation).to(equal(body)); + expect(testResponse.cloudAppVehicleID).to(equal(cloudAppVehicleID)); + expect(testResponse.clusterModeStatus).to(equal(clusterMode)); + expect(testResponse.deviceStatus).to(equal(device)); + expect(testResponse.driverBraking).to(equal(driverBraking)); + expect(testResponse.eCallInfo).to(equal(eCall)); + expect(testResponse.electronicParkBrakeStatus).to(equal(SDLElectronicParkBrakeStatusDriveActive)); + expect(testResponse.emergencyEvent).to(equal(event)); + expect(testResponse.engineOilLife).to(equal(@(engineOilLife))); + expect(testResponse.engineTorque).to(equal(@(engineTorque))); + expect(testResponse.externalTemperature).to(equal(@(externalTemperature))); + expect(testResponse.gps).to(equal(gps)); + expect(testResponse.handsOffSteering).to(equal(@(handsOffSteering))); + expect(testResponse.headLampStatus).to(equal(headLamp)); + expect(testResponse.instantFuelConsumption).to(equal(@(instantFuelConsumption))); + expect(testResponse.myKey).to(equal(myKey)); + expect(testResponse.odometer).to(equal(@(odometer))); + expect(testResponse.prndl).to(equal(prndl)); + expect(testResponse.rpm).to(equal(@(rpm))); + expect(testResponse.speed).to(equal(@(speed))); + expect(testResponse.steeringWheelAngle).to(equal(@(steeringWheelAngle))); + expect(testResponse.tirePressure).to(equal(tires)); + expect(testResponse.turnSignal).to(equal(turnSignal)); + expect(testResponse.vin).to(equal(vin)); + expect(testResponse.wiperStatus).to(equal(wiperStatus)); + expect(testResponse.fuelRange).to(equal(fuelRangeArray)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testResponse.fuelLevel).to(equal(@(fuelLevel))); + expect(testResponse.fuelLevel_State).to(equal(fuelLevel_State)); +#pragma clang diagnostic pop + }); }); + it(@"should get correctly when initialized", ^ { NSDictionary* dict = @{SDLRPCParameterNameNotification: @{SDLRPCParameterNameParameters: @{ - SDLRPCParameterNameAccelerationPedalPosition:@0, + SDLRPCParameterNameAccelerationPedalPosition:@(accPedalPosition), SDLRPCParameterNameAirbagStatus:airbag, SDLRPCParameterNameBeltStatus:belt, SDLRPCParameterNameBodyInformation:body, SDLRPCParameterNameCloudAppVehicleID:cloudAppVehicleID, SDLRPCParameterNameClusterModeStatus:clusterMode, SDLRPCParameterNameDeviceStatus:device, - SDLRPCParameterNameDriverBraking:SDLVehicleDataEventStatusNoEvent, + SDLRPCParameterNameDriverBraking:driverBraking, SDLRPCParameterNameECallInfo:eCall, - SDLRPCParameterNameElectronicParkBrakeStatus:SDLElectronicParkBrakeStatusDriveActive, + SDLRPCParameterNameElectronicParkBrakeStatus:electronicParkBrakeStatus, SDLRPCParameterNameEmergencyEvent:event, - SDLRPCParameterNameEngineOilLife:@23.22, - SDLRPCParameterNameEngineTorque:@630.4, - SDLRPCParameterNameExternalTemperature:@0, - SDLRPCParameterNameFuelLevel:@99.9999, - SDLRPCParameterNameFuelLevelState:SDLComponentVolumeStatusFault, - SDLRPCParameterNameFuelRange:@[fuelRange], + SDLRPCParameterNameEngineOilLife:@(engineOilLife), + SDLRPCParameterNameEngineTorque:@(engineTorque), + SDLRPCParameterNameExternalTemperature:@(externalTemperature), + SDLRPCParameterNameFuelLevel:@(fuelLevel), + SDLRPCParameterNameFuelLevelState:fuelLevel_State, + SDLRPCParameterNameFuelRange:fuelRangeArray, SDLRPCParameterNameGPS:gps, + SDLRPCParameterNameHandsOffSteering:@(handsOffSteering), SDLRPCParameterNameHeadLampStatus:headLamp, - SDLRPCParameterNameInstantFuelConsumption:@40.7, + SDLRPCParameterNameInstantFuelConsumption:@(instantFuelConsumption), SDLRPCParameterNameMyKey:myKey, - SDLRPCParameterNameOdometer:@70000, - SDLRPCParameterNamePRNDL:SDLPRNDLPark, - SDLRPCParameterNameRPM:@3, - SDLRPCParameterNameSpeed:@100, - SDLRPCParameterNameSteeringWheelAngle:@-1500, + SDLRPCParameterNameOdometer:@(odometer), + SDLRPCParameterNamePRNDL:prndl, + SDLRPCParameterNameRPM:@(rpm), + SDLRPCParameterNameSpeed:@(speed), + SDLRPCParameterNameSteeringWheelAngle:@(steeringWheelAngle), SDLRPCParameterNameTirePressure:tires, - SDLRPCParameterNameTurnSignal:SDLTurnSignalOff, + SDLRPCParameterNameTurnSignal:turnSignal, SDLRPCParameterNameVIN:vin, - SDLRPCParameterNameWiperStatus:SDLWiperStatusAutomaticHigh, - SDLRPCParameterNameHandsOffSteering:@YES + SDLRPCParameterNameWiperStatus:wiperStatus, }, SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetVehicleData}}; #pragma clang diagnostic push @@ -159,42 +167,45 @@ describe(@"getter/setter tests", ^ { SDLGetVehicleDataResponse* testResponse = [[SDLGetVehicleDataResponse alloc] initWithDictionary:dict]; #pragma clang diagnostic pop - expect(testResponse.accPedalPosition).to(equal(@0)); + expect(testResponse.accPedalPosition).to(equal(@(accPedalPosition))); expect(testResponse.airbagStatus).to(equal(airbag)); expect(testResponse.beltStatus).to(equal(belt)); expect(testResponse.bodyInformation).to(equal(body)); expect(testResponse.cloudAppVehicleID).to(equal(cloudAppVehicleID)); expect(testResponse.clusterModeStatus).to(equal(clusterMode)); expect(testResponse.deviceStatus).to(equal(device)); - expect(testResponse.driverBraking).to(equal(SDLVehicleDataEventStatusNoEvent)); + expect(testResponse.driverBraking).to(equal(driverBraking)); expect(testResponse.eCallInfo).to(equal(eCall)); - expect(testResponse.electronicParkBrakeStatus).to(equal(SDLElectronicParkBrakeStatusDriveActive)); + expect(testResponse.electronicParkBrakeStatus).to(equal(electronicParkBrakeStatus)); expect(testResponse.emergencyEvent).to(equal(event)); - expect(testResponse.engineOilLife).to(equal(@23.22)); - expect(testResponse.engineTorque).to(equal(@630.4)); - expect(testResponse.externalTemperature).to(equal(@0)); - expect(testResponse.fuelLevel).to(equal(@99.9999)); - expect(testResponse.fuelLevel_State).to(equal(SDLComponentVolumeStatusFault)); - expect(testResponse.fuelRange).to(equal(@[fuelRange])); + expect(testResponse.engineOilLife).to(equal(@(engineOilLife))); + expect(testResponse.engineTorque).to(equal(@(engineTorque))); + expect(testResponse.externalTemperature).to(equal(@(externalTemperature))); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testResponse.fuelLevel).to(equal(@(fuelLevel))); + expect(testResponse.fuelLevel_State).to(equal(fuelLevel_State)); +#pragma clang diagnostic pop + expect(testResponse.fuelRange).to(equal(fuelRangeArray)); expect(testResponse.gps).to(equal(gps)); - expect(testResponse.handsOffSteering).to(equal(@YES)); + expect(testResponse.handsOffSteering).to(equal(@(handsOffSteering))); expect(testResponse.headLampStatus).to(equal(headLamp)); - expect(testResponse.instantFuelConsumption).to(equal(@40.7)); + expect(testResponse.instantFuelConsumption).to(equal(@(instantFuelConsumption))); expect(testResponse.myKey).to(equal(myKey)); - expect(testResponse.odometer).to(equal(@70000)); - expect(testResponse.prndl).to(equal(SDLPRNDLPark)); - expect(testResponse.rpm).to(equal(@3)); - expect(testResponse.speed).to(equal(@100)); - expect(testResponse.steeringWheelAngle).to(equal(@-1500)); + expect(testResponse.odometer).to(equal(@(odometer))); + expect(testResponse.prndl).to(equal(prndl)); + expect(testResponse.rpm).to(equal(@(rpm))); + expect(testResponse.speed).to(equal(@(speed))); + expect(testResponse.steeringWheelAngle).to(equal(@(steeringWheelAngle))); expect(testResponse.tirePressure).to(equal(tires)); - expect(testResponse.turnSignal).to(equal(SDLTurnSignalOff)); + expect(testResponse.turnSignal).to(equal(turnSignal)); expect(testResponse.vin).to(equal(vin)); - expect(testResponse.wiperStatus).to(equal(SDLWiperStatusAutomaticHigh)); + expect(testResponse.wiperStatus).to(equal(wiperStatus)); }); it(@"should return nil if not set", ^ { SDLGetVehicleDataResponse* testResponse = [[SDLGetVehicleDataResponse alloc] init]; - + expect(testResponse.accPedalPosition).to(beNil()); expect(testResponse.airbagStatus).to(beNil()); expect(testResponse.beltStatus).to(beNil()); @@ -209,8 +220,11 @@ describe(@"getter/setter tests", ^ { expect(testResponse.engineOilLife).to(beNil()); expect(testResponse.engineTorque).to(beNil()); expect(testResponse.externalTemperature).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testResponse.fuelLevel).to(beNil()); expect(testResponse.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop expect(testResponse.fuelRange).to(beNil()); expect(testResponse.gps).to(beNil()); expect(testResponse.handsOffSteering).to(beNil()); @@ -228,10 +242,10 @@ describe(@"getter/setter tests", ^ { expect(testResponse.wiperStatus).to(beNil()); }); - context(@"initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:vin:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering:", ^{ - SDLGetVehicleDataResponse *testResponse = [[SDLGetVehicleDataResponse alloc] initWithGps:gps speed:speed rpm:@(rpm) fuelLevel:fuelLevel fuelLevel_State:fuelLevel_State instantFuelConsumption:instantFuelConsumption fuelRange:fuelRangeArray externalTemperature:externalTemperature turnSignal:turnSignal vin:vin prndl:prndl tirePressure:tires odometer:@(odometer) beltStatus:belt bodyInformation:body deviceStatus:device driverBraking:driverBraking wiperStatus:wiperStatus headLampStatus:headLamp engineTorque:engineTorque accPedalPosition:accPedalPosition steeringWheelAngle:steeringWheelAngle engineOilLife:engineOilLife electronicParkBrakeStatus:electronicParkBrakeStatus cloudAppVehicleID:cloudAppVehicleID eCallInfo:eCall airbagStatus:airbag emergencyEvent:event clusterModeStatus:clusterMode myKey:myKey handsOffSteering:@(handsOffSteering)]; - it(@"should get correctly when initialized", ^{ - expect(testResponse.accPedalPosition).to(equal(@(accPedalPosition))); + context(@"initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:vin:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:", ^{ + SDLGetVehicleDataResponse *testResponse = [[SDLGetVehicleDataResponse alloc] initWithGps:gps speed:speed rpm:@(rpm) instantFuelConsumption:instantFuelConsumption fuelRange:fuelRangeArray externalTemperature:externalTemperature turnSignal:turnSignal vin:vin prndl:prndl tirePressure:tires odometer:@(odometer) beltStatus:belt bodyInformation:body deviceStatus:device driverBraking:driverBraking wiperStatus:wiperStatus headLampStatus:headLamp engineTorque:engineTorque accPedalPosition:accPedalPosition steeringWheelAngle:steeringWheelAngle engineOilLife:engineOilLife electronicParkBrakeStatus:electronicParkBrakeStatus cloudAppVehicleID:cloudAppVehicleID eCallInfo:eCall airbagStatus:airbag emergencyEvent:event clusterModeStatus:clusterMode myKey:myKey handsOffSteering:@(handsOffSteering)]; + it(@"should set all properties properly", ^{ + expect(testResponse.accPedalPosition).to(equal(accPedalPosition)); expect(testResponse.airbagStatus).to(equal(airbag)); expect(testResponse.beltStatus).to(equal(belt)); expect(testResponse.bodyInformation).to(equal(body)); @@ -242,22 +256,25 @@ describe(@"getter/setter tests", ^ { expect(testResponse.eCallInfo).to(equal(eCall)); expect(testResponse.electronicParkBrakeStatus).to(equal(electronicParkBrakeStatus)); expect(testResponse.emergencyEvent).to(equal(event)); - expect(testResponse.engineOilLife).to(equal(@(engineOilLife))); - expect(testResponse.engineTorque).to(equal(@(engineTorque))); - expect(testResponse.externalTemperature).to(equal(@(externalTemperature))); - expect(testResponse.fuelLevel).to(equal(@(fuelLevel))); - expect(testResponse.fuelLevel_State).to(equal(fuelLevel_State)); + expect(testResponse.engineOilLife).to(equal(engineOilLife)); + expect(testResponse.engineTorque).to(equal(engineTorque)); + expect(testResponse.externalTemperature).to(equal(externalTemperature)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testResponse.fuelLevel).to(beNil()); + expect(testResponse.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop expect(testResponse.fuelRange).to(equal(fuelRangeArray)); expect(testResponse.gps).to(equal(gps)); expect(testResponse.handsOffSteering).to(equal(@(handsOffSteering))); expect(testResponse.headLampStatus).to(equal(headLamp)); - expect(testResponse.instantFuelConsumption).to(equal(@(instantFuelConsumption))); + expect(testResponse.instantFuelConsumption).to(equal(instantFuelConsumption)); expect(testResponse.myKey).to(equal(myKey)); - expect(testResponse.odometer).to(equal(@(odometer))); + expect(testResponse.odometer).to(equal(odometer)); expect(testResponse.prndl).to(equal(prndl)); - expect(testResponse.rpm).to(equal(@(rpm))); - expect(testResponse.speed).to(equal(@(speed))); - expect(testResponse.steeringWheelAngle).to(equal((steeringWheelAngle))); + expect(testResponse.rpm).to(equal(rpm)); + expect(testResponse.speed).to(equal(speed)); + expect(testResponse.steeringWheelAngle).to(equal(steeringWheelAngle)); expect(testResponse.tirePressure).to(equal(tires)); expect(testResponse.turnSignal).to(equal(turnSignal)); expect(testResponse.vin).to(equal(vin)); @@ -266,11 +283,10 @@ describe(@"getter/setter tests", ^ { }); it(@"should set and get OEM Custom Vehicle Data", ^{ - SDLGetVehicleDataResponse *testRequest = [[SDLGetVehicleDataResponse alloc] init]; - - [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:@"oemVehicleData"]; + SDLGetVehicleDataResponse *testResponse = [[SDLGetVehicleDataResponse alloc] init]; + [testResponse setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:@"oemVehicleData"]; - expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@"oemVehicleData")); + expect([testResponse getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@"oemVehicleData")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index a7d3b1fb1..db8dbeec9 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -20,7 +20,6 @@ QuickSpecBegin(SDLSubscribeVehicleDataResponseSpec) SDLVehicleDataResult* vehicleDataResult = [[SDLVehicleDataResult alloc] init]; SDLVehicleDataResult* customOEMvehicleDataResult = [[SDLVehicleDataResult alloc] initWithCustomOEMDataType:@"customOEMVehicleData" resultCode:SDLVehicleDataResultCodeSuccess]; - describe(@"Getter/Setter Tests", ^ { it(@"should set and get correctly", ^ { SDLSubscribeVehicleDataResponse* testResponse = [[SDLSubscribeVehicleDataResponse alloc] init]; @@ -39,8 +38,11 @@ describe(@"Getter/Setter Tests", ^ { testResponse.engineOilLife = vehicleDataResult; testResponse.engineTorque = vehicleDataResult; testResponse.externalTemperature = vehicleDataResult; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" testResponse.fuelLevel = vehicleDataResult; testResponse.fuelLevel_State = vehicleDataResult; +#pragma clang diagnostic pop testResponse.fuelRange = vehicleDataResult; testResponse.gps = vehicleDataResult; testResponse.handsOffSteering = vehicleDataResult; @@ -70,8 +72,11 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.engineOilLife).to(equal(vehicleDataResult)); expect(testResponse.engineTorque).to(equal(vehicleDataResult)); expect(testResponse.externalTemperature).to(equal(vehicleDataResult)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testResponse.fuelLevel).to(equal(vehicleDataResult)); expect(testResponse.fuelLevel_State).to(equal(vehicleDataResult)); +#pragma clang diagnostic pop expect(testResponse.fuelRange).to(equal(vehicleDataResult)); expect(testResponse.gps).to(equal(vehicleDataResult)); expect(testResponse.handsOffSteering).to(equal(vehicleDataResult)); @@ -142,8 +147,11 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.engineOilLife).to(equal(vehicleDataResult)); expect(testResponse.engineTorque).to(equal(vehicleDataResult)); expect(testResponse.externalTemperature).to(equal(vehicleDataResult)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testResponse.fuelLevel).to(equal(vehicleDataResult)); expect(testResponse.fuelLevel_State).to(equal(vehicleDataResult)); +#pragma clang diagnostic pop expect(testResponse.fuelRange).to(equal(vehicleDataResult)); expect(testResponse.gps).to(equal(vehicleDataResult)); expect(testResponse.handsOffSteering).to(equal(vehicleDataResult)); @@ -177,8 +185,11 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.engineOilLife).to(beNil()); expect(testResponse.engineTorque).to(beNil()); expect(testResponse.externalTemperature).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testResponse.fuelLevel).to(beNil()); expect(testResponse.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop expect(testResponse.fuelRange).to(beNil()); expect(testResponse.gps).to(beNil()); expect(testResponse.handsOffSteering).to(beNil()); @@ -195,20 +206,10 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.wiperStatus).to(beNil()); }); - it(@"should set and get OEM Custom Vehicle Data", ^{ - SDLSubscribeVehicleDataResponse *testRequest = [[SDLSubscribeVehicleDataResponse alloc] init]; - - [testRequest setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:customOEMvehicleDataResult]; + context(@"initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModes:myKey:handsOffSteering:", ^{ + SDLSubscribeVehicleDataResponse *testResponse = [[SDLSubscribeVehicleDataResponse alloc] initWithGps:vehicleDataResult speed:vehicleDataResult rpm:vehicleDataResult instantFuelConsumption:vehicleDataResult fuelRange:vehicleDataResult externalTemperature:vehicleDataResult turnSignal:vehicleDataResult prndl:vehicleDataResult tirePressure:vehicleDataResult odometer:vehicleDataResult beltStatus:vehicleDataResult bodyInformation:vehicleDataResult deviceStatus:vehicleDataResult driverBraking:vehicleDataResult wiperStatus:vehicleDataResult headLampStatus:vehicleDataResult engineTorque:vehicleDataResult accPedalPosition:vehicleDataResult steeringWheelAngle:vehicleDataResult engineOilLife:vehicleDataResult electronicParkBrakeStatus:vehicleDataResult cloudAppVehicleID:vehicleDataResult eCallInfo:vehicleDataResult airbagStatus:vehicleDataResult emergencyEvent:vehicleDataResult clusterModes:vehicleDataResult myKey:vehicleDataResult handsOffSteering:vehicleDataResult]; - expect([testRequest getOEMCustomVehicleData:@"customOEMVehicleData"]).to(equal(customOEMvehicleDataResult)); - }); -}); - -describe(@"convenience init test", ^ { - context(@"initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModes:myKey:handsOffSteering:", ^{ - SDLSubscribeVehicleDataResponse *testResponse = [[SDLSubscribeVehicleDataResponse alloc] initWithGps:vehicleDataResult speed:vehicleDataResult rpm:vehicleDataResult fuelLevel:vehicleDataResult fuelLevel_State:vehicleDataResult instantFuelConsumption:vehicleDataResult fuelRange:vehicleDataResult externalTemperature:vehicleDataResult turnSignal:vehicleDataResult prndl:vehicleDataResult tirePressure:vehicleDataResult odometer:vehicleDataResult beltStatus:vehicleDataResult bodyInformation:vehicleDataResult deviceStatus:vehicleDataResult driverBraking:vehicleDataResult wiperStatus:vehicleDataResult headLampStatus:vehicleDataResult engineTorque:vehicleDataResult accPedalPosition:vehicleDataResult steeringWheelAngle:vehicleDataResult engineOilLife:vehicleDataResult electronicParkBrakeStatus:vehicleDataResult cloudAppVehicleID:vehicleDataResult eCallInfo:vehicleDataResult airbagStatus:vehicleDataResult emergencyEvent:vehicleDataResult clusterModes:vehicleDataResult myKey:vehicleDataResult handsOffSteering:vehicleDataResult]; - - it(@"expect all the params to be vehicleDataResult", ^{ + it(@"expect all properties to be set properly", ^{ expect(testResponse.accPedalPosition).to(equal(vehicleDataResult)); expect(testResponse.airbagStatus).to(equal(vehicleDataResult)); expect(testResponse.beltStatus).to(equal(vehicleDataResult)); @@ -223,8 +224,11 @@ describe(@"convenience init test", ^ { expect(testResponse.engineOilLife).to(equal(vehicleDataResult)); expect(testResponse.engineTorque).to(equal(vehicleDataResult)); expect(testResponse.externalTemperature).to(equal(vehicleDataResult)); - expect(testResponse.fuelLevel).to(equal(vehicleDataResult)); - expect(testResponse.fuelLevel_State).to(equal(vehicleDataResult)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testResponse.fuelLevel).to(beNil()); + expect(testResponse.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop expect(testResponse.fuelRange).to(equal(vehicleDataResult)); expect(testResponse.gps).to(equal(vehicleDataResult)); expect(testResponse.handsOffSteering).to(equal(vehicleDataResult)); @@ -241,6 +245,13 @@ describe(@"convenience init test", ^ { expect(testResponse.wiperStatus).to(equal(vehicleDataResult)); }); }); + + it(@"should set and get OEM Custom Vehicle Data", ^{ + SDLSubscribeVehicleDataResponse *testRequest = [[SDLSubscribeVehicleDataResponse alloc] init]; + [testRequest setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:customOEMvehicleDataResult]; + + expect([testRequest getOEMCustomVehicleData:@"customOEMVehicleData"]).to(equal(customOEMvehicleDataResult)); + }); }); QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index db6c5d99d..a0bd1bf11 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -26,8 +26,11 @@ describe(@"getter/setter tests", ^ { testResponse.gps = vehicleDataResult; testResponse.speed = vehicleDataResult; testResponse.rpm = vehicleDataResult; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" testResponse.fuelLevel = vehicleDataResult; testResponse.fuelLevel_State = vehicleDataResult; +#pragma clang diagnostic pop testResponse.fuelRange = vehicleDataResult; testResponse.instantFuelConsumption = vehicleDataResult; testResponse.externalTemperature = vehicleDataResult; @@ -53,12 +56,15 @@ describe(@"getter/setter tests", ^ { testResponse.turnSignal = vehicleDataResult; testResponse.cloudAppVehicleID = vehicleDataResult; testResponse.handsOffSteering = vehicleDataResult; - + expect(testResponse.gps).to(equal(vehicleDataResult)); expect(testResponse.speed).to(equal(vehicleDataResult)); expect(testResponse.rpm).to(equal(vehicleDataResult)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testResponse.fuelLevel).to(equal(vehicleDataResult)); expect(testResponse.fuelLevel_State).to(equal(vehicleDataResult)); +#pragma clang diagnostic pop expect(testResponse.fuelRange).to(equal(vehicleDataResult)); expect(testResponse.instantFuelConsumption).to(equal(vehicleDataResult)); expect(testResponse.externalTemperature).to(equal(vehicleDataResult)); @@ -118,7 +124,7 @@ describe(@"getter/setter tests", ^ { SDLRPCParameterNameElectronicParkBrakeStatus:vehicleDataResult, SDLRPCParameterNameTurnSignal:vehicleDataResult, SDLRPCParameterNameCloudAppVehicleID:vehicleDataResult, - SDLRPCParameterNameHandsOffSteering:vehicleDataResult + SDLRPCParameterNameHandsOffSteering:vehicleDataResult, }, SDLRPCParameterNameOperationName:SDLRPCFunctionNameUnsubscribeVehicleData}}; #pragma clang diagnostic push @@ -129,8 +135,11 @@ describe(@"getter/setter tests", ^ { expect(testResponse.gps).to(equal(vehicleDataResult)); expect(testResponse.speed).to(equal(vehicleDataResult)); expect(testResponse.rpm).to(equal(vehicleDataResult)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testResponse.fuelLevel).to(equal(vehicleDataResult)); expect(testResponse.fuelLevel_State).to(equal(vehicleDataResult)); +#pragma clang diagnostic pop expect(testResponse.fuelRange).to(equal(vehicleDataResult)); expect(testResponse.instantFuelConsumption).to(equal(vehicleDataResult)); expect(testResponse.externalTemperature).to(equal(vehicleDataResult)); @@ -164,8 +173,11 @@ describe(@"getter/setter tests", ^ { expect(testResponse.gps).to(beNil()); expect(testResponse.speed).to(beNil()); expect(testResponse.rpm).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testResponse.fuelLevel).to(beNil()); expect(testResponse.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop expect(testResponse.fuelRange).to(beNil()); expect(testResponse.instantFuelConsumption).to(beNil()); expect(testResponse.externalTemperature).to(beNil()); @@ -193,15 +205,18 @@ describe(@"getter/setter tests", ^ { expect(testResponse.handsOffSteering).to(beNil()); }); - context(@"initWithGps:speed:rpm:fuelLevel:fuelLevel_State:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModes:myKey:handsOffSteering:", ^{ - it(@"expect all properties to be vehicleDataResult", ^ { - SDLUnsubscribeVehicleDataResponse* testResponse = [[SDLUnsubscribeVehicleDataResponse alloc] initWithGps:vehicleDataResult speed:vehicleDataResult rpm:vehicleDataResult fuelLevel:vehicleDataResult fuelLevel_State:vehicleDataResult instantFuelConsumption:vehicleDataResult fuelRange:vehicleDataResult externalTemperature:vehicleDataResult turnSignal:vehicleDataResult prndl:vehicleDataResult tirePressure:vehicleDataResult odometer:vehicleDataResult beltStatus:vehicleDataResult bodyInformation:vehicleDataResult deviceStatus:vehicleDataResult driverBraking:vehicleDataResult wiperStatus:vehicleDataResult headLampStatus:vehicleDataResult engineTorque:vehicleDataResult accPedalPosition:vehicleDataResult steeringWheelAngle:vehicleDataResult engineOilLife:vehicleDataResult electronicParkBrakeStatus:vehicleDataResult cloudAppVehicleID:vehicleDataResult eCallInfo:vehicleDataResult airbagStatus:vehicleDataResult emergencyEvent:vehicleDataResult clusterModes:vehicleDataResult myKey:vehicleDataResult handsOffSteering:vehicleDataResult]; + context(@"initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:prndl:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:eCallInfo:airbagStatus:emergencyEvent:clusterModes:myKey:handsOffSteering:", ^{ + SDLUnsubscribeVehicleDataResponse* testResponse = [[SDLUnsubscribeVehicleDataResponse alloc] initWithGps:vehicleDataResult speed:vehicleDataResult rpm:vehicleDataResult instantFuelConsumption:vehicleDataResult fuelRange:vehicleDataResult externalTemperature:vehicleDataResult turnSignal:vehicleDataResult prndl:vehicleDataResult tirePressure:vehicleDataResult odometer:vehicleDataResult beltStatus:vehicleDataResult bodyInformation:vehicleDataResult deviceStatus:vehicleDataResult driverBraking:vehicleDataResult wiperStatus:vehicleDataResult headLampStatus:vehicleDataResult engineTorque:vehicleDataResult accPedalPosition:vehicleDataResult steeringWheelAngle:vehicleDataResult engineOilLife:vehicleDataResult electronicParkBrakeStatus:vehicleDataResult cloudAppVehicleID:vehicleDataResult eCallInfo:vehicleDataResult airbagStatus:vehicleDataResult emergencyEvent:vehicleDataResult clusterModes:vehicleDataResult myKey:vehicleDataResult handsOffSteering:vehicleDataResult]; + it(@"expect all properties to be set properly", ^{ expect(testResponse.gps).to(equal(vehicleDataResult)); expect(testResponse.speed).to(equal(vehicleDataResult)); expect(testResponse.rpm).to(equal(vehicleDataResult)); - expect(testResponse.fuelLevel).to(equal(vehicleDataResult)); - expect(testResponse.fuelLevel_State).to(equal(vehicleDataResult)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testResponse.fuelLevel).to(beNil()); + expect(testResponse.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop expect(testResponse.fuelRange).to(equal(vehicleDataResult)); expect(testResponse.instantFuelConsumption).to(equal(vehicleDataResult)); expect(testResponse.externalTemperature).to(equal(vehicleDataResult)); @@ -232,7 +247,6 @@ describe(@"getter/setter tests", ^ { it(@"should set and get OEM Custom Vehicle Data", ^{ SDLUnsubscribeVehicleDataResponse *testRequest = [[SDLUnsubscribeVehicleDataResponse alloc] init]; - [testRequest setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:customOEMvehicleDataResult]; expect([testRequest getOEMCustomVehicleData:@"customOEMVehicleData"]).to(equal(customOEMvehicleDataResult)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLFuelRangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLFuelRangeSpec.m index faad50b3b..bb4f31e36 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLFuelRangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLFuelRangeSpec.m @@ -15,36 +15,80 @@ #import "SDLRPCParameterNames.h" QuickSpecBegin(SDLFuelRangeSpec) +const float fuelLevel = 123.45f; +const float fuelCapacity = 34.56f; +const float range = 23.0f; +SDLFuelType type = SDLFuelTypeDiesel; +SDLComponentVolumeStatus levelState = SDLComponentVolumeStatusAlert; +SDLCapacityUnit capacityUnit = SDLCapacityUnitKilowatthours; -describe(@"Getter/Setter Tests", ^ { - it(@"Should set and get correctly", ^ { +describe(@"getter/setter tests", ^{ + context(@"init and assign", ^{ SDLFuelRange *testStruct = [[SDLFuelRange alloc] init]; - - testStruct.type = SDLFuelTypeDiesel; - testStruct.range = @45; - - expect(testStruct.type).to(equal(SDLFuelTypeDiesel)); - expect(testStruct.range).to(equal(@45)); + testStruct.type = type; + testStruct.range = @(range); + testStruct.level = @(fuelLevel); + testStruct.levelState = levelState; + testStruct.capacity = @(fuelCapacity); + testStruct.capacityUnit = capacityUnit; + + it(@"expect all properties to be set properly", ^{ + expect(testStruct.type).to(equal(type)); + expect(testStruct.range).to(equal(@(range))); + expect(testStruct.level).to(equal(fuelLevel)); + expect(testStruct.levelState).to(equal(levelState)); + expect(testStruct.capacity).to(equal(fuelCapacity)); + expect(testStruct.capacityUnit).to(equal(capacityUnit)); + }); }); - it(@"Should get correctly when initialized", ^ { - NSDictionary *dict = @{SDLRPCParameterNameType:SDLFuelTypeLPG, - SDLRPCParameterNameRange:@23 + context(@"should get correctly when initialized with dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameType:type, + SDLRPCParameterNameRange:@(range), + SDLRPCParameterNameLevel:@(fuelLevel), + SDLRPCParameterNameLevelState:levelState, + SDLRPCParameterNameCapacity:@(fuelCapacity), + SDLRPCParameterNameCapacityUnit:capacityUnit }; #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLFuelRange *testStruct = [[SDLFuelRange alloc] initWithDictionary:dict]; #pragma clang diagnostic pop - expect(testStruct.type).to(equal(SDLFuelTypeLPG)); - expect(testStruct.range).to(equal(@23)); + it(@"expect all properties to be set properly", ^{ + expect(testStruct.type).to(equal(type)); + expect(testStruct.range).to(equal(@(range))); + expect(testStruct.level).to(equal(fuelLevel)); + expect(testStruct.levelState).to(equal(levelState)); + expect(testStruct.capacity).to(equal(fuelCapacity)); + expect(testStruct.capacityUnit).to(equal(capacityUnit)); + }); }); - it(@"Should return nil if not set", ^ { + context(@"init", ^{ SDLFuelRange *testStruct = [[SDLFuelRange alloc] init]; - expect(testStruct.type).to(beNil()); - expect(testStruct.range).to(beNil()); + it(@"expect all properties to be nil", ^{ + expect(testStruct.type).to(beNil()); + expect(testStruct.range).to(beNil()); + expect(testStruct.level).to(beNil()); + expect(testStruct.levelState).to(beNil()); + expect(testStruct.capacity).to(beNil()); + expect(testStruct.capacityUnit).to(beNil()); + }); + }); + + context(@"initWithType:range:level:levelState:capacity:capacityUnit:", ^{ + SDLFuelRange *testStruct = [[SDLFuelRange alloc] initWithType:type range:range level:fuelLevel levelState:levelState capacity:fuelCapacity capacityUnit:capacityUnit]; + + it(@"expect all properties to be set properly", ^{ + expect(testStruct.type).to(equal(type)); + expect(testStruct.range).to(equal(@(range))); + expect(testStruct.level).to(equal(fuelLevel)); + expect(testStruct.levelState).to(equal(levelState)); + expect(testStruct.capacity).to(equal(fuelCapacity)); + expect(testStruct.capacityUnit).to(equal(capacityUnit)); + }); }); }); |