diff options
| author | leonid lokhmatov, Luxoft <zaqqqqqqqq@gmail.com> | 2020-07-24 16:12:51 +0300 |
|---|---|---|
| committer | leonid lokhmatov, Luxoft <zaqqqqqqqq@gmail.com> | 2020-07-24 16:12:51 +0300 |
| commit | 1bdadf010a2a11374ad2690dba0ce4fa9d152528 (patch) | |
| tree | 19ab64f30f6db3411bb47f34ee6c494ec6c152a2 | |
| parent | a95d1db35b0816e554697f43e7d0b5b96ca3ef46 (diff) | |
| download | sdl_ios-1bdadf010a2a11374ad2690dba0ce4fa9d152528.tar.gz | |
0261 'New vehicle data WindowStatus': apply review comments. (sort headers, classes, properties alphabetically, fix & add script generated initializers)
30 files changed, 1100 insertions, 712 deletions
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index 92037864f..43fc41b2e 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -28,27 +28,25 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLAlertManeuver.h', 'SmartDeviceLink/SDLAlertManeuverResponse.h', 'SmartDeviceLink/SDLAlertResponse.h', +'SmartDeviceLink/SDLAmbientLightStatus.h', +'SmartDeviceLink/SDLAppHMIType.h', +'SmartDeviceLink/SDLAppInfo.h', +'SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h', 'SmartDeviceLink/SDLAppServiceCapability.h', 'SmartDeviceLink/SDLAppServiceData.h', 'SmartDeviceLink/SDLAppServiceManifest.h', 'SmartDeviceLink/SDLAppServiceRecord.h', -'SmartDeviceLink/SDLAppServicesCapabilities.h', 'SmartDeviceLink/SDLAppServiceType.h', -'SmartDeviceLink/SDLButtonPressResponse.h', -'SmartDeviceLink/SDLAmbientLightStatus.h', -'SmartDeviceLink/SDLAppHMIType.h', -'SmartDeviceLink/SDLAppInfo.h', -'SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h', +'SmartDeviceLink/SDLAppServicesCapabilities.h', 'SmartDeviceLink/SDLArtwork.h', -'SmartDeviceLink/SDLAudioControlData.h', 'SmartDeviceLink/SDLAudioControlCapabilities.h', +'SmartDeviceLink/SDLAudioControlData.h', 'SmartDeviceLink/SDLAudioFile.h', 'SmartDeviceLink/SDLAudioPassThruCapabilities.h', -'SmartDeviceLink/SDLAudioStreamingState.h', -'SmartDeviceLink/SDLAudioStreamingIndicator.h', 'SmartDeviceLink/SDLAudioStreamManager.h', 'SmartDeviceLink/SDLAudioStreamManagerDelegate.h', -'SmartDeviceLink/SDLStreamingAudioManagerType.h', +'SmartDeviceLink/SDLAudioStreamingIndicator.h', +'SmartDeviceLink/SDLAudioStreamingState.h', 'SmartDeviceLink/SDLAudioType.h', 'SmartDeviceLink/SDLBeltStatus.h', 'SmartDeviceLink/SDLBitsPerSample.h', @@ -58,6 +56,7 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLButtonName.h', 'SmartDeviceLink/SDLButtonPress.h', 'SmartDeviceLink/SDLButtonPressMode.h', +'SmartDeviceLink/SDLButtonPressResponse.h', 'SmartDeviceLink/SDLCancelInteraction.h', 'SmartDeviceLink/SDLCancelInteractionResponse.h', 'SmartDeviceLink/SDLCarModeStatus.h', @@ -82,6 +81,7 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h', 'SmartDeviceLink/SDLCreateWindow.h', 'SmartDeviceLink/SDLCreateWindowResponse.h', +'SmartDeviceLink/SDLDIDResult.h', 'SmartDeviceLink/SDLDateTime.h', 'SmartDeviceLink/SDLDefrostZone.h', 'SmartDeviceLink/SDLDeleteCommand.h', @@ -102,27 +102,26 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLDiagnosticMessageResponse.h', 'SmartDeviceLink/SDLDialNumber.h', 'SmartDeviceLink/SDLDialNumberResponse.h', -'SmartDeviceLink/SDLDIDResult.h', 'SmartDeviceLink/SDLDimension.h', -'SmartDeviceLink/SDLDisplayCapability.h', +'SmartDeviceLink/SDLDirection.h', 'SmartDeviceLink/SDLDisplayCapabilities.h', +'SmartDeviceLink/SDLDisplayCapability.h', 'SmartDeviceLink/SDLDisplayMode.h', 'SmartDeviceLink/SDLDisplayType.h', 'SmartDeviceLink/SDLDistanceUnit.h', -'SmartDeviceLink/SDLDirection.h', 'SmartDeviceLink/SDLDriverDistractionState.h', 'SmartDeviceLink/SDLECallConfirmationStatus.h', 'SmartDeviceLink/SDLECallInfo.h', 'SmartDeviceLink/SDLElectronicParkBrakeStatus.h', -'SmartDeviceLink/SDLEncryptionConfiguration.h', 'SmartDeviceLink/SDLEmergencyEvent.h', 'SmartDeviceLink/SDLEmergencyEventType.h', 'SmartDeviceLink/SDLEncodedSyncPData.h', 'SmartDeviceLink/SDLEncodedSyncPDataResponse.h', +'SmartDeviceLink/SDLEncryptionConfiguration.h', 'SmartDeviceLink/SDLEndAudioPassThru.h', 'SmartDeviceLink/SDLEndAudioPassThruResponse.h', -'SmartDeviceLink/SDLEqualizerSettings.h', 'SmartDeviceLink/SDLEnum.h', +'SmartDeviceLink/SDLEqualizerSettings.h', 'SmartDeviceLink/SDLErrorConstants.h', 'SmartDeviceLink/SDLFile.h', 'SmartDeviceLink/SDLFileManager.h', @@ -133,11 +132,12 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLFuelRange.h', 'SmartDeviceLink/SDLFuelType.h', 'SmartDeviceLink/SDLFunctionID.h', +'SmartDeviceLink/SDLGPSData.h', 'SmartDeviceLink/SDLGenericResponse.h', -'SmartDeviceLink/SDLGetCloudAppProperties.h', -'SmartDeviceLink/SDLGetCloudAppPropertiesResponse.h', 'SmartDeviceLink/SDLGetAppServiceData.h', 'SmartDeviceLink/SDLGetAppServiceDataResponse.h', +'SmartDeviceLink/SDLGetCloudAppProperties.h', +'SmartDeviceLink/SDLGetCloudAppPropertiesResponse.h', 'SmartDeviceLink/SDLGetDTCs.h', 'SmartDeviceLink/SDLGetDTCsResponse.h', 'SmartDeviceLink/SDLGetFile.h', @@ -153,16 +153,15 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLGetWaypoints.h', 'SmartDeviceLink/SDLGetWaypointsResponse.h', 'SmartDeviceLink/SDLGlobalProperty.h', -'SmartDeviceLink/SDLGPSData.h', 'SmartDeviceLink/SDLGrid.h', -'SmartDeviceLink/SDLHapticRect.h', -'SmartDeviceLink/SDLHeadLampStatus.h', 'SmartDeviceLink/SDLHMICapabilities.h', 'SmartDeviceLink/SDLHMILevel.h', 'SmartDeviceLink/SDLHMIPermissions.h', 'SmartDeviceLink/SDLHMISettingsControlCapabilities.h', 'SmartDeviceLink/SDLHMISettingsControlData.h', 'SmartDeviceLink/SDLHMIZoneCapabilities.h', +'SmartDeviceLink/SDLHapticRect.h', +'SmartDeviceLink/SDLHeadLampStatus.h', 'SmartDeviceLink/SDLHybridAppPreference.h', 'SmartDeviceLink/SDLIgnitionStableStatus.h', 'SmartDeviceLink/SDLIgnitionStatus.h', @@ -204,15 +203,15 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLLogTargetAppleSystemLog.h', 'SmartDeviceLink/SDLLogTargetFile.h', 'SmartDeviceLink/SDLLogTargetOSLog.h', -'SmartDeviceLink/SDLMassageCushionFirmness.h', -'SmartDeviceLink/SDLMassageModeData.h', -'SmartDeviceLink/SDLMassageCushion.h', -'SmartDeviceLink/SDLMassageMode.h', -'SmartDeviceLink/SDLMassageZone.h', 'SmartDeviceLink/SDLMacros.h', 'SmartDeviceLink/SDLMaintenanceModeStatus.h', 'SmartDeviceLink/SDLManager.h', 'SmartDeviceLink/SDLManagerDelegate.h', +'SmartDeviceLink/SDLMassageCushion.h', +'SmartDeviceLink/SDLMassageCushionFirmness.h', +'SmartDeviceLink/SDLMassageMode.h', +'SmartDeviceLink/SDLMassageModeData.h', +'SmartDeviceLink/SDLMassageZone.h', 'SmartDeviceLink/SDLMediaClockFormat.h', 'SmartDeviceLink/SDLMediaServiceData.h', 'SmartDeviceLink/SDLMediaServiceManifest.h', @@ -227,6 +226,7 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLModuleData.h', 'SmartDeviceLink/SDLModuleInfo.h', 'SmartDeviceLink/SDLModuleType.h', +'SmartDeviceLink/SDLMsgVersion.h', 'SmartDeviceLink/SDLMyKey.h', 'SmartDeviceLink/SDLNavigationAction.h', 'SmartDeviceLink/SDLNavigationCapability.h', @@ -244,9 +244,9 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLOnCommand.h', 'SmartDeviceLink/SDLOnDriverDistraction.h', 'SmartDeviceLink/SDLOnEncodedSyncPData.h', +'SmartDeviceLink/SDLOnHMIStatus.h', 'SmartDeviceLink/SDLOnHashChange.h', 'SmartDeviceLink/SDLOnInteriorVehicleData.h', -'SmartDeviceLink/SDLOnHMIStatus.h', 'SmartDeviceLink/SDLOnKeyboardInput.h', 'SmartDeviceLink/SDLOnLanguageChange.h', 'SmartDeviceLink/SDLOnLockScreenStatus.h', @@ -259,6 +259,7 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLOnTouchEvent.h', 'SmartDeviceLink/SDLOnVehicleData.h', 'SmartDeviceLink/SDLOnWayPointChange.h', +'SmartDeviceLink/SDLPRNDL.h', 'SmartDeviceLink/SDLParameterPermissions.h', 'SmartDeviceLink/SDLPerformAppServiceInteraction.h', 'SmartDeviceLink/SDLPerformAppServiceInteractionResponse.h', @@ -279,44 +280,44 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLPrerecordedSpeech.h', 'SmartDeviceLink/SDLPresetBankCapabilities.h', 'SmartDeviceLink/SDLPrimaryAudioSource.h', -'SmartDeviceLink/SDLPRNDL.h', 'SmartDeviceLink/SDLProtocolConstants.h', 'SmartDeviceLink/SDLPublishAppService.h', 'SmartDeviceLink/SDLPublishAppServiceResponse.h', 'SmartDeviceLink/SDLPutFile.h', 'SmartDeviceLink/SDLPutFileResponse.h', +'SmartDeviceLink/SDLRDSData.h', +'SmartDeviceLink/SDLRGBColor.h', +'SmartDeviceLink/SDLRPCFunctionNames.h', +'SmartDeviceLink/SDLRPCMessage.h', +'SmartDeviceLink/SDLRPCMessageType.h', +'SmartDeviceLink/SDLRPCNotification.h', +'SmartDeviceLink/SDLRPCNotificationNotification.h', +'SmartDeviceLink/SDLRPCRequest.h', +'SmartDeviceLink/SDLRPCRequestNotification.h', +'SmartDeviceLink/SDLRPCResponse.h', +'SmartDeviceLink/SDLRPCResponseNotification.h', +'SmartDeviceLink/SDLRPCStruct.h', 'SmartDeviceLink/SDLRadioBand.h', 'SmartDeviceLink/SDLRadioControlCapabilities.h', 'SmartDeviceLink/SDLRadioControlData.h', 'SmartDeviceLink/SDLRadioState.h', -'SmartDeviceLink/SDLRDSData.h', 'SmartDeviceLink/SDLReadDID.h', -'SmartDeviceLink/SDLRectangle.h', 'SmartDeviceLink/SDLReadDIDResponse.h', 'SmartDeviceLink/SDLRectangle.h', +'SmartDeviceLink/SDLRectangle.h', 'SmartDeviceLink/SDLRegisterAppInterface.h', 'SmartDeviceLink/SDLRegisterAppInterfaceResponse.h', -'SmartDeviceLink/SDLRemoteControlCapabilities.h', 'SmartDeviceLink/SDLReleaseInteriorVehicleDataModule.h', 'SmartDeviceLink/SDLReleaseInteriorVehicleDataModuleResponse.h', +'SmartDeviceLink/SDLRemoteControlCapabilities.h', 'SmartDeviceLink/SDLRequestType.h', 'SmartDeviceLink/SDLResetGlobalProperties.h', 'SmartDeviceLink/SDLResetGlobalPropertiesResponse.h', 'SmartDeviceLink/SDLResult.h', -'SmartDeviceLink/SDLRGBColor.h', -'SmartDeviceLink/SDLRPCFunctionNames.h', -'SmartDeviceLink/SDLRPCMessage.h', -'SmartDeviceLink/SDLRPCMessageType.h', -'SmartDeviceLink/SDLRPCNotification.h', -'SmartDeviceLink/SDLRPCNotificationNotification.h', -'SmartDeviceLink/SDLRPCRequest.h', -'SmartDeviceLink/SDLRPCRequestNotification.h', -'SmartDeviceLink/SDLRPCResponse.h', -'SmartDeviceLink/SDLRPCResponseNotification.h', -'SmartDeviceLink/SDLRPCStruct.h', +'SmartDeviceLink/SDLSISData.h', 'SmartDeviceLink/SDLSamplingRate.h', -'SmartDeviceLink/SDLScreenParams.h', 'SmartDeviceLink/SDLScreenManager.h', +'SmartDeviceLink/SDLScreenParams.h', 'SmartDeviceLink/SDLScrollableMessage.h', 'SmartDeviceLink/SDLScrollableMessageResponse.h', 'SmartDeviceLink/SDLSeatControlCapabilities.h', @@ -325,7 +326,6 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLSeatLocationCapability.h', 'SmartDeviceLink/SDLSeatMemoryAction.h', 'SmartDeviceLink/SDLSeatMemoryActionType.h', -'SmartDeviceLink/SDLSupportedSeat.h', 'SmartDeviceLink/SDLSecurityType.h', 'SmartDeviceLink/SDLSendHapticData.h', 'SmartDeviceLink/SDLSendHapticDataResponse.h', @@ -340,8 +340,8 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLSetDisplayLayout.h', 'SmartDeviceLink/SDLSetDisplayLayoutResponse.h', 'SmartDeviceLink/SDLSetGlobalProperties.h', -'SmartDeviceLink/SDLSetInteriorVehicleData.h', 'SmartDeviceLink/SDLSetGlobalPropertiesResponse.h', +'SmartDeviceLink/SDLSetInteriorVehicleData.h', 'SmartDeviceLink/SDLSetInteriorVehicleDataResponse.h', 'SmartDeviceLink/SDLSetMediaClockTimer.h', 'SmartDeviceLink/SDLSetMediaClockTimerResponse.h', @@ -352,7 +352,6 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLShowConstantTBTResponse.h', 'SmartDeviceLink/SDLShowResponse.h', 'SmartDeviceLink/SDLSingleTireStatus.h', -'SmartDeviceLink/SDLSISData.h', 'SmartDeviceLink/SDLSlider.h', 'SmartDeviceLink/SDLSliderResponse.h', 'SmartDeviceLink/SDLSoftButton.h', @@ -366,6 +365,7 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLStartTime.h', 'SmartDeviceLink/SDLStaticIconName.h', 'SmartDeviceLink/SDLStationIDNumber.h', +'SmartDeviceLink/SDLStreamingAudioManagerType.h', 'SmartDeviceLink/SDLStreamingMediaConfiguration.h', 'SmartDeviceLink/SDLStreamingMediaManager.h', 'SmartDeviceLink/SDLStreamingMediaManagerConstants.h', @@ -377,8 +377,8 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLSubscribeVehicleDataResponse.h', 'SmartDeviceLink/SDLSubscribeWaypoints.h', 'SmartDeviceLink/SDLSubscribeWaypointsResponse.h', +'SmartDeviceLink/SDLSupportedSeat.h', 'SmartDeviceLink/SDLSyncMsgVersion.h', -'SmartDeviceLink/SDLMsgVersion.h', 'SmartDeviceLink/SDLSyncPData.h', 'SmartDeviceLink/SDLSyncPDataResponse.h', 'SmartDeviceLink/SDLSystemAction.h', @@ -388,10 +388,12 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLSystemContext.h', 'SmartDeviceLink/SDLSystemRequest.h', 'SmartDeviceLink/SDLTBTState.h', +'SmartDeviceLink/SDLTPMS.h', +'SmartDeviceLink/SDLTTSChunk.h', 'SmartDeviceLink/SDLTemperature.h', 'SmartDeviceLink/SDLTemperatureUnit.h', -'SmartDeviceLink/SDLTemplateConfiguration.h', 'SmartDeviceLink/SDLTemplateColorScheme.h', +'SmartDeviceLink/SDLTemplateConfiguration.h', 'SmartDeviceLink/SDLTextAlignment.h', 'SmartDeviceLink/SDLTextField.h', 'SmartDeviceLink/SDLTextFieldName.h', @@ -404,9 +406,7 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLTouchManager.h', 'SmartDeviceLink/SDLTouchManagerDelegate.h', 'SmartDeviceLink/SDLTouchType.h', -'SmartDeviceLink/SDLTPMS.h', 'SmartDeviceLink/SDLTriggerSource.h', -'SmartDeviceLink/SDLTTSChunk.h', 'SmartDeviceLink/SDLTurn.h', 'SmartDeviceLink/SDLTurnSignal.h', 'SmartDeviceLink/SDLUnpublishAppService.h', @@ -429,8 +429,8 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLVehicleDataResultCode.h', 'SmartDeviceLink/SDLVehicleDataStatus.h', 'SmartDeviceLink/SDLVehicleDataType.h', -'SmartDeviceLink/SDLVentilationMode.h', 'SmartDeviceLink/SDLVehicleType.h', +'SmartDeviceLink/SDLVentilationMode.h', 'SmartDeviceLink/SDLVersion.h', 'SmartDeviceLink/SDLVideoStreamingCapability.h', 'SmartDeviceLink/SDLVideoStreamingCodec.h', @@ -446,12 +446,12 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLWeatherData.h', 'SmartDeviceLink/SDLWeatherServiceData.h', 'SmartDeviceLink/SDLWeatherServiceManifest.h', -'SmartDeviceLink/SDLWiperStatus.h', 'SmartDeviceLink/SDLWindowCapability.h', +'SmartDeviceLink/SDLWindowState.h', +'SmartDeviceLink/SDLWindowStatus.h', 'SmartDeviceLink/SDLWindowType.h', 'SmartDeviceLink/SDLWindowTypeCapabilities.h', -'SmartDeviceLink/SDLWindowStatus.h', -'SmartDeviceLink/SDLWindowState.h', +'SmartDeviceLink/SDLWiperStatus.h', 'SmartDeviceLink/SmartDeviceLink.h', ] end diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec index f4c0bd211..4f344e4b4 100644 --- a/SmartDeviceLink.podspec +++ b/SmartDeviceLink.podspec @@ -29,27 +29,25 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLAlertManeuver.h', 'SmartDeviceLink/SDLAlertManeuverResponse.h', 'SmartDeviceLink/SDLAlertResponse.h', +'SmartDeviceLink/SDLAmbientLightStatus.h', +'SmartDeviceLink/SDLAppHMIType.h', +'SmartDeviceLink/SDLAppInfo.h', +'SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h', 'SmartDeviceLink/SDLAppServiceCapability.h', 'SmartDeviceLink/SDLAppServiceData.h', 'SmartDeviceLink/SDLAppServiceManifest.h', 'SmartDeviceLink/SDLAppServiceRecord.h', -'SmartDeviceLink/SDLAppServicesCapabilities.h', 'SmartDeviceLink/SDLAppServiceType.h', -'SmartDeviceLink/SDLButtonPressResponse.h', -'SmartDeviceLink/SDLAmbientLightStatus.h', -'SmartDeviceLink/SDLAppHMIType.h', -'SmartDeviceLink/SDLAppInfo.h', -'SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h', +'SmartDeviceLink/SDLAppServicesCapabilities.h', 'SmartDeviceLink/SDLArtwork.h', -'SmartDeviceLink/SDLAudioControlData.h', 'SmartDeviceLink/SDLAudioControlCapabilities.h', -'SmartDeviceLink/SDLAudioPassThruCapabilities.h', +'SmartDeviceLink/SDLAudioControlData.h', 'SmartDeviceLink/SDLAudioFile.h', -'SmartDeviceLink/SDLAudioStreamingState.h', -'SmartDeviceLink/SDLAudioStreamingIndicator.h', +'SmartDeviceLink/SDLAudioPassThruCapabilities.h', 'SmartDeviceLink/SDLAudioStreamManager.h', 'SmartDeviceLink/SDLAudioStreamManagerDelegate.h', -'SmartDeviceLink/SDLStreamingAudioManagerType.h', +'SmartDeviceLink/SDLAudioStreamingIndicator.h', +'SmartDeviceLink/SDLAudioStreamingState.h', 'SmartDeviceLink/SDLAudioType.h', 'SmartDeviceLink/SDLBeltStatus.h', 'SmartDeviceLink/SDLBitsPerSample.h', @@ -59,6 +57,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLButtonName.h', 'SmartDeviceLink/SDLButtonPress.h', 'SmartDeviceLink/SDLButtonPressMode.h', +'SmartDeviceLink/SDLButtonPressResponse.h', 'SmartDeviceLink/SDLCancelInteraction.h', 'SmartDeviceLink/SDLCancelInteractionResponse.h', 'SmartDeviceLink/SDLCarModeStatus.h', @@ -83,6 +82,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h', 'SmartDeviceLink/SDLCreateWindow.h', 'SmartDeviceLink/SDLCreateWindowResponse.h', +'SmartDeviceLink/SDLDIDResult.h', 'SmartDeviceLink/SDLDateTime.h', 'SmartDeviceLink/SDLDefrostZone.h', 'SmartDeviceLink/SDLDeleteCommand.h', @@ -103,11 +103,10 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLDiagnosticMessageResponse.h', 'SmartDeviceLink/SDLDialNumber.h', 'SmartDeviceLink/SDLDialNumberResponse.h', -'SmartDeviceLink/SDLDIDResult.h', 'SmartDeviceLink/SDLDimension.h', 'SmartDeviceLink/SDLDirection.h', -'SmartDeviceLink/SDLDisplayCapability.h', 'SmartDeviceLink/SDLDisplayCapabilities.h', +'SmartDeviceLink/SDLDisplayCapability.h', 'SmartDeviceLink/SDLDisplayMode.h', 'SmartDeviceLink/SDLDisplayType.h', 'SmartDeviceLink/SDLDistanceUnit.h', @@ -115,15 +114,15 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLECallConfirmationStatus.h', 'SmartDeviceLink/SDLECallInfo.h', 'SmartDeviceLink/SDLElectronicParkBrakeStatus.h', -'SmartDeviceLink/SDLEncryptionConfiguration.h', 'SmartDeviceLink/SDLEmergencyEvent.h', 'SmartDeviceLink/SDLEmergencyEventType.h', 'SmartDeviceLink/SDLEncodedSyncPData.h', 'SmartDeviceLink/SDLEncodedSyncPDataResponse.h', +'SmartDeviceLink/SDLEncryptionConfiguration.h', 'SmartDeviceLink/SDLEndAudioPassThru.h', 'SmartDeviceLink/SDLEndAudioPassThruResponse.h', -'SmartDeviceLink/SDLEqualizerSettings.h', 'SmartDeviceLink/SDLEnum.h', +'SmartDeviceLink/SDLEqualizerSettings.h', 'SmartDeviceLink/SDLErrorConstants.h', 'SmartDeviceLink/SDLFile.h', 'SmartDeviceLink/SDLFileManager.h', @@ -134,12 +133,13 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLFuelRange.h', 'SmartDeviceLink/SDLFuelType.h', 'SmartDeviceLink/SDLFunctionID.h', +'SmartDeviceLink/SDLGPSData.h', 'SmartDeviceLink/SDLGenericResponse.h', 'SmartDeviceLink/SDLGetAppServiceData.h', 'SmartDeviceLink/SDLGetAppServiceDataResponse.h', -'SmartDeviceLink/SDLGetDTCs.h', 'SmartDeviceLink/SDLGetCloudAppProperties.h', 'SmartDeviceLink/SDLGetCloudAppPropertiesResponse.h', +'SmartDeviceLink/SDLGetDTCs.h', 'SmartDeviceLink/SDLGetDTCsResponse.h', 'SmartDeviceLink/SDLGetFile.h', 'SmartDeviceLink/SDLGetFileResponse.h', @@ -154,16 +154,15 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLGetWaypoints.h', 'SmartDeviceLink/SDLGetWaypointsResponse.h', 'SmartDeviceLink/SDLGlobalProperty.h', -'SmartDeviceLink/SDLGPSData.h', 'SmartDeviceLink/SDLGrid.h', -'SmartDeviceLink/SDLHapticRect.h', -'SmartDeviceLink/SDLHeadLampStatus.h', 'SmartDeviceLink/SDLHMICapabilities.h', 'SmartDeviceLink/SDLHMILevel.h', 'SmartDeviceLink/SDLHMIPermissions.h', 'SmartDeviceLink/SDLHMISettingsControlCapabilities.h', 'SmartDeviceLink/SDLHMISettingsControlData.h', 'SmartDeviceLink/SDLHMIZoneCapabilities.h', +'SmartDeviceLink/SDLHapticRect.h', +'SmartDeviceLink/SDLHeadLampStatus.h', 'SmartDeviceLink/SDLHybridAppPreference.h', 'SmartDeviceLink/SDLIgnitionStableStatus.h', 'SmartDeviceLink/SDLIgnitionStatus.h', @@ -209,10 +208,10 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLMaintenanceModeStatus.h', 'SmartDeviceLink/SDLManager.h', 'SmartDeviceLink/SDLManagerDelegate.h', -'SmartDeviceLink/SDLMassageCushionFirmness.h', -'SmartDeviceLink/SDLMassageModeData.h', 'SmartDeviceLink/SDLMassageCushion.h', +'SmartDeviceLink/SDLMassageCushionFirmness.h', 'SmartDeviceLink/SDLMassageMode.h', +'SmartDeviceLink/SDLMassageModeData.h', 'SmartDeviceLink/SDLMassageZone.h', 'SmartDeviceLink/SDLMediaClockFormat.h', 'SmartDeviceLink/SDLMediaServiceData.h', @@ -228,6 +227,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLModuleData.h', 'SmartDeviceLink/SDLModuleInfo.h', 'SmartDeviceLink/SDLModuleType.h', +'SmartDeviceLink/SDLMsgVersion.h', 'SmartDeviceLink/SDLMyKey.h', 'SmartDeviceLink/SDLNavigationAction.h', 'SmartDeviceLink/SDLNavigationCapability.h', @@ -245,9 +245,9 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLOnCommand.h', 'SmartDeviceLink/SDLOnDriverDistraction.h', 'SmartDeviceLink/SDLOnEncodedSyncPData.h', +'SmartDeviceLink/SDLOnHMIStatus.h', 'SmartDeviceLink/SDLOnHashChange.h', 'SmartDeviceLink/SDLOnInteriorVehicleData.h', -'SmartDeviceLink/SDLOnHMIStatus.h', 'SmartDeviceLink/SDLOnKeyboardInput.h', 'SmartDeviceLink/SDLOnLanguageChange.h', 'SmartDeviceLink/SDLOnLockScreenStatus.h', @@ -260,6 +260,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLOnTouchEvent.h', 'SmartDeviceLink/SDLOnVehicleData.h', 'SmartDeviceLink/SDLOnWayPointChange.h', +'SmartDeviceLink/SDLPRNDL.h', 'SmartDeviceLink/SDLParameterPermissions.h', 'SmartDeviceLink/SDLPerformAppServiceInteraction.h', 'SmartDeviceLink/SDLPerformAppServiceInteractionResponse.h', @@ -280,44 +281,44 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLPrerecordedSpeech.h', 'SmartDeviceLink/SDLPresetBankCapabilities.h', 'SmartDeviceLink/SDLPrimaryAudioSource.h', -'SmartDeviceLink/SDLPRNDL.h', 'SmartDeviceLink/SDLProtocolConstants.h', 'SmartDeviceLink/SDLPublishAppService.h', 'SmartDeviceLink/SDLPublishAppServiceResponse.h', 'SmartDeviceLink/SDLPutFile.h', 'SmartDeviceLink/SDLPutFileResponse.h', +'SmartDeviceLink/SDLRDSData.h', +'SmartDeviceLink/SDLRGBColor.h', +'SmartDeviceLink/SDLRPCFunctionNames.h', +'SmartDeviceLink/SDLRPCMessage.h', +'SmartDeviceLink/SDLRPCMessageType.h', +'SmartDeviceLink/SDLRPCNotification.h', +'SmartDeviceLink/SDLRPCNotificationNotification.h', +'SmartDeviceLink/SDLRPCRequest.h', +'SmartDeviceLink/SDLRPCRequestNotification.h', +'SmartDeviceLink/SDLRPCResponse.h', +'SmartDeviceLink/SDLRPCResponseNotification.h', +'SmartDeviceLink/SDLRPCStruct.h', 'SmartDeviceLink/SDLRadioBand.h', 'SmartDeviceLink/SDLRadioControlCapabilities.h', 'SmartDeviceLink/SDLRadioControlData.h', 'SmartDeviceLink/SDLRadioState.h', -'SmartDeviceLink/SDLRDSData.h', 'SmartDeviceLink/SDLReadDID.h', -'SmartDeviceLink/SDLRectangle.h', 'SmartDeviceLink/SDLReadDIDResponse.h', 'SmartDeviceLink/SDLRectangle.h', +'SmartDeviceLink/SDLRectangle.h', 'SmartDeviceLink/SDLRegisterAppInterface.h', 'SmartDeviceLink/SDLRegisterAppInterfaceResponse.h', -'SmartDeviceLink/SDLRemoteControlCapabilities.h', 'SmartDeviceLink/SDLReleaseInteriorVehicleDataModule.h', 'SmartDeviceLink/SDLReleaseInteriorVehicleDataModuleResponse.h', +'SmartDeviceLink/SDLRemoteControlCapabilities.h', 'SmartDeviceLink/SDLRequestType.h', 'SmartDeviceLink/SDLResetGlobalProperties.h', 'SmartDeviceLink/SDLResetGlobalPropertiesResponse.h', 'SmartDeviceLink/SDLResult.h', -'SmartDeviceLink/SDLRGBColor.h', -'SmartDeviceLink/SDLRPCFunctionNames.h', -'SmartDeviceLink/SDLRPCMessage.h', -'SmartDeviceLink/SDLRPCMessageType.h', -'SmartDeviceLink/SDLRPCNotification.h', -'SmartDeviceLink/SDLRPCNotificationNotification.h', -'SmartDeviceLink/SDLRPCRequest.h', -'SmartDeviceLink/SDLRPCRequestNotification.h', -'SmartDeviceLink/SDLRPCResponse.h', -'SmartDeviceLink/SDLRPCResponseNotification.h', -'SmartDeviceLink/SDLRPCStruct.h', +'SmartDeviceLink/SDLSISData.h', 'SmartDeviceLink/SDLSamplingRate.h', -'SmartDeviceLink/SDLScreenParams.h', 'SmartDeviceLink/SDLScreenManager.h', +'SmartDeviceLink/SDLScreenParams.h', 'SmartDeviceLink/SDLScrollableMessage.h', 'SmartDeviceLink/SDLScrollableMessageResponse.h', 'SmartDeviceLink/SDLSeatControlCapabilities.h', @@ -340,8 +341,8 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLSetDisplayLayout.h', 'SmartDeviceLink/SDLSetDisplayLayoutResponse.h', 'SmartDeviceLink/SDLSetGlobalProperties.h', -'SmartDeviceLink/SDLSetInteriorVehicleData.h', 'SmartDeviceLink/SDLSetGlobalPropertiesResponse.h', +'SmartDeviceLink/SDLSetInteriorVehicleData.h', 'SmartDeviceLink/SDLSetInteriorVehicleDataResponse.h', 'SmartDeviceLink/SDLSetMediaClockTimer.h', 'SmartDeviceLink/SDLSetMediaClockTimerResponse.h', @@ -352,7 +353,6 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLShowConstantTBTResponse.h', 'SmartDeviceLink/SDLShowResponse.h', 'SmartDeviceLink/SDLSingleTireStatus.h', -'SmartDeviceLink/SDLSISData.h', 'SmartDeviceLink/SDLSlider.h', 'SmartDeviceLink/SDLSliderResponse.h', 'SmartDeviceLink/SDLSoftButton.h', @@ -366,6 +366,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLStartTime.h', 'SmartDeviceLink/SDLStaticIconName.h', 'SmartDeviceLink/SDLStationIDNumber.h', +'SmartDeviceLink/SDLStreamingAudioManagerType.h', 'SmartDeviceLink/SDLStreamingMediaConfiguration.h', 'SmartDeviceLink/SDLStreamingMediaManager.h', 'SmartDeviceLink/SDLStreamingMediaManagerConstants.h', @@ -379,7 +380,6 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLSubscribeWaypointsResponse.h', 'SmartDeviceLink/SDLSupportedSeat.h', 'SmartDeviceLink/SDLSyncMsgVersion.h', -'SmartDeviceLink/SDLMsgVersion.h', 'SmartDeviceLink/SDLSyncPData.h', 'SmartDeviceLink/SDLSyncPDataResponse.h', 'SmartDeviceLink/SDLSystemAction.h', @@ -389,10 +389,12 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLSystemContext.h', 'SmartDeviceLink/SDLSystemRequest.h', 'SmartDeviceLink/SDLTBTState.h', +'SmartDeviceLink/SDLTPMS.h', +'SmartDeviceLink/SDLTTSChunk.h', 'SmartDeviceLink/SDLTemperature.h', 'SmartDeviceLink/SDLTemperatureUnit.h', -'SmartDeviceLink/SDLTemplateConfiguration.h', 'SmartDeviceLink/SDLTemplateColorScheme.h', +'SmartDeviceLink/SDLTemplateConfiguration.h', 'SmartDeviceLink/SDLTextAlignment.h', 'SmartDeviceLink/SDLTextField.h', 'SmartDeviceLink/SDLTextFieldName.h', @@ -405,9 +407,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLTouchManager.h', 'SmartDeviceLink/SDLTouchManagerDelegate.h', 'SmartDeviceLink/SDLTouchType.h', -'SmartDeviceLink/SDLTPMS.h', 'SmartDeviceLink/SDLTriggerSource.h', -'SmartDeviceLink/SDLTTSChunk.h', 'SmartDeviceLink/SDLTurn.h', 'SmartDeviceLink/SDLTurnSignal.h', 'SmartDeviceLink/SDLUnpublishAppService.h', @@ -430,8 +430,8 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLVehicleDataResultCode.h', 'SmartDeviceLink/SDLVehicleDataStatus.h', 'SmartDeviceLink/SDLVehicleDataType.h', -'SmartDeviceLink/SDLVentilationMode.h', 'SmartDeviceLink/SDLVehicleType.h', +'SmartDeviceLink/SDLVentilationMode.h', 'SmartDeviceLink/SDLVersion.h', 'SmartDeviceLink/SDLVideoStreamingCapability.h', 'SmartDeviceLink/SDLVideoStreamingCodec.h', @@ -447,12 +447,12 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLWeatherData.h', 'SmartDeviceLink/SDLWeatherServiceData.h', 'SmartDeviceLink/SDLWeatherServiceManifest.h', -'SmartDeviceLink/SDLWiperStatus.h', 'SmartDeviceLink/SDLWindowCapability.h', +'SmartDeviceLink/SDLWindowState.h', +'SmartDeviceLink/SDLWindowStatus.h', 'SmartDeviceLink/SDLWindowType.h', 'SmartDeviceLink/SDLWindowTypeCapabilities.h', -'SmartDeviceLink/SDLWindowStatus.h', -'SmartDeviceLink/SDLWindowState.h', +'SmartDeviceLink/SDLWiperStatus.h', 'SmartDeviceLink/SmartDeviceLink.h', ] end diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index daa30dd8c..712262283 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -71,7 +71,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 initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: 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 initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:vin:windowStatus:wiperStatus: instead"); /** * Convenience init for getting data for all possible vehicle data items. @@ -107,7 +107,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 initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: 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 initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:vin:windowStatus:wiperStatus: instead"); /** * Convenience init for getting data for all possible vehicle data items. @@ -144,7 +144,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 initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: 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 initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:vin:windowStatus:wiperStatus: instead"); /** * Convenience init for getting data for all possible vehicle data items. @@ -178,12 +178,48 @@ NS_ASSUME_NONNULL_BEGIN * @param tirePressure Get tirePressure data * @param turnSignal Get turnSignal data * @param vin Get vin data - * @param wiperStatus Get wiperStatus data * @param windowStatus Get windowStatus data + * @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 windowStatus:(BOOL)windowStatus; - +- (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 windowStatus:(BOOL)windowStatus wiperStatus:(BOOL)wiperStatus; + +/** + * note: RPC generator produced initializer + * @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 + * @param turnSignal - turnSignal + * @param vin - vin + * @param prndl - prndl + * @param tirePressure - tirePressure + * @param odometer - odometer + * @param beltStatus - beltStatus + * @param bodyInformation - bodyInformation + * @param deviceStatus - deviceStatus + * @param driverBraking - driverBraking + * @param wiperStatus - wiperStatus + * @param headLampStatus - headLampStatus + * @param engineTorque - engineTorque + * @param accPedalPosition - accPedalPosition + * @param steeringWheelAngle - steeringWheelAngle + * @param engineOilLife - engineOilLife + * @param electronicParkBrakeStatus - electronicParkBrakeStatus + * @param cloudAppVehicleID - cloudAppVehicleID + * @param eCallInfo - eCallInfo + * @param airbagStatus - airbagStatus + * @param emergencyEvent - emergencyEvent + * @param clusterModeStatus - clusterModeStatus + * @param myKey - myKey + * @param windowStatus - windowStatus + * @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 windowStatus:(nullable NSNumber<SDLBool> *)windowStatus; /** * A boolean value. If true, requests GPS data. * @@ -419,7 +455,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional. * - * @since SDL 6.2.0 + * @since SDL 7.0.0 */ @property (strong, nonatomic, nullable) NSNumber<SDLBool> *windowStatus; diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m index 379423eff..dbef3fe4a 100644 --- a/SmartDeviceLink/SDLGetVehicleData.m +++ b/SmartDeviceLink/SDLGetVehicleData.m @@ -51,14 +51,18 @@ 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 initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:NO emergencyEvent:emergencyEvent engineOilLife:NO engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:NO gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:tirePressure turnSignal:NO vin:vin wiperStatus:wiperStatus]; + return [self initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation cloudAppVehicleID:NO clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:NO emergencyEvent:emergencyEvent engineOilLife:NO engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:NO gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:steeringWheelAngle turnSignal:NO vin:vin windowStatus:NO wiperStatus:wiperStatus]; } - (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 initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation cloudAppVehicleID:NO clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:electronicParkBrakeStatus emergencyEvent:emergencyEvent engineOilLife:engineOilLife engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:fuelRange gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:tirePressure turnSignal:turnSignal vin:vin wiperStatus:wiperStatus]; + return [self initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation cloudAppVehicleID:NO clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:electronicParkBrakeStatus emergencyEvent:emergencyEvent engineOilLife:engineOilLife engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:fuelRange gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:steeringWheelAngle turnSignal:turnSignal vin:vin windowStatus:NO wiperStatus:wiperStatus]; } - (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 initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation cloudAppVehicleID:cloudAppVehicleID clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:electronicParkBrakeStatus emergencyEvent:emergencyEvent engineOilLife:engineOilLife engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:fuelRange gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:steeringWheelAngle turnSignal:turnSignal vin:vin windowStatus:NO wiperStatus:wiperStatus]; +} + +- (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 windowStatus:(BOOL)windowStatus wiperStatus:(BOOL)wiperStatus { self = [self init]; if (!self) { return nil; @@ -94,48 +98,47 @@ NS_ASSUME_NONNULL_BEGIN self.turnSignal = @(turnSignal); self.vin = @(vin); self.wiperStatus = @(wiperStatus); + self.windowStatus = @(windowStatus); 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 vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus windowStatus:(BOOL)windowStatus { - self = [self init]; +- (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 windowStatus:(nullable NSNumber<SDLBool> *)windowStatus { + self = [super init]; if (!self) { return nil; } - - self.accPedalPosition = @(accelerationPedalPosition); - self.airbagStatus = @(airbagStatus); - self.beltStatus = @(beltStatus); - self.bodyInformation = @(bodyInformation); - self.cloudAppVehicleID = @(cloudAppVehicleID); - self.clusterModeStatus = @(clusterModeStatus); - self.deviceStatus = @(deviceStatus); - self.driverBraking = @(driverBraking); - self.eCallInfo = @(eCallInfo); - self.electronicParkBrakeStatus = @(electronicParkBrakeStatus); - self.emergencyEvent = @(emergencyEvent); - self.engineOilLife = @(engineOilLife); - self.engineTorque = @(engineTorque); - self.externalTemperature = @(externalTemperature); - self.fuelLevel = @(fuelLevel); - self.fuelLevel_State = @(fuelLevelState); - self.fuelRange = @(fuelRange); - self.myKey = @(myKey); - self.odometer = @(odometer); - self.gps = @(gps); - self.headLampStatus = @(headLampStatus); - self.instantFuelConsumption = @(instantFuelConsumption); - self.prndl = @(prndl); - self.rpm = @(rpm); - self.speed = @(speed); - self.steeringWheelAngle = @(steeringWheelAngle); - self.tirePressure = @(tirePressure); - self.turnSignal = @(turnSignal); - self.vin = @(vin); - self.wiperStatus = @(wiperStatus); - self.windowStatus = @(windowStatus); - + 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; + self.turnSignal = turnSignal; + self.vin = vin; + self.prndl = prndl; + self.tirePressure = tirePressure; + self.odometer = odometer; + self.beltStatus = beltStatus; + self.bodyInformation = bodyInformation; + self.deviceStatus = deviceStatus; + self.driverBraking = driverBraking; + self.wiperStatus = wiperStatus; + self.headLampStatus = headLampStatus; + self.engineTorque = engineTorque; + self.accPedalPosition = accPedalPosition; + self.steeringWheelAngle = steeringWheelAngle; + self.engineOilLife = engineOilLife; + self.electronicParkBrakeStatus = electronicParkBrakeStatus; + self.cloudAppVehicleID = cloudAppVehicleID; + self.eCallInfo = eCallInfo; + self.airbagStatus = airbagStatus; + self.emergencyEvent = emergencyEvent; + self.clusterModeStatus = clusterModeStatus; + self.myKey = myKey; + self.windowStatus = windowStatus; return self; } diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 8b05f7df7..ee228c79f 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -32,9 +32,9 @@ #import "SDLComponentVolumeStatus.h" #import "SDLElectronicParkBrakeStatus.h" -#import "SDLTurnSignal.h" #import "SDLPRNDL.h" #import "SDLRPCResponse.h" +#import "SDLTurnSignal.h" #import "SDLVehicleDataEventStatus.h" #import "SDLWiperStatus.h" @@ -46,8 +46,8 @@ @class SDLECallInfo; @class SDLEmergencyEvent; @class SDLFuelRange; -@class SDLHeadLampStatus; @class SDLGPSData; +@class SDLHeadLampStatus; @class SDLMyKey; @class SDLTireStatus; @class SDLWindowStatus; @@ -60,123 +60,167 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLGetVehicleDataResponse : SDLRPCResponse /** - The car current GPS coordinates + * note: RPC generator produced initializer + * @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) + * @param turnSignal - turnSignal + * @param vin - vin + * @param prndl - prndl + * @param tirePressure - tirePressure + * @param odometer - odometer + * @param beltStatus - beltStatus + * @param bodyInformation - bodyInformation + * @param deviceStatus - deviceStatus + * @param driverBraking - driverBraking + * @param wiperStatus - wiperStatus + * @param headLampStatus - headLampStatus + * @param engineTorque - @(engineTorque) + * @param accPedalPosition - @(accPedalPosition) + * @param steeringWheelAngle - @(steeringWheelAngle) + * @param engineOilLife - @(engineOilLife) + * @param electronicParkBrakeStatus - electronicParkBrakeStatus + * @param cloudAppVehicleID - cloudAppVehicleID + * @param eCallInfo - eCallInfo + * @param airbagStatus - airbagStatus + * @param emergencyEvent - emergencyEvent + * @param clusterModeStatus - clusterModeStatus + * @param myKey - myKey + * @param windowStatus - windowStatus + * @return A SDLGetVehicleDataResponse 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 windowStatus:(nullable NSArray<SDLWindowStatus *> *)windowStatus; - Optional. +/** + Accelerator pedal position (percentage depressed) + + Optional. */ -@property (strong, nonatomic, nullable) SDLGPSData *gps; +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *accPedalPosition; /** - The vehicle speed in kilometers per hour + The status of the air bags Optional. */ -@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *speed; +@property (strong, nonatomic, nullable) SDLAirbagStatus *airbagStatus; /** - The number of revolutions per minute of the engine. + The status of the seat belts Optional. */ -@property (strong, nonatomic, nullable) NSNumber<SDLInt> *rpm; +@property (strong, nonatomic, nullable) SDLBeltStatus *beltStatus; /** - The fuel level in the tank (percentage) + The body information including power modes Optional. */ -@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *fuelLevel; +@property (strong, nonatomic, nullable) SDLBodyInformation *bodyInformation; /** - The fuel level state + The cloud app vehicle ID Optional. */ -@property (strong, nonatomic, nullable) SDLComponentVolumeStatus fuelLevel_State; +@property (strong, nonatomic, nullable) NSString *cloudAppVehicleID; /** - The estimate range in KM the vehicle can travel based on fuel level and consumption + The status modes of the cluster - Optional, Array of length 0 - 100, of SDLFuelRange + Optional. */ -@property (strong, nonatomic, nullable) NSArray<SDLFuelRange *> *fuelRange; +@property (strong, nonatomic, nullable) SDLClusterModeStatus *clusterModeStatus; /** - The instantaneous fuel consumption in microlitres + The IVI system status including signal and battery strength Optional. */ -@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *instantFuelConsumption; +@property (strong, nonatomic, nullable) SDLDeviceStatus *deviceStatus; /** - The external temperature in degrees celsius. + The status of the brake pedal Optional. */ -@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *externalTemperature; +@property (strong, nonatomic, nullable) SDLVehicleDataEventStatus driverBraking; /** - The Vehicle Identification Number + Emergency Call notification and confirmation data Optional. */ -@property (strong, nonatomic, nullable) NSString *vin; +@property (strong, nonatomic, nullable) SDLECallInfo *eCallInfo; /** - The current gear shift state of the user's vehicle + The status of the electronic parking brake Optional. */ -@property (strong, nonatomic, nullable) SDLPRNDL prndl; +@property (strong, nonatomic, nullable) SDLElectronicParkBrakeStatus electronicParkBrakeStatus; /** - The current pressure warnings for the user's vehicle + Information related to an emergency event (and if it occurred) Optional. */ -@property (strong, nonatomic, nullable) SDLTireStatus *tirePressure; +@property (strong, nonatomic, nullable) SDLEmergencyEvent *emergencyEvent; /** - Odometer reading in km + The estimated percentage (0% - 100%) of remaining oil life of the engine Optional. */ -@property (strong, nonatomic, nullable) NSNumber<SDLInt> *odometer; +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *engineOilLife; /** - The status of the seat belts + Torque value for engine (in Nm) on non-diesel variants Optional. */ -@property (strong, nonatomic, nullable) SDLBeltStatus *beltStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *engineTorque; /** - The body information including power modes + The external temperature in degrees celsius. Optional. */ -@property (strong, nonatomic, nullable) SDLBodyInformation *bodyInformation; +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *externalTemperature; /** - The IVI system status including signal and battery strength + The fuel level in the tank (percentage) Optional. */ -@property (strong, nonatomic, nullable) SDLDeviceStatus *deviceStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *fuelLevel; /** - The status of the brake pedal + The fuel level state Optional. */ -@property (strong, nonatomic, nullable) SDLVehicleDataEventStatus driverBraking; +@property (strong, nonatomic, nullable) SDLComponentVolumeStatus fuelLevel_State; /** - The status of the wipers + The estimate range in KM the vehicle can travel based on fuel level and consumption - Optional. + Optional, Array of length 0 - 100, of SDLFuelRange */ -@property (strong, nonatomic, nullable) SDLWiperStatus wiperStatus; +@property (strong, nonatomic, nullable) NSArray<SDLFuelRange *> *fuelRange; + +/** + The car current GPS coordinates + + Optional. + */ +@property (strong, nonatomic, nullable) SDLGPSData *gps; /** Status of the head lamps @@ -186,88 +230,90 @@ NS_ASSUME_NONNULL_BEGIN @property (strong, nonatomic, nullable) SDLHeadLampStatus *headLampStatus; /** - The estimated percentage (0% - 100%) of remaining oil life of the engine + The instantaneous fuel consumption in microlitres Optional. */ -@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *engineOilLife; +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *instantFuelConsumption; /** - Torque value for engine (in Nm) on non-diesel variants + Information related to the MyKey feature Optional. */ -@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *engineTorque; +@property (strong, nonatomic, nullable) SDLMyKey *myKey; /** - Accelerator pedal position (percentage depressed) + Odometer reading in km Optional. */ -@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *accPedalPosition; +@property (strong, nonatomic, nullable) NSNumber<SDLInt> *odometer; /** - Current angle of the steering wheel (in deg) + The current gear shift state of the user's vehicle Optional. */ -@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *steeringWheelAngle; +@property (strong, nonatomic, nullable) SDLPRNDL prndl; /** - Emergency Call notification and confirmation data + The number of revolutions per minute of the engine. Optional. */ -@property (strong, nonatomic, nullable) SDLECallInfo *eCallInfo; +@property (strong, nonatomic, nullable) NSNumber<SDLInt> *rpm; /** - The status of the air bags + The vehicle speed in kilometers per hour Optional. */ -@property (strong, nonatomic, nullable) SDLAirbagStatus *airbagStatus; +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *speed; /** - Information related to an emergency event (and if it occurred) + Current angle of the steering wheel (in deg) Optional. */ -@property (strong, nonatomic, nullable) SDLEmergencyEvent *emergencyEvent; +@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *steeringWheelAngle; /** - The status modes of the cluster + The current pressure warnings for the user's vehicle Optional. */ -@property (strong, nonatomic, nullable) SDLClusterModeStatus *clusterModeStatus; +@property (strong, nonatomic, nullable) SDLTireStatus *tirePressure; /** - Information related to the MyKey feature + The status of the turn signal Optional. */ -@property (strong, nonatomic, nullable) SDLMyKey *myKey; +@property (strong, nonatomic, nullable) SDLTurnSignal turnSignal; /** - The status of the electronic parking brake + The Vehicle Identification Number Optional. */ -@property (strong, nonatomic, nullable) SDLElectronicParkBrakeStatus electronicParkBrakeStatus; +@property (strong, nonatomic, nullable) NSString *vin; /** - The status of the turn signal - - Optional. + * See WindowStatus + * + * Optional. + * + * @since SDL 7.0.0 */ -@property (strong, nonatomic, nullable) SDLTurnSignal turnSignal; +@property (strong, nonatomic, nullable) NSArray<SDLWindowStatus *> *windowStatus; /** - The cloud app vehicle ID + The status of the wipers Optional. */ -@property (strong, nonatomic, nullable) NSString *cloudAppVehicleID; +@property (strong, nonatomic, nullable) SDLWiperStatus wiperStatus; /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. @@ -289,15 +335,6 @@ NS_ASSUME_NONNULL_BEGIN */ - (nullable NSObject *)getOEMCustomVehicleData:(NSString *)vehicleDataName; -/** - * See WindowStatus - * - * Optional. - * - * @since SDL 6.2.0 - */ -@property (strong, nonatomic, nullable) NSArray<SDLWindowStatus *> *windowStatus; - @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m index 7c987fb17..828234346 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m @@ -41,8 +41,8 @@ #import "SDLElectronicParkBrakeStatus.h" #import "SDLEmergencyEvent.h" #import "SDLFuelRange.h" -#import "SDLGetVehicleDataResponse.h" #import "SDLGPSData.h" +#import "SDLGetVehicleDataResponse.h" #import "SDLHeadLampStatus.h" #import "SDLMyKey.h" #import "SDLPRNDL.h" @@ -69,6 +69,45 @@ 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 windowStatus:(nullable NSArray<SDLWindowStatus *> *)windowStatus { + self = [self init]; + if (!self) { + return nil; + } + 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); + self.turnSignal = turnSignal; + self.vin = vin; + self.prndl = prndl; + self.tirePressure = tirePressure; + self.odometer = odometer; + self.beltStatus = beltStatus; + self.bodyInformation = bodyInformation; + self.deviceStatus = deviceStatus; + self.driverBraking = driverBraking; + self.wiperStatus = wiperStatus; + self.headLampStatus = headLampStatus; + self.engineTorque = @(engineTorque); + self.accPedalPosition = @(accPedalPosition); + self.steeringWheelAngle = @(steeringWheelAngle); + self.engineOilLife = @(engineOilLife); + self.electronicParkBrakeStatus = electronicParkBrakeStatus; + self.cloudAppVehicleID = cloudAppVehicleID; + self.eCallInfo = eCallInfo; + self.airbagStatus = airbagStatus; + self.emergencyEvent = emergencyEvent; + self.clusterModeStatus = clusterModeStatus; + self.myKey = myKey; + self.windowStatus = windowStatus; + return self; +} + - (void)setGps:(nullable SDLGPSData *)gps { [self.parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index d30ddf3c5..45c464fd3 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -62,6 +62,43 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLOnVehicleData : SDLRPCNotification /** + * note: RPC generator produced initializer + * @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) + * @param turnSignal - turnSignal + * @param vin - vin + * @param prndl - prndl + * @param tirePressure - tirePressure + * @param odometer - odometer + * @param beltStatus - beltStatus + * @param bodyInformation - bodyInformation + * @param deviceStatus - deviceStatus + * @param driverBraking - driverBraking + * @param wiperStatus - wiperStatus + * @param headLampStatus - headLampStatus + * @param engineTorque - @(engineTorque) + * @param accPedalPosition - @(accPedalPosition) + * @param steeringWheelAngle - @(steeringWheelAngle) + * @param engineOilLife - @(engineOilLife) + * @param electronicParkBrakeStatus - electronicParkBrakeStatus + * @param cloudAppVehicleID - cloudAppVehicleID + * @param eCallInfo - eCallInfo + * @param airbagStatus - airbagStatus + * @param emergencyEvent - emergencyEvent + * @param clusterModeStatus - clusterModeStatus + * @param myKey - myKey + * @param windowStatus - windowStatus + * @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 windowStatus:(nullable NSArray<SDLWindowStatus *> *)windowStatus; + +/** The car current GPS coordinates Optional. @@ -296,7 +333,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional. * - * @since SDL 6.2.0 + * @since SDL 7.0.0 */ @property (strong, nonatomic, nullable) NSArray<SDLWindowStatus *> *windowStatus; diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m index a25d107e8..5b7d972a0 100644 --- a/SmartDeviceLink/SDLOnVehicleData.m +++ b/SmartDeviceLink/SDLOnVehicleData.m @@ -69,6 +69,45 @@ 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 windowStatus:(nullable NSArray<SDLWindowStatus *> *)windowStatus { + self = [super init]; + if (!self) { + return nil; + } + 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); + self.turnSignal = turnSignal; + self.vin = vin; + self.prndl = prndl; + self.tirePressure = tirePressure; + self.odometer = odometer; + self.beltStatus = beltStatus; + self.bodyInformation = bodyInformation; + self.deviceStatus = deviceStatus; + self.driverBraking = driverBraking; + self.wiperStatus = wiperStatus; + self.headLampStatus = headLampStatus; + self.engineTorque = @(engineTorque); + self.accPedalPosition = @(accPedalPosition); + self.steeringWheelAngle = @(steeringWheelAngle); + self.engineOilLife = @(engineOilLife); + self.electronicParkBrakeStatus = electronicParkBrakeStatus; + self.cloudAppVehicleID = cloudAppVehicleID; + self.eCallInfo = eCallInfo; + self.airbagStatus = airbagStatus; + self.emergencyEvent = emergencyEvent; + self.clusterModeStatus = clusterModeStatus; + self.myKey = myKey; + self.windowStatus = windowStatus; + return self; +} + - (void)setGps:(nullable SDLGPSData *)gps { [self.parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index d972b7d7e..ca9e260ca 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -183,207 +183,252 @@ NS_ASSUME_NONNULL_BEGIN - (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 windowStatus:(BOOL)windowStatus; /** - * A boolean value. If true, subscribes GPS data. + * note: RPC generator produced initializer + * @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 + * @param turnSignal - turnSignal + * @param prndl - prndl + * @param tirePressure - tirePressure + * @param odometer - odometer + * @param beltStatus - beltStatus + * @param bodyInformation - bodyInformation + * @param deviceStatus - deviceStatus + * @param driverBraking - driverBraking + * @param wiperStatus - wiperStatus + * @param headLampStatus - headLampStatus + * @param engineTorque - engineTorque + * @param accPedalPosition - accPedalPosition + * @param steeringWheelAngle - steeringWheelAngle + * @param engineOilLife - engineOilLife + * @param electronicParkBrakeStatus - electronicParkBrakeStatus + * @param cloudAppVehicleID - cloudAppVehicleID + * @param eCallInfo - eCallInfo + * @param airbagStatus - airbagStatus + * @param emergencyEvent - emergencyEvent + * @param clusterModeStatus - clusterModeStatus + * @param myKey - myKey + * @param windowStatus - windowStatus + * @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 windowStatus:(nullable NSNumber<SDLBool> *)windowStatus; + +/** + * A boolean value. If true, subscribes Acc Pedal Position data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *gps; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *accPedalPosition; /** - * A boolean value. If true, subscribes Speed data. + * A boolean value. If true, subscribes Airbag Status data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *speed; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *airbagStatus; /** - * A boolean value. If true, subscribes RPM data. + * A boolean value. If true, subscribes Belt Status data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *rpm; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *beltStatus; /** - * A boolean value. If true, subscribes Fuel Level data. + * A boolean value. If true, subscribes Body Information data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *bodyInformation; /** - * A boolean value. If true, subscribes Fuel Level State data. + * A boolean value. If true, subscribes to the cloud app vehicle ID. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel_State; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *cloudAppVehicleID; /** - * A boolean value. If true, subscribes Fuel Range data. + * A boolean value. If true, subscribes Cluster Mode Status data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelRange; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *clusterModeStatus; /** - * A boolean value. If true, subscribes Instant Fuel Consumption data. + * A boolean value. If true, subscribes Device Status data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *instantFuelConsumption; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *deviceStatus; /** - * A boolean value. If true, subscribes External Temperature data. + * A boolean value. If true, subscribes Driver Braking data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *externalTemperature; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *driverBraking; /** - * A boolean value. If true, subscribes PRNDL data. + * A boolean value. If true, subscribes eCall Info data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *prndl; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *eCallInfo; /** - * A boolean value. If true, subscribes Tire Pressure status data. + * A boolean value. If true, subscribes to the electronic parking brake status. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *tirePressure; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *electronicParkBrakeStatus; /** - * A boolean value. If true, subscribes Odometer data. + * A boolean value. If true, subscribes Emergency Event data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *odometer; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *emergencyEvent; /** - * A boolean value. If true, subscribes Belt Status data. + * A boolean value. If true, subscribes to Engine Oil Life data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *beltStatus; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineOilLife; /** - * A boolean value. If true, subscribes Body Information data. + * A boolean value. If true, subscribes Engine Torque data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *bodyInformation; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineTorque; /** - * A boolean value. If true, subscribes Device Status data. + * A boolean value. If true, subscribes External Temperature data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *deviceStatus; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *externalTemperature; /** - * A boolean value. If true, subscribes Driver Braking data. + * A boolean value. If true, subscribes Fuel Level data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *driverBraking; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel; /** - * A boolean value. If true, subscribes Wiper Status data. + * A boolean value. If true, subscribes Fuel Level State data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *wiperStatus; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel_State; /** - * A boolean value. If true, subscribes Head Lamp Status data. + * A boolean value. If true, subscribes Fuel Range data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *headLampStatus; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelRange; /** - * A boolean value. If true, subscribes to Engine Oil Life data. + * A boolean value. If true, subscribes GPS data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineOilLife; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *gps; /** - * A boolean value. If true, subscribes Engine Torque data. + * A boolean value. If true, subscribes Head Lamp Status data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineTorque; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *headLampStatus; /** - * A boolean value. If true, subscribes Acc Pedal Position data. + * A boolean value. If true, subscribes Instant Fuel Consumption data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *accPedalPosition; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *instantFuelConsumption; /** - * A boolean value. If true, subscribes Steering Wheel Angle data. + * A boolean value. If true, subscribes myKey data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *steeringWheelAngle; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *myKey; /** - * A boolean value. If true, subscribes eCall Info data. + * A boolean value. If true, subscribes Odometer data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *eCallInfo; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *odometer; /** - * A boolean value. If true, subscribes Airbag Status data. + * A boolean value. If true, subscribes PRNDL data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *airbagStatus; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *prndl; /** - * A boolean value. If true, subscribes Emergency Event data. + * A boolean value. If true, subscribes RPM data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *emergencyEvent; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *rpm; /** - * A boolean value. If true, subscribes Cluster Mode Status data. + * A boolean value. If true, subscribes Speed data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *clusterModeStatus; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *speed; /** - * A boolean value. If true, subscribes myKey data. + * A boolean value. If true, subscribes Steering Wheel Angle data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *myKey; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *steeringWheelAngle; /** - * A boolean value. If true, subscribes to the electronic parking brake status. + * A boolean value. If true, subscribes Tire Pressure status data. * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *electronicParkBrakeStatus; +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *tirePressure; /** * A boolean value. If true, subscribes to the turn signal status. * * Optional. - */ +*/ @property (strong, nonatomic, nullable) NSNumber<SDLBool> *turnSignal; /** - * A boolean value. If true, subscribes to the cloud app vehicle ID. + * See WindowStatus * * Optional. - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *cloudAppVehicleID; + * + * @since SDL 7.0.0 +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *windowStatus; + +/** + * A boolean value. If true, subscribes Wiper Status data. + * + * Optional. +*/ +@property (strong, nonatomic, nullable) NSNumber<SDLBool> *wiperStatus; /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. @@ -405,15 +450,6 @@ NS_ASSUME_NONNULL_BEGIN */ - (nullable NSNumber<SDLBool> *)getOEMCustomVehicleData:(NSString *)vehicleDataName; -/** - * See WindowStatus - * - * Optional. - * - * @since SDL 6.2.0 - */ -@property (strong, nonatomic, nullable) NSNumber<SDLBool> *windowStatus; - @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m index 0e25d0a00..db7e6293b 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.m +++ b/SmartDeviceLink/SDLSubscribeVehicleData.m @@ -51,14 +51,18 @@ 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 initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:NO emergencyEvent:emergencyEvent engineOilLife:NO engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:NO gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:tirePressure turnSignal:NO wiperStatus:wiperStatus]; + return [self initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation cloudAppVehicleID:NO clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:NO emergencyEvent:emergencyEvent engineOilLife:NO engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:NO gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:tirePressure turnSignal:NO wiperStatus:NO windowStatus:NO]; } - (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 initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation cloudAppVehicleID:NO clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:electronicParkBrakeStatus emergencyEvent:emergencyEvent engineOilLife:engineOilLife engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:fuelRange gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:tirePressure turnSignal:turnSignal wiperStatus:wiperStatus]; + return [self initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation cloudAppVehicleID:NO clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:electronicParkBrakeStatus emergencyEvent:emergencyEvent engineOilLife:engineOilLife engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:fuelRange gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:tirePressure turnSignal:turnSignal wiperStatus:wiperStatus windowStatus:NO]; } - (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 initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation cloudAppVehicleID:cloudAppVehicleID clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:electronicParkBrakeStatus emergencyEvent:emergencyEvent engineOilLife:engineOilLife engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:fuelRange gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:tirePressure turnSignal:turnSignal wiperStatus:wiperStatus windowStatus:NO]; +} + +- (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 windowStatus:(BOOL)windowStatus { self = [self init]; if (!self) { return nil; @@ -93,51 +97,49 @@ NS_ASSUME_NONNULL_BEGIN self.tirePressure = @(tirePressure); self.turnSignal = @(turnSignal); self.wiperStatus = @(wiperStatus); + self.windowStatus = @(windowStatus); 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 windowStatus:(BOOL)windowStatus { +- (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 windowStatus:(nullable NSNumber<SDLBool> *)windowStatus { self = [self init]; if (!self) { return nil; } - - self.accPedalPosition = @(accelerationPedalPosition); - self.airbagStatus = @(airbagStatus); - self.beltStatus = @(beltStatus); - self.bodyInformation = @(bodyInformation); - self.cloudAppVehicleID = @(cloudAppVehicleID); - self.clusterModeStatus = @(clusterModeStatus); - self.deviceStatus = @(deviceStatus); - self.driverBraking = @(driverBraking); - self.eCallInfo = @(eCallInfo); - self.electronicParkBrakeStatus = @(electronicParkBrakeStatus); - self.emergencyEvent = @(emergencyEvent); - self.engineOilLife = @(engineOilLife); - self.engineTorque = @(engineTorque); - self.externalTemperature = @(externalTemperature); - self.fuelLevel = @(fuelLevel); - self.fuelLevel_State = @(fuelLevelState); - self.fuelRange = @(fuelRange); - self.myKey = @(myKey); - self.odometer = @(odometer); - self.gps = @(gps); - self.headLampStatus = @(headLampStatus); - self.instantFuelConsumption = @(instantFuelConsumption); - self.prndl = @(prndl); - self.rpm = @(rpm); - self.speed = @(speed); - self.steeringWheelAngle = @(steeringWheelAngle); - self.tirePressure = @(tirePressure); - self.turnSignal = @(turnSignal); - self.wiperStatus = @(wiperStatus); - self.windowStatus = @(windowStatus); - + 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; + self.turnSignal = turnSignal; + self.prndl = prndl; + self.tirePressure = tirePressure; + self.odometer = odometer; + self.beltStatus = beltStatus; + self.bodyInformation = bodyInformation; + self.deviceStatus = deviceStatus; + self.driverBraking = driverBraking; + self.wiperStatus = wiperStatus; + self.headLampStatus = headLampStatus; + self.engineTorque = engineTorque; + self.accPedalPosition = accPedalPosition; + self.steeringWheelAngle = steeringWheelAngle; + self.engineOilLife = engineOilLife; + self.electronicParkBrakeStatus = electronicParkBrakeStatus; + self.cloudAppVehicleID = cloudAppVehicleID; + self.eCallInfo = eCallInfo; + self.airbagStatus = airbagStatus; + self.emergencyEvent = emergencyEvent; + self.clusterModeStatus = clusterModeStatus; + self.myKey = myKey; + self.windowStatus = windowStatus; return self; } - - (void)setGps:(nullable NSNumber<SDLBool> *)gps { [self.parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 4e1e06768..83d8eac52 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -42,193 +42,229 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLSubscribeVehicleDataResponse : SDLRPCResponse /** - The result of requesting to subscribe to the GPSData. + * note: RPC generator produced initializer + * @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 + * @param turnSignal - turnSignal + * @param prndl - prndl + * @param tirePressure - tirePressure + * @param odometer - odometer + * @param beltStatus - beltStatus + * @param bodyInformation - bodyInformation + * @param deviceStatus - deviceStatus + * @param driverBraking - driverBraking + * @param wiperStatus - wiperStatus + * @param headLampStatus - headLampStatus + * @param engineTorque - engineTorque + * @param accPedalPosition - accPedalPosition + * @param steeringWheelAngle - steeringWheelAngle + * @param engineOilLife - engineOilLife + * @param electronicParkBrakeStatus - electronicParkBrakeStatus + * @param cloudAppVehicleID - cloudAppVehicleID + * @param eCallInfo - eCallInfo + * @param airbagStatus - airbagStatus + * @param emergencyEvent - emergencyEvent + * @param clusterModes - clusterModes + * @param myKey - myKey + * @param windowStatus - windowStatus + * @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 windowStatus:(nullable SDLVehicleDataResult *)windowStatus; + +/** + The result of requesting to subscribe to the accelerator pedal position (percentage depressed) Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *gps; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *accPedalPosition; /** - The result of requesting to subscribe to the vehicle speed in kilometers per hour. + The result of requesting to subscribe to the airbag status Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *speed; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *airbagStatus; /** - The result of requesting to subscribe to the number of revolutions per minute of the engine. + The result of requesting to subscribe to the status of the seat belts. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *rpm; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *beltStatus; /** - The result of requesting to subscribe to the fuel level in the tank (percentage) + The result of requesting to subscribe to the body information including power modes. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *bodyInformation; /** - The result of requesting to subscribe to the fuel level state. + The result of requesting to subscribe to the cloud app vehicle ID Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel_State; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *cloudAppVehicleID; /** - The result of requesting to subscribe to the fuel range. + The result of requesting to subscribe to the cluster modes Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelRange; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *clusterModes; /** - The result of requesting to subscribe to the instantaneous fuel consumption in microlitres. + The result of requesting to subscribe to the device status including signal and battery strength. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *instantFuelConsumption; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *deviceStatus; /** - The result of requesting to subscribe to the external temperature in degrees celsius. + The result of requesting to subscribe to the status of the brake pedal. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *externalTemperature; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *driverBraking; /** - The result of requesting to subscribe to the PRNDL status. + The result of requesting to subscribe to the emergency call info Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *prndl; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *eCallInfo; /** - The result of requesting to subscribe to the tireStatus. + The result of requesting to subscribe to the electronic parking brake status Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *tirePressure; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *electronicParkBrakeStatus; /** - The result of requesting to subscribe to the odometer in km. + The result of requesting to subscribe to the emergency event Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *odometer; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *emergencyEvent; /** - The result of requesting to subscribe to the status of the seat belts. + The result of requesting to subscribe to the estimated percentage of remaining oil life of the engine. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *beltStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *engineOilLife; /** - The result of requesting to subscribe to the body information including power modes. + The result of requesting to subscribe to the torque value for engine (in Nm) on non-diesel variants. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *bodyInformation; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *engineTorque; /** - The result of requesting to subscribe to the device status including signal and battery strength. + The result of requesting to subscribe to the external temperature in degrees celsius. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *deviceStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *externalTemperature; /** - The result of requesting to subscribe to the status of the brake pedal. + The result of requesting to subscribe to the fuel level in the tank (percentage) Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *driverBraking; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel; /** - The result of requesting to subscribe to the status of the wipers. + The result of requesting to subscribe to the fuel level state. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *wiperStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel_State; /** - The result of requesting to subscribe to the status of the head lamps. + The result of requesting to subscribe to the fuel range. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *headLampStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelRange; /** - The result of requesting to subscribe to the estimated percentage of remaining oil life of the engine. + The result of requesting to subscribe to the GPSData. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *engineOilLife; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *gps; /** - The result of requesting to subscribe to the torque value for engine (in Nm) on non-diesel variants. + The result of requesting to subscribe to the status of the head lamps. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *engineTorque; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *headLampStatus; /** - The result of requesting to subscribe to the accelerator pedal position (percentage depressed) + The result of requesting to subscribe to the instantaneous fuel consumption in microlitres. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *accPedalPosition; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *instantFuelConsumption; /** - The result of requesting to subscribe to the current angle of the steering wheel (in deg) + The result of requesting to subscribe to the myKey status Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *steeringWheelAngle; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *myKey; /** - The result of requesting to subscribe to the emergency call info + The result of requesting to subscribe to the odometer in km. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *eCallInfo; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *odometer; /** - The result of requesting to subscribe to the airbag status + The result of requesting to subscribe to the PRNDL status. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *airbagStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *prndl; /** - The result of requesting to subscribe to the emergency event + The result of requesting to subscribe to the number of revolutions per minute of the engine. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *emergencyEvent; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *rpm; /** - The result of requesting to subscribe to the cluster modes + The result of requesting to subscribe to the vehicle speed in kilometers per hour. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *clusterModes; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *speed; /** - The result of requesting to subscribe to the myKey status + The result of requesting to subscribe to the current angle of the steering wheel (in deg) Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *myKey; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *steeringWheelAngle; /** - The result of requesting to subscribe to the electronic parking brake status + The result of requesting to subscribe to the tireStatus. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *electronicParkBrakeStatus; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *tirePressure; /** The result of requesting to subscribe to the turn signal @@ -238,11 +274,20 @@ NS_ASSUME_NONNULL_BEGIN @property (strong, nonatomic, nullable) SDLVehicleDataResult *turnSignal; /** - The result of requesting to subscribe to the cloud app vehicle ID + * See WindowStatus + * + * Optional. + * + * @since SDL 7.0.0 + */ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *windowStatus; + +/** + The result of requesting to subscribe to the status of the wipers. Optional */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *cloudAppVehicleID; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *wiperStatus; /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. @@ -264,15 +309,6 @@ NS_ASSUME_NONNULL_BEGIN */ - (nullable SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; -/** - * See WindowStatus - * - * Optional. - * - * @since SDL 6.2.0 - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *windowStatus; - @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m index 6e51ec3ad..d3c0e2908 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m @@ -51,6 +51,44 @@ 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 windowStatus:(nullable SDLVehicleDataResult *)windowStatus { + self = [self init]; + if (!self) { + return nil; + } + 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; + self.turnSignal = turnSignal; + self.prndl = prndl; + self.tirePressure = tirePressure; + self.odometer = odometer; + self.beltStatus = beltStatus; + self.bodyInformation = bodyInformation; + self.deviceStatus = deviceStatus; + self.driverBraking = driverBraking; + self.wiperStatus = wiperStatus; + self.headLampStatus = headLampStatus; + self.engineTorque = engineTorque; + self.accPedalPosition = accPedalPosition; + self.steeringWheelAngle = steeringWheelAngle; + self.engineOilLife = engineOilLife; + self.electronicParkBrakeStatus = electronicParkBrakeStatus; + self.cloudAppVehicleID = cloudAppVehicleID; + self.eCallInfo = eCallInfo; + self.airbagStatus = airbagStatus; + self.emergencyEvent = emergencyEvent; + self.clusterModes = clusterModes; + self.myKey = myKey; + self.windowStatus = windowStatus; + return self; +} + - (void)setGps:(nullable SDLVehicleDataResult *)gps { [self.parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index e132b3d4a..dbd896102 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -70,7 +70,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 initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: 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 initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation: cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:windowStatus:wiperStatus: instead"); /** * Convenience init for unsubscribing to all possible vehicle data items. @@ -105,7 +105,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 initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: 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 initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation: cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:windowStatus:wiperStatus: instead"); /** * Convenience init for unsubscribing to all possible vehicle data items. @@ -141,7 +141,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 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 initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: 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 initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation: cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:windowStatus:wiperStatus: instead"); /** * Convenience init for unsubscribing to all possible vehicle data items. @@ -174,11 +174,47 @@ NS_ASSUME_NONNULL_BEGIN * @param steeringWheelAngle Unsubscribe to steeringWheelAngle * @param tirePressure Unsubscribe to tirePressure * @param turnSignal Unsubscribe to turnSignal - * @param wiperStatus Unsubscribe to wiperStatus * @param windowStatus Unsubscribe from windowStatus + * @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 windowStatus:(BOOL)windowStatus; +- (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 windowStatus:(BOOL)windowStatus wiperStatus:(BOOL)wiperStatus; + +/** + * note: RPC generator produced initializer + * @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 + * @param turnSignal - turnSignal + * @param prndl - prndl + * @param tirePressure - tirePressure + * @param odometer - odometer + * @param beltStatus - beltStatus + * @param bodyInformation - bodyInformation + * @param deviceStatus - deviceStatus + * @param driverBraking - driverBraking + * @param wiperStatus - wiperStatus + * @param headLampStatus - headLampStatus + * @param engineTorque - engineTorque + * @param accPedalPosition - accPedalPosition + * @param steeringWheelAngle - steeringWheelAngle + * @param engineOilLife - engineOilLife + * @param electronicParkBrakeStatus - electronicParkBrakeStatus + * @param cloudAppVehicleID - cloudAppVehicleID + * @param eCallInfo - eCallInfo + * @param airbagStatus - airbagStatus + * @param emergencyEvent - emergencyEvent + * @param clusterModeStatus - clusterModeStatus + * @param myKey - myKey + * @param windowStatus - windowStatus + * @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 windowStatus:(nullable NSNumber<SDLBool> *)windowStatus; /** * If true, unsubscribes from GPS @@ -408,7 +444,7 @@ NS_ASSUME_NONNULL_BEGIN * * Optional. * - * @since SDL 6.2.0 + * @since SDL 7.0.0 */ @property (strong, nonatomic, nullable) NSNumber<SDLBool> *windowStatus; diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m index b16fc4def..d307f986d 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m @@ -51,19 +51,18 @@ 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 initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:NO emergencyEvent:emergencyEvent engineOilLife:NO engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:NO gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:tirePressure turnSignal:NO wiperStatus:wiperStatus]; + return [self initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation cloudAppVehicleID:NO clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:NO emergencyEvent:emergencyEvent engineOilLife:NO engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:NO gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:tirePressure turnSignal:NO windowStatus:NO wiperStatus:wiperStatus]; } - (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 initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation cloudAppVehicleID:NO clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:electronicParkBrakeStatus emergencyEvent:emergencyEvent engineOilLife:engineOilLife engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:fuelRange gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:tirePressure turnSignal:turnSignal wiperStatus:wiperStatus]; + return [self initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation cloudAppVehicleID:NO clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:electronicParkBrakeStatus emergencyEvent:emergencyEvent engineOilLife:engineOilLife engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:fuelRange gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:tirePressure turnSignal:turnSignal windowStatus:NO wiperStatus:wiperStatus]; } - (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 initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation cloudAppVehicleID:cloudAppVehicleID clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:electronicParkBrakeStatus emergencyEvent:emergencyEvent engineOilLife:engineOilLife engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:fuelRange gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:tirePressure turnSignal:turnSignal wiperStatus:wiperStatus windowStatus:NO]; + return [self initWithAccelerationPedalPosition:accelerationPedalPosition airbagStatus:airbagStatus beltStatus:beltStatus bodyInformation:bodyInformation cloudAppVehicleID:cloudAppVehicleID clusterModeStatus:clusterModeStatus deviceStatus:deviceStatus driverBraking:driverBraking eCallInfo:eCallInfo electronicParkBrakeStatus:electronicParkBrakeStatus emergencyEvent:emergencyEvent engineOilLife:engineOilLife engineTorque:engineTorque externalTemperature:externalTemperature fuelLevel:fuelLevel fuelLevelState:fuelLevelState fuelRange:fuelRange gps:gps headLampStatus:headLampStatus instantFuelConsumption:instantFuelConsumption myKey:myKey odometer:odometer prndl:prndl rpm:rpm speed:speed steeringWheelAngle:steeringWheelAngle tirePressure:tirePressure turnSignal:turnSignal windowStatus:NO wiperStatus:wiperStatus]; } -- (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 windowStatus:(BOOL)windowStatus -{ +- (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 windowStatus:(BOOL)windowStatus wiperStatus:(BOOL)wiperStatus { self = [self init]; if (!self) { return nil; @@ -103,6 +102,44 @@ NS_ASSUME_NONNULL_BEGIN 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 windowStatus:(nullable NSNumber<SDLBool> *)windowStatus { + self = [self init]; + if (!self) { + return nil; + } + 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; + self.turnSignal = turnSignal; + self.prndl = prndl; + self.tirePressure = tirePressure; + self.odometer = odometer; + self.beltStatus = beltStatus; + self.bodyInformation = bodyInformation; + self.deviceStatus = deviceStatus; + self.driverBraking = driverBraking; + self.wiperStatus = wiperStatus; + self.headLampStatus = headLampStatus; + self.engineTorque = engineTorque; + self.accPedalPosition = accPedalPosition; + self.steeringWheelAngle = steeringWheelAngle; + self.engineOilLife = engineOilLife; + self.electronicParkBrakeStatus = electronicParkBrakeStatus; + self.cloudAppVehicleID = cloudAppVehicleID; + self.eCallInfo = eCallInfo; + self.airbagStatus = airbagStatus; + self.emergencyEvent = emergencyEvent; + self.clusterModeStatus = clusterModeStatus; + self.myKey = myKey; + self.windowStatus = windowStatus; + return self; +} + - (void)setGps:(nullable NSNumber<SDLBool> *)gps { [self.parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index e0b8c8304..5fc1a957a 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -42,207 +42,252 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLUnsubscribeVehicleDataResponse : SDLRPCResponse /** - The result of requesting to unsubscribe to the GPSData. - - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *gps; + * note: RPC generator produced initializer + * @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 + * @param turnSignal - turnSignal + * @param prndl - prndl + * @param tirePressure - tirePressure + * @param odometer - odometer + * @param beltStatus - beltStatus + * @param bodyInformation - bodyInformation + * @param deviceStatus - deviceStatus + * @param driverBraking - driverBraking + * @param wiperStatus - wiperStatus + * @param headLampStatus - headLampStatus + * @param engineTorque - engineTorque + * @param accPedalPosition - accPedalPosition + * @param steeringWheelAngle - steeringWheelAngle + * @param engineOilLife - engineOilLife + * @param electronicParkBrakeStatus - electronicParkBrakeStatus + * @param cloudAppVehicleID - cloudAppVehicleID + * @param eCallInfo - eCallInfo + * @param airbagStatus - airbagStatus + * @param emergencyEvent - emergencyEvent + * @param clusterModes - clusterModes + * @param myKey - myKey + * @param windowStatus - windowStatus + * @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 windowStatus:(nullable SDLVehicleDataResult *)windowStatus; + +/** +The result of requesting to unsubscribe to the accelerator pedal position (percentage depressed) + +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *accPedalPosition; /** - The result of requesting to unsubscribe to the vehicle speed in kilometers per hour. +The result of requesting to unsubscribe to the airbag status - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *speed; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *airbagStatus; /** - The result of requesting to unsubscribe to the number of revolutions per minute of the engine. +The result of requesting to unsubscribe to the status of the seat belts. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *rpm; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *beltStatus; /** - The result of requesting to unsubscribe to the fuel level in the tank (percentage) +The result of requesting to unsubscribe to the body information including power modes. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *bodyInformation; /** - The result of requesting to unsubscribe to the fuel level state. +The result of requesting to unsubscribe to the cloud app vehicle id - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel_State; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *cloudAppVehicleID; /** - The result of requesting to unsubscribe to the fuel range. +The result of requesting to unsubscribe to the cluster modes - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelRange; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *clusterModes; /** - The result of requesting to unsubscribe to the instantaneous fuel consumption in microlitres. +The result of requesting to unsubscribe to the device status including signal and battery strength. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *instantFuelConsumption; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *deviceStatus; /** - The result of requesting to unsubscribe to the external temperature in degrees celsius. +The result of requesting to unsubscribe to the status of the brake pedal. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *externalTemperature; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *driverBraking; /** - The result of requesting to unsubscribe to the PRNDL status. +The result of requesting to unsubscribe to the emergency call info - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *prndl; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *eCallInfo; /** - The result of requesting to unsubscribe to the tireStatus. +The result of requesting to unsubscribe to the electronic parking brake status - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *tirePressure; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *electronicParkBrakeStatus; /** - The result of requesting to unsubscribe to the odometer in km. +The result of requesting to unsubscribe to the emergency event - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *odometer; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *emergencyEvent; /** - The result of requesting to unsubscribe to the status of the seat belts. +The result of requesting to unsubscribe to the estimated percentage of remaining oil life of the engine. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *beltStatus; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *engineOilLife; /** - The result of requesting to unsubscribe to the body information including power modes. +The result of requesting to unsubscribe to the torque value for engine (in Nm) on non-diesel variants. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *bodyInformation; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *engineTorque; /** - The result of requesting to unsubscribe to the device status including signal and battery strength. +The result of requesting to unsubscribe to the external temperature in degrees celsius. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *deviceStatus; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *externalTemperature; /** - The result of requesting to unsubscribe to the status of the brake pedal. +The result of requesting to unsubscribe to the fuel level in the tank (percentage) - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *driverBraking; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel; /** - The result of requesting to unsubscribe to the status of the wipers. +The result of requesting to unsubscribe to the fuel level state. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *wiperStatus; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelLevel_State; /** - The result of requesting to unsubscribe to the status of the head lamps. +The result of requesting to unsubscribe to the fuel range. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *headLampStatus; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *fuelRange; /** - The result of requesting to unsubscribe to the estimated percentage of remaining oil life of the engine. +The result of requesting to unsubscribe to the GPSData. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *engineOilLife; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *gps; /** - The result of requesting to unsubscribe to the torque value for engine (in Nm) on non-diesel variants. +The result of requesting to unsubscribe to the status of the head lamps. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *engineTorque; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *headLampStatus; /** - The result of requesting to unsubscribe to the accelerator pedal position (percentage depressed) +The result of requesting to unsubscribe to the instantaneous fuel consumption in microlitres. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *accPedalPosition; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *instantFuelConsumption; /** - The result of requesting to unsubscribe to the current angle of the steering wheel (in deg) +The result of requesting to unsubscribe to the myKey status - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *steeringWheelAngle; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *myKey; /** - The result of requesting to unsubscribe to the emergency call info +The result of requesting to unsubscribe to the odometer in km. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *eCallInfo; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *odometer; /** - The result of requesting to unsubscribe to the airbag status +The result of requesting to unsubscribe to the PRNDL status. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *airbagStatus; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *prndl; /** - The result of requesting to unsubscribe to the emergency event +The result of requesting to unsubscribe to the number of revolutions per minute of the engine. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *emergencyEvent; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *rpm; /** - The result of requesting to unsubscribe to the cluster modes +The result of requesting to unsubscribe to the vehicle speed in kilometers per hour. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *clusterModes; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *speed; /** - The result of requesting to unsubscribe to the myKey status +The result of requesting to unsubscribe to the current angle of the steering wheel (in deg) - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *myKey; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *steeringWheelAngle; /** - The result of requesting to unsubscribe to the electronic parking brake status +The result of requesting to unsubscribe to the tireStatus. - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *electronicParkBrakeStatus; +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *tirePressure; /** - The result of requesting to unsubscribe to the turn signal +The result of requesting to unsubscribe to the turn signal - Optional - */ +Optional +*/ @property (strong, nonatomic, nullable) SDLVehicleDataResult *turnSignal; /** - The result of requesting to unsubscribe to the cloud app vehicle id + * See WindowStatus + * + * Optional. + * + * @since SDL 7.0.0 +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *windowStatus; - Optional - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *cloudAppVehicleID; +/** +The result of requesting to unsubscribe to the status of the wipers. + +Optional +*/ +@property (strong, nonatomic, nullable) SDLVehicleDataResult *wiperStatus; /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. @@ -264,15 +309,6 @@ NS_ASSUME_NONNULL_BEGIN */ - (nullable SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; -/** - * See WindowStatus - * - * Optional. - * - * @since SDL 6.2.0 - */ -@property (strong, nonatomic, nullable) SDLVehicleDataResult *windowStatus; - @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m index 39498a045..c6141203b 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m @@ -51,6 +51,44 @@ 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 windowStatus:(nullable SDLVehicleDataResult *)windowStatus { + self = [self init]; + if (!self) { + return nil; + } + 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; + self.turnSignal = turnSignal; + self.prndl = prndl; + self.tirePressure = tirePressure; + self.odometer = odometer; + self.beltStatus = beltStatus; + self.bodyInformation = bodyInformation; + self.deviceStatus = deviceStatus; + self.driverBraking = driverBraking; + self.wiperStatus = wiperStatus; + self.headLampStatus = headLampStatus; + self.engineTorque = engineTorque; + self.accPedalPosition = accPedalPosition; + self.steeringWheelAngle = steeringWheelAngle; + self.engineOilLife = engineOilLife; + self.electronicParkBrakeStatus = electronicParkBrakeStatus; + self.cloudAppVehicleID = cloudAppVehicleID; + self.eCallInfo = eCallInfo; + self.airbagStatus = airbagStatus; + self.emergencyEvent = emergencyEvent; + self.clusterModes = clusterModes; + self.myKey = myKey; + self.windowStatus = windowStatus; + return self; +} + - (void)setGps:(nullable SDLVehicleDataResult *)gps { [self.parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } diff --git a/SmartDeviceLink/SDLVehicleDataType.h b/SmartDeviceLink/SDLVehicleDataType.h index 98f3e4418..5ee118bf1 100644 --- a/SmartDeviceLink/SDLVehicleDataType.h +++ b/SmartDeviceLink/SDLVehicleDataType.h @@ -173,6 +173,6 @@ extern SDLVehicleDataType const SDLVehicleDataTypeOEMVehicleDataType; /** * Describes the status of a window of a door/liftgate etc. - * @since SDL 6.2.0 + * @since SDL 7.0.0 */ extern SDLVehicleDataType const SDLVehicleDataTypeWindowStatus; diff --git a/SmartDeviceLink/SDLVehicleDataType.m b/SmartDeviceLink/SDLVehicleDataType.m index 5c837a124..aceeaf102 100644 --- a/SmartDeviceLink/SDLVehicleDataType.m +++ b/SmartDeviceLink/SDLVehicleDataType.m @@ -32,36 +32,36 @@ #import "SDLVehicleDataType.h" -SDLVehicleDataType const SDLVehicleDataTypeGPS = @"VEHICLEDATA_GPS"; -SDLVehicleDataType const SDLVehicleDataTypeSpeed = @"VEHICLEDATA_SPEED"; -SDLVehicleDataType const SDLVehicleDataTypeRPM = @"VEHICLEDATA_RPM"; -SDLVehicleDataType const SDLVehicleDataTypeFuelLevel = @"VEHICLEDATA_FUELLEVEL"; -SDLVehicleDataType const SDLVehicleDataTypeFuelLevelState = @"VEHICLEDATA_FUELLEVEL_STATE"; -SDLVehicleDataType const SDLVehicleDataTypeFuelConsumption = @"VEHICLEDATA_FUELCONSUMPTION"; -SDLVehicleDataType const SDLVehicleDataTypeFuelRange = @"VEHICLEDATA_FUELRANGE"; -SDLVehicleDataType const SDLVehicleDataTypeExternalTemperature = @"VEHICLEDATA_EXTERNTEMP"; -SDLVehicleDataType const SDLVehicleDataTypeVIN = @"VEHICLEDATA_VIN"; -SDLVehicleDataType const SDLVehicleDataTypePRNDL = @"VEHICLEDATA_PRNDL"; -SDLVehicleDataType const SDLVehicleDataTypeTirePressure = @"VEHICLEDATA_TIREPRESSURE"; -SDLVehicleDataType const SDLVehicleDataTypeOdometer = @"VEHICLEDATA_ODOMETER"; +SDLVehicleDataType const SDLVehicleDataTypeAccelerationPedal = @"VEHICLEDATA_ACCPEDAL"; +SDLVehicleDataType const SDLVehicleDataTypeAirbagStatus = @"VEHICLEDATA_AIRBAGSTATUS"; +SDLVehicleDataType const SDLVehicleDataTypeBatteryVoltage = @"VEHICLEDATA_BATTVOLTAGE"; SDLVehicleDataType const SDLVehicleDataTypeBeltStatus = @"VEHICLEDATA_BELTSTATUS"; SDLVehicleDataType const SDLVehicleDataTypeBodyInfo = @"VEHICLEDATA_BODYINFO"; +SDLVehicleDataType const SDLVehicleDataTypeBraking = @"VEHICLEDATA_BRAKING"; +SDLVehicleDataType const SDLVehicleDataTypeCloudAppVehicleID = @"VEHICLEDATA_CLOUDAPPVEHICLEID"; +SDLVehicleDataType const SDLVehicleDataTypeClusterModeStatus = @"VEHICLEDATA_CLUSTERMODESTATUS"; SDLVehicleDataType const SDLVehicleDataTypeDeviceStatus = @"VEHICLEDATA_DEVICESTATUS"; SDLVehicleDataType const SDLVehicleDataTypeECallInfo = @"VEHICLEDATA_ECALLINFO"; -SDLVehicleDataType const SDLVehicleDataTypeAirbagStatus = @"VEHICLEDATA_AIRBAGSTATUS"; +SDLVehicleDataType const SDLVehicleDataTypeElectronicParkBrakeStatus = @"VEHICLEDATA_ELECTRONICPARKBRAKESTATUS"; SDLVehicleDataType const SDLVehicleDataTypeEmergencyEvent = @"VEHICLEDATA_EMERGENCYEVENT"; -SDLVehicleDataType const SDLVehicleDataTypeClusterModeStatus = @"VEHICLEDATA_CLUSTERMODESTATUS"; -SDLVehicleDataType const SDLVehicleDataTypeMyKey = @"VEHICLEDATA_MYKEY"; -SDLVehicleDataType const SDLVehicleDataTypeBraking = @"VEHICLEDATA_BRAKING"; -SDLVehicleDataType const SDLVehicleDataTypeWiperStatus = @"VEHICLEDATA_WIPERSTATUS"; -SDLVehicleDataType const SDLVehicleDataTypeHeadlampStatus = @"VEHICLEDATA_HEADLAMPSTATUS"; -SDLVehicleDataType const SDLVehicleDataTypeBatteryVoltage = @"VEHICLEDATA_BATTVOLTAGE"; SDLVehicleDataType const SDLVehicleDataTypeEngineOilLife = @"VEHICLEDATA_ENGINEOILLIFE"; SDLVehicleDataType const SDLVehicleDataTypeEngineTorque = @"VEHICLEDATA_ENGINETORQUE"; -SDLVehicleDataType const SDLVehicleDataTypeAccelerationPedal = @"VEHICLEDATA_ACCPEDAL"; +SDLVehicleDataType const SDLVehicleDataTypeExternalTemperature = @"VEHICLEDATA_EXTERNTEMP"; +SDLVehicleDataType const SDLVehicleDataTypeFuelConsumption = @"VEHICLEDATA_FUELCONSUMPTION"; +SDLVehicleDataType const SDLVehicleDataTypeFuelLevel = @"VEHICLEDATA_FUELLEVEL"; +SDLVehicleDataType const SDLVehicleDataTypeFuelLevelState = @"VEHICLEDATA_FUELLEVEL_STATE"; +SDLVehicleDataType const SDLVehicleDataTypeFuelRange = @"VEHICLEDATA_FUELRANGE"; +SDLVehicleDataType const SDLVehicleDataTypeGPS = @"VEHICLEDATA_GPS"; +SDLVehicleDataType const SDLVehicleDataTypeHeadlampStatus = @"VEHICLEDATA_HEADLAMPSTATUS"; +SDLVehicleDataType const SDLVehicleDataTypeMyKey = @"VEHICLEDATA_MYKEY"; +SDLVehicleDataType const SDLVehicleDataTypeOEMVehicleDataType = @"VEHICLEDATA_OEM_CUSTOM_DATA"; +SDLVehicleDataType const SDLVehicleDataTypeOdometer = @"VEHICLEDATA_ODOMETER"; +SDLVehicleDataType const SDLVehicleDataTypePRNDL = @"VEHICLEDATA_PRNDL"; +SDLVehicleDataType const SDLVehicleDataTypeRPM = @"VEHICLEDATA_RPM"; +SDLVehicleDataType const SDLVehicleDataTypeSpeed = @"VEHICLEDATA_SPEED"; SDLVehicleDataType const SDLVehicleDataTypeSteeringWheel = @"VEHICLEDATA_STEERINGWHEEL"; -SDLVehicleDataType const SDLVehicleDataTypeElectronicParkBrakeStatus = @"VEHICLEDATA_ELECTRONICPARKBRAKESTATUS"; +SDLVehicleDataType const SDLVehicleDataTypeTirePressure = @"VEHICLEDATA_TIREPRESSURE"; SDLVehicleDataType const SDLVehicleDataTypeTurnSignal = @"VEHICLEDATA_TURNSIGNAL"; -SDLVehicleDataType const SDLVehicleDataTypeCloudAppVehicleID = @"VEHICLEDATA_CLOUDAPPVEHICLEID"; -SDLVehicleDataType const SDLVehicleDataTypeOEMVehicleDataType = @"VEHICLEDATA_OEM_CUSTOM_DATA"; +SDLVehicleDataType const SDLVehicleDataTypeVIN = @"VEHICLEDATA_VIN"; SDLVehicleDataType const SDLVehicleDataTypeWindowStatus = @"VEHICLEDATA_WINDOWSTATUS"; +SDLVehicleDataType const SDLVehicleDataTypeWiperStatus = @"VEHICLEDATA_WIPERSTATUS"; diff --git a/SmartDeviceLink/SDLWindowState.h b/SmartDeviceLink/SDLWindowState.h index cc7484962..8a75caca8 100644 --- a/SmartDeviceLink/SDLWindowState.h +++ b/SmartDeviceLink/SDLWindowState.h @@ -35,13 +35,13 @@ NS_ASSUME_NONNULL_BEGIN /** - * @since SDL 6.2.0 + * @since SDL 7.0.0 */ @interface SDLWindowState : SDLRPCStruct /** - * @param approximatePosition - @(approximatePosition) - * @param deviation - @(deviation) + * @param approximatePosition - The approximate percentage that the window is open - 0 being fully closed, 100 being fully open + * @param deviation - The percentage deviation of the approximatePosition. e.g. If the approximatePosition is 50 and the deviation is 10, then the window's location is somewhere between 40 and 60. * @return A SDLWindowState object */ - (instancetype)initWithApproximatePosition:(UInt8)approximatePosition deviation:(UInt8)deviation; @@ -49,17 +49,17 @@ NS_ASSUME_NONNULL_BEGIN /** * The approximate percentage that the window is open - 0 being fully closed, 100 being fully open * - * Optional, Integer, 0 - 100 + * Mandatory, Integer, 0 - 100 */ -@property (strong, nonatomic, nullable) NSNumber<SDLUInt> *approximatePosition; +@property (strong, nonatomic) NSNumber<SDLUInt> *approximatePosition; /** * The percentage deviation of the approximatePosition. e.g. If the approximatePosition is 50 and the deviation is * 10, then the window's location is somewhere between 40 and 60. * - * Optional, Integer, 0 - 100 + * Mandatory, Integer, 0 - 100 */ -@property (strong, nonatomic, nullable) NSNumber<SDLUInt> *deviation; +@property (strong, nonatomic) NSNumber<SDLUInt> *deviation; @end diff --git a/SmartDeviceLink/SDLWindowState.m b/SmartDeviceLink/SDLWindowState.m index abefd3dd6..c2685af1f 100644 --- a/SmartDeviceLink/SDLWindowState.m +++ b/SmartDeviceLink/SDLWindowState.m @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#import "SDLWindowState.h" #import "NSMutableDictionary+Store.h" #import "SDLRPCParameterNames.h" +#import "SDLWindowState.h" NS_ASSUME_NONNULL_BEGIN @@ -48,22 +48,20 @@ NS_ASSUME_NONNULL_BEGIN return self; } -- (void)setApproximatePosition:(NSNumber<SDLUInt> *__nullable)approximatePosition { +- (void)setApproximatePosition:(NSNumber<SDLUInt> *)approximatePosition { [self.store sdl_setObject:approximatePosition forName:SDLRPCParameterNameApproximatePosition]; } -- (NSNumber<SDLUInt> *__nullable)approximatePosition { - NSError *error = nil; - return [self.store sdl_objectForName:SDLRPCParameterNameApproximatePosition ofClass:NSNumber.class error:&error]; +- (NSNumber<SDLUInt> *)approximatePosition { + return [self.store sdl_objectForName:SDLRPCParameterNameApproximatePosition ofClass:NSNumber.class error:NULL]; } -- (void)setDeviation:(NSNumber<SDLUInt> *__nullable)deviation { +- (void)setDeviation:(NSNumber<SDLUInt> *)deviation { [self.store sdl_setObject:deviation forName:SDLRPCParameterNameDeviation]; } -- (NSNumber<SDLUInt> *__nullable)deviation { - NSError *error = nil; - return [self.store sdl_objectForName:SDLRPCParameterNameDeviation ofClass:NSNumber.class error:&error]; +- (NSNumber<SDLUInt> *)deviation { + return [self.store sdl_objectForName:SDLRPCParameterNameDeviation ofClass:NSNumber.class error:NULL]; } @end diff --git a/SmartDeviceLink/SDLWindowStatus.h b/SmartDeviceLink/SDLWindowStatus.h index f0e5b7ec4..e3e235242 100644 --- a/SmartDeviceLink/SDLWindowStatus.h +++ b/SmartDeviceLink/SDLWindowStatus.h @@ -40,7 +40,7 @@ NS_ASSUME_NONNULL_BEGIN /** * Describes the status of a window of a door/liftgate etc. * - * @since SDL 6.2.0 + * @since SDL 7.0.0 */ @interface SDLWindowStatus : SDLRPCStruct @@ -51,8 +51,18 @@ NS_ASSUME_NONNULL_BEGIN */ - (instancetype)initWithLocation:(SDLGrid *)location state:(SDLWindowState *)state; +/** + * location + * + * Mandatory +*/ @property (strong, nonatomic) SDLGrid *location; +/** + * state + * + * Mandatory +*/ @property (strong, nonatomic) SDLWindowState *state; @end diff --git a/SmartDeviceLink/SDLWindowStatus.m b/SmartDeviceLink/SDLWindowStatus.m index 1fc54b359..094b1022e 100644 --- a/SmartDeviceLink/SDLWindowStatus.m +++ b/SmartDeviceLink/SDLWindowStatus.m @@ -55,8 +55,7 @@ NS_ASSUME_NONNULL_BEGIN } - (SDLGrid *)location { - NSError *error = nil; - return [self.store sdl_objectForName:SDLRPCParameterNameLocation ofClass:SDLGrid.class error:&error]; + return [self.store sdl_objectForName:SDLRPCParameterNameLocation ofClass:SDLGrid.class error:NULL]; } - (void)setState:(SDLWindowState *)state { @@ -64,8 +63,7 @@ NS_ASSUME_NONNULL_BEGIN } - (SDLWindowState *)state { - NSError *error = nil; - return [self.store sdl_objectForName:SDLRPCParameterNameState ofClass:SDLWindowState.class error:&error]; + return [self.store sdl_objectForName:SDLRPCParameterNameState ofClass:SDLWindowState.class error:NULL]; } @end diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m index c1766d604..9a09ff2c0 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m @@ -4,9 +4,8 @@ #import <Foundation/Foundation.h> - -#import <Quick/Quick.h> #import <Nimble/Nimble.h> +#import <Quick/Quick.h> #import "SDLVehicleDataType.h" diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m index d6b994b2f..176258735 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m @@ -2,13 +2,12 @@ // SDLOnVehicleDataSpec.m // SmartDeviceLink - #import <Foundation/Foundation.h> - -#import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLRPCParameterNames.h" +#import <Quick/Quick.h> + #import "SDLRPCFunctionNames.h" +#import "SDLRPCParameterNames.h" #import "SDLWindowStatus.h" #import "SmartDeviceLink.h" @@ -225,7 +224,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testNotification.windowStatus).to(beNil()); }); - it(@"Should set and get generic Network Signal Data", ^{ + it(@"Should set and get OEM Custom Vehicle Data", ^{ SDLOnVehicleData *testRequest = [[SDLOnVehicleData alloc] init]; [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:@"oemVehicleData"]; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index 281d14d51..b0c50bc64 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -153,8 +153,8 @@ describe(@"Getter/Setter Tests", ^ { }); }); -describe(@"initializers", ^{ - it(@"init", ^{ +describe(@"Test initializers", ^{ + it(@"expect all properties to be nil", ^{ SDLGetVehicleData* testRequest = [[SDLGetVehicleData alloc] init]; expect(testRequest.accPedalPosition).to(beNil()); @@ -194,7 +194,7 @@ describe(@"initializers", ^{ 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(@"all set", ^{ + 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)); @@ -224,16 +224,16 @@ describe(@"initializers", ^{ expect(testRequest.tirePressure).to(equal(@YES)); expect(testRequest.turnSignal).to(equal(@NO)); expect(testRequest.wiperStatus).to(equal(@YES)); - expect(testRequest.windowStatus).to(beNil()); + expect(testRequest.windowStatus).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:", ^{ + 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(@"all set", ^{ + 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)); @@ -263,7 +263,7 @@ describe(@"initializers", ^{ expect(testRequest.tirePressure).to(equal(@YES)); expect(testRequest.turnSignal).to(equal(@YES)); expect(testRequest.wiperStatus).to(equal(@YES)); - expect(testRequest.windowStatus).to(beNil()); + expect(testRequest.windowStatus).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:", ^{ @@ -272,7 +272,7 @@ describe(@"initializers", ^{ 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 pop - it(@"all set", ^{ + 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)); @@ -302,45 +302,13 @@ describe(@"initializers", ^{ expect(testRequest.tirePressure).to(equal(@YES)); expect(testRequest.turnSignal).to(equal(@YES)); expect(testRequest.wiperStatus).to(equal(@YES)); - expect(testRequest.windowStatus).to(beNil()); + expect(testRequest.windowStatus).to(equal(@NO)); }); }); - -context(@"INIT-4", ^{ - 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 - windowStatus:YES]; - it(@"all props set to YES", ^{ + context(@"Test initializer: initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:vin:windowStatus:wiperStatus:", ^{ + 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 windowStatus:YES wiperStatus: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)); @@ -372,42 +340,11 @@ context(@"INIT-4", ^{ expect(testRequest.wiperStatus).to(equal(@YES)); expect(testRequest.windowStatus).to(equal(@YES)); }); -}); + }); - context(@"INIT-5", ^{ - SDLGetVehicleData *testRequest = - [[SDLGetVehicleData alloc] initWithAccelerationPedalPosition:NO - airbagStatus:NO - beltStatus:NO - bodyInformation:NO - cloudAppVehicleID:NO - clusterModeStatus:NO - deviceStatus:NO - driverBraking:NO - eCallInfo:NO - electronicParkBrakeStatus:NO - emergencyEvent:NO - engineOilLife:NO - engineTorque:NO - externalTemperature:NO - fuelLevel:NO - fuelLevelState:NO - fuelRange:NO - gps:NO - headLampStatus:NO - instantFuelConsumption:NO - myKey:NO - odometer:NO - prndl:NO - rpm:NO - speed:NO - steeringWheelAngle:NO - tirePressure:NO - turnSignal:NO - vin:NO - wiperStatus:NO - windowStatus:NO]; - it(@"all props set to NO", ^{ + context(@"Test initializer: initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:vin:windowStatus:wiperStatus:", ^{ + SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] initWithAccelerationPedalPosition:NO airbagStatus:NO beltStatus:NO bodyInformation:NO cloudAppVehicleID:NO clusterModeStatus:NO deviceStatus:NO driverBraking:NO eCallInfo:NO electronicParkBrakeStatus:NO emergencyEvent:NO engineOilLife:NO engineTorque:NO externalTemperature:NO fuelLevel:NO fuelLevelState:NO fuelRange:NO gps:NO headLampStatus:NO instantFuelConsumption:NO myKey:NO odometer:NO prndl:NO rpm:NO speed:NO steeringWheelAngle:NO tirePressure:NO turnSignal:NO vin:NO windowStatus:NO wiperStatus:NO]; + it(@"expect all properties to be set to NO", ^{ expect(testRequest.accPedalPosition).to(equal(@NO)); expect(testRequest.airbagStatus).to(equal(@NO)); expect(testRequest.beltStatus).to(equal(@NO)); @@ -438,15 +375,15 @@ context(@"INIT-4", ^{ expect(testRequest.turnSignal).to(equal(@NO)); expect(testRequest.wiperStatus).to(equal(@NO)); expect(testRequest.windowStatus).to(equal(@NO)); - }); - }); + }); + }); - context(@"Should set and get Generic Network Signal Data", ^{ + 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(@"all set", ^{ + it(@"expect all properties to be set properly", ^{ expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData"]).to(equal(@NO)); expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData1"]).to(equal(@YES)); expect(testRequest.windowStatus).to(beNil()); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m index 67398aa5a..3f1fae1fc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -153,8 +153,8 @@ describe(@"Getter/Setter Tests", ^ { }); }); -describe(@"initializers", ^{ - it(@"init", ^{ +describe(@"test initializers", ^{ + it(@"expect all properties to be nil", ^{ SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] init]; expect(testRequest.accPedalPosition).to(beNil()); @@ -189,7 +189,7 @@ describe(@"initializers", ^{ expect(testRequest.windowStatus).to(beNil()); }); - it(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus:", ^{ + it(@"expect all properties to be set properly initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus:", ^{ SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData 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 windowStatus:YES]; expect(testRequest.accPedalPosition).to(equal(@YES)); @@ -224,7 +224,7 @@ describe(@"initializers", ^{ expect(testRequest.windowStatus).to(equal(@YES)); }); - it( @"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:", ^{ + it( @"expect all properties to be set properly 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" 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]; @@ -262,7 +262,7 @@ describe(@"initializers", ^{ expect(testRequest.windowStatus).to(beNil()); }); - it( @"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:emergencyEvent:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:wiperStatus:", ^{ + it( @"expect all properties to be set properly 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]; @@ -300,12 +300,12 @@ describe(@"initializers", ^{ expect(testRequest.windowStatus).to(beNil()); }); - context(@"Should set and get Generic Network Signal Data", ^{ + context(@"Should set and get OEM Custom Vehicle Data", ^{ SDLSubscribeVehicleData *testRequest = [[SDLSubscribeVehicleData alloc] init]; [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:NO]; [testRequest setOEMCustomVehicleData:@"customVehicleData1" withVehicleDataState:YES]; - it(@"all set", ^{ + it(@"expect all properties to be set properly", ^{ expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@NO)); expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(equal(@YES)); expect(testRequest.windowStatus).to(beNil()); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m index 26ae06ea7..4e59cbd5f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -153,8 +153,8 @@ describe(@"Getter/Setter Tests", ^ { }); }); -describe(@"initializers", ^{ - it(@"init", ^{ +describe(@"Test initializers", ^{ + it(@"expect all properties to be set to nil", ^{ SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] init]; expect(testRequest.accPedalPosition).to(beNil()); @@ -188,10 +188,10 @@ describe(@"initializers", ^{ expect(testRequest.wiperStatus).to(beNil()); expect(testRequest.windowStatus).to(beNil()); }); - context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus:", ^{ - 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 windowStatus:YES]; + context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:windowStatus:wiperStatus", ^{ + 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 windowStatus:YES wiperStatus:YES]; - it(@"all set", ^{ + 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)); @@ -230,7 +230,7 @@ describe(@"initializers", ^{ 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(@"all set", ^{ + 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)); @@ -269,7 +269,7 @@ describe(@"initializers", ^{ 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]; #pragma clang diagnostic pop - it(@"all set", ^{ + 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)); @@ -302,12 +302,12 @@ describe(@"initializers", ^{ }); }); - context(@"Should set and get Generic Network Signal Data", ^{ + 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(@"all set", ^{ + it(@"expect all properties to be set properly", ^{ expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@NO)); expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(equal(@YES)); expect(testRequest.windowStatus).to(beNil()); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index 72df4207b..76c517241 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -4,14 +4,12 @@ #import <Foundation/Foundation.h> - -#import <Quick/Quick.h> #import <Nimble/Nimble.h> +#import <Quick/Quick.h> -#import "SmartDeviceLink.h" -#import "SDLRPCParameterNames.h" #import "SDLRPCFunctionNames.h" - +#import "SDLRPCParameterNames.h" +#import "SmartDeviceLink.h" QuickSpecBegin(SDLGetVehicleDataResponseSpec) @@ -221,7 +219,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.wiperStatus).to(beNil()); }); - it(@"Should set and get Generic Network Signal Data", ^{ + it(@"Should set and get OEM Custom Vehicle Data", ^{ SDLGetVehicleDataResponse *testRequest = [[SDLGetVehicleDataResponse alloc] init]; [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:@"oemVehicleData"]; diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index 657d2556c..883014526 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -13,7 +13,6 @@ #import "SDLVehicleDataResult.h" #import "SDLVehicleDataResultCode.h" - QuickSpecBegin(SDLSubscribeVehicleDataResponseSpec) SDLVehicleDataResult* vehicleDataResult = [[SDLVehicleDataResult alloc] init]; @@ -193,7 +192,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.windowStatus).to(beNil()); }); - it(@"Should set and get Generic Network Signal Data", ^{ + it(@"Should set and get OEM Custom Vehicle Data", ^{ SDLSubscribeVehicleDataResponse* testResponse = [[SDLSubscribeVehicleDataResponse alloc] init]; [testResponse setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:customOEMvehicleDataResult]; diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index de054f4a8..60dee924e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -192,7 +192,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.windowStatus).to(beNil()); }); - it(@"Should set and get Generic Network Signal Data", ^{ + it(@"Should set and get OEM Vehicle Data", ^{ SDLUnsubscribeVehicleDataResponse* testResponse = [[SDLUnsubscribeVehicleDataResponse alloc] init]; [testResponse setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:customOEMvehicleDataResult]; |