diff options
19 files changed, 962 insertions, 232 deletions
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index 3c591e152..3917a980a 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -28,27 +28,27 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLAlertManeuver.h', 'SmartDeviceLink/SDLAlertManeuverResponse.h', 'SmartDeviceLink/SDLAlertResponse.h', +'SmartDeviceLink/SDLAmbientLightStatus.h', +'SmartDeviceLink/SDLAppCapability.h', +'SmartDeviceLink/SDLAppCapabilityType.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 +58,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 +83,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 +104,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 +134,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 +155,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 +205,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 +228,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', @@ -236,6 +238,7 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLNavigationServiceManifest.h', 'SmartDeviceLink/SDLNotificationConstants.h', 'SmartDeviceLink/SDLOasisAddress.h', +'SmartDeviceLink/SDLOnAppCapabilityUpdated.h', 'SmartDeviceLink/SDLOnAppInterfaceUnregistered.h', 'SmartDeviceLink/SDLOnAppServiceData.h', 'SmartDeviceLink/SDLOnAudioPassThru.h', @@ -244,9 +247,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 +262,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 +283,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 +329,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 +343,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 +355,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 +368,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 +380,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 +391,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 +409,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 +432,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,10 +449,10 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLWeatherData.h', 'SmartDeviceLink/SDLWeatherServiceData.h', 'SmartDeviceLink/SDLWeatherServiceManifest.h', -'SmartDeviceLink/SDLWiperStatus.h', 'SmartDeviceLink/SDLWindowCapability.h', 'SmartDeviceLink/SDLWindowType.h', 'SmartDeviceLink/SDLWindowTypeCapabilities.h', +'SmartDeviceLink/SDLWiperStatus.h', 'SmartDeviceLink/SmartDeviceLink.h', ] end diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec index a525183f5..e31c80849 100644 --- a/SmartDeviceLink.podspec +++ b/SmartDeviceLink.podspec @@ -29,27 +29,27 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLAlertManeuver.h', 'SmartDeviceLink/SDLAlertManeuverResponse.h', 'SmartDeviceLink/SDLAlertResponse.h', +'SmartDeviceLink/SDLAmbientLightStatus.h', +'SmartDeviceLink/SDLAppCapability.h', +'SmartDeviceLink/SDLAppCapabilityType.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 +59,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 +84,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 +105,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 +116,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 +135,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 +156,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 +210,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 +229,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', @@ -237,6 +239,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLNavigationServiceManifest.h', 'SmartDeviceLink/SDLNotificationConstants.h', 'SmartDeviceLink/SDLOasisAddress.h', +'SmartDeviceLink/SDLOnAppCapabilityUpdated.h', 'SmartDeviceLink/SDLOnAppInterfaceUnregistered.h', 'SmartDeviceLink/SDLOnAppServiceData.h', 'SmartDeviceLink/SDLOnAudioPassThru.h', @@ -245,9 +248,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 +263,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 +284,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 +344,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 +356,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 +369,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 +383,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 +392,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 +410,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 +433,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,10 +450,10 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLWeatherData.h', 'SmartDeviceLink/SDLWeatherServiceData.h', 'SmartDeviceLink/SDLWeatherServiceManifest.h', -'SmartDeviceLink/SDLWiperStatus.h', 'SmartDeviceLink/SDLWindowCapability.h', 'SmartDeviceLink/SDLWindowType.h', 'SmartDeviceLink/SDLWindowTypeCapabilities.h', +'SmartDeviceLink/SDLWiperStatus.h', 'SmartDeviceLink/SmartDeviceLink.h', ] end diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index b5db2125f..c618bc2be 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:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:handsOffSteering: instead"); +- (nullable 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:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:handsOffSteering: 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:handsOffSteering: instead"); +- (nullable 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:handsOffSteering: 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:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:handsOffSteering: instead"); +- (nullable 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:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:handsOffSteering: instead"); /** @@ -182,7 +182,44 @@ 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 handsOffSteering:(BOOL)handsOffSteering; +- (nullable 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 handsOffSteering:(BOOL)handsOffSteering 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; + +/** + * The initializer created by the RPC generator + * @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 handsOffSteering - handsOffSteering + * @return A SDLGetVehicleData object + */ +- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm fuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel fuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal vin:(nullable NSNumber<SDLBool> *)vin prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering; /** * A boolean value. If true, requests GPS data. diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m index 3f45d5971..402b354c6 100644 --- a/SmartDeviceLink/SDLGetVehicleData.m +++ b/SmartDeviceLink/SDLGetVehicleData.m @@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" -- (instancetype)init { +- (nullable instancetype)init { self = [super initWithName:SDLRPCFunctionNameGetVehicleData]; if (!self) { return nil; @@ -50,15 +50,15 @@ 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 { +- (nullable 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]; } -- (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 { +- (nullable 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]; } -- (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 { +- (nullable 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 { self = [self init]; if (!self) { return nil; @@ -98,7 +98,7 @@ NS_ASSUME_NONNULL_BEGIN 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 handsOffSteering:(BOOL)handsOffSteering { +- (nullable 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 handsOffSteering:(BOOL)handsOffSteering 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 { self = [self init]; if (!self) { return nil; @@ -121,11 +121,12 @@ NS_ASSUME_NONNULL_BEGIN self.fuelLevel = @(fuelLevel); self.fuelLevel_State = @(fuelLevelState); self.fuelRange = @(fuelRange); - self.myKey = @(myKey); - self.odometer = @(odometer); self.gps = @(gps); + self.handsOffSteering = @(handsOffSteering); self.headLampStatus = @(headLampStatus); self.instantFuelConsumption = @(instantFuelConsumption); + self.myKey = @(myKey); + self.odometer = @(odometer); self.prndl = @(prndl); self.rpm = @(rpm); self.speed = @(speed); @@ -134,11 +135,49 @@ NS_ASSUME_NONNULL_BEGIN self.turnSignal = @(turnSignal); self.vin = @(vin); self.wiperStatus = @(wiperStatus); - self.handsOffSteering = @(handsOffSteering); return self; } +- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm fuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel fuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal vin:(nullable NSNumber<SDLBool> *)vin prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering { + 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.handsOffSteering = handsOffSteering; + return self; +} + - (void)setGps:(nullable NSNumber<SDLBool> *)gps { [self.parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 91477e9d1..11c080d66 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -30,26 +30,26 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#import "SDLTurnSignal.h" +#import "SDLComponentVolumeStatus.h" #import "SDLElectronicParkBrakeStatus.h" -#import "SDLWiperStatus.h" -#import "SDLVehicleDataEventStatus.h" #import "SDLPRNDL.h" #import "SDLRPCResponse.h" -#import "SDLComponentVolumeStatus.h" +#import "SDLTurnSignal.h" +#import "SDLVehicleDataEventStatus.h" +#import "SDLWiperStatus.h" -@class SDLHeadLampStatus; +@class SDLAirbagStatus; +@class SDLBeltStatus; @class SDLBodyInformation; -@class SDLMyKey; -@class SDLTireStatus; -@class SDLECallInfo; -@class SDLDeviceStatus; @class SDLClusterModeStatus; -@class SDLBeltStatus; -@class SDLAirbagStatus; -@class SDLGPSData; +@class SDLDeviceStatus; +@class SDLECallInfo; @class SDLEmergencyEvent; @class SDLFuelRange; +@class SDLGPSData; +@class SDLHeadLampStatus; +@class SDLMyKey; +@class SDLTireStatus; NS_ASSUME_NONNULL_BEGIN @@ -59,6 +59,47 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLGetVehicleDataResponse : SDLRPCResponse /** + * initializes a new allocated object of the SDLGetVehicleDataResponse class + * + * @param accPedalPosition Accelerator pedal position (percentage depressed), optional + * @param airbagStatus The status of the air bags, optional + * @param beltStatus The status of the seat belts, optional + * @param bodyInformation The body information including power modes, optional + * @param cloudAppVehicleID The cloud app vehicle ID, optional + * @param clusterModeStatus The status modes of the cluster, optional + * @param deviceStatus The IVI system status including signal and battery strength, optional + * @param driverBraking The status of the brake pedal, optional + * @param eCallInfo Emergency Call notification and confirmation data, optional + * @param electronicParkBrakeStatus The status of the electronic parking brake, optional + * @param emergencyEvent Information related to an emergency event (and if it occurred), optional + * @param engineOilLife The estimated percentage (0% - 100%) of remaining oil life of the engine, optional + * @param engineTorque Torque value for engine (in Nm) on non-diesel variants, optional + * @param externalTemperature The external temperature in degrees celsius., optional + * @param fuelLevel The fuel level in the tank (percentage), optional + * @param fuelLevel_State The fuel level state, optional + * @param fuelRange The estimate range in KM the vehicle can travel based on fuel level and consumption. Optional, Array of length 0 - 100, of SDLFuelRange + * @param gps The car current GPS coordinates, optional + * @param handsOffSteering To indicate whether driver hands are off the steering wheel, optional + * @param headLampStatus Status of the head lamps, optional + * @param instantFuelConsumption The instantaneous fuel consumption in microlitres, optional + * @param myKey Information related to the MyKey feature, optional + * @param odometer Odometer reading in km, optional + * @param prndl The current gear shift state of the user's vehicle, optional + * @param rpm The number of revolutions per minute of the engine., optional + * @param speed The vehicle speed in kilometers per hour, optional + * @param steeringWheelAngle Current angle of the steering wheel (in deg), optional + * @param tirePressure The current pressure warnings for the user's vehicle, optional + * @param turnSignal The status of the turn signal, optional + * @param vin The Vehicle Identification Number, optional + * @param wiperStatus The status of the wipers, optional + * + * @return an initialized object of the SDLGetVehicleDataResponse class or nil + */ + +- (nullable instancetype)initWithAccPedalPosition:(float)accPedalPosition airbagStatus:(SDLAirbagStatus *)airbagStatus beltStatus:(SDLBeltStatus *)beltStatus bodyInformation:(SDLBodyInformation *)bodyInformation cloudAppVehicleID:(NSString *)cloudAppVehicleID clusterModeStatus:(SDLClusterModeStatus *)clusterModeStatus deviceStatus:(SDLDeviceStatus *)deviceStatus driverBraking:(SDLVehicleDataEventStatus)driverBraking eCallInfo:(SDLECallInfo *)eCallInfo electronicParkBrakeStatus:(SDLElectronicParkBrakeStatus)electronicParkBrakeStatus emergencyEvent:(SDLEmergencyEvent *)emergencyEvent engineOilLife:(float)engineOilLife engineTorque:(float)engineTorque externalTemperature:(float)externalTemperature fuelLevel:(float)fuelLevel fuelLevel_State:(SDLComponentVolumeStatus)fuelLevel_State fuelRange:(NSArray<SDLFuelRange *>*)fuelRange gps:(SDLGPSData *)gps handsOffSteering:(BOOL)handsOffSteering headLampStatus:(SDLHeadLampStatus *)headLampStatus instantFuelConsumption:(float)instantFuelConsumption myKey:(SDLMyKey *)myKey odometer:(NSInteger)odometer prndl:(SDLPRNDL)prndl rpm:(NSInteger)rpm speed:(float)speed steeringWheelAngle:(float)steeringWheelAngle tirePressure:(SDLTireStatus *)tirePressure turnSignal:(SDLTurnSignal)turnSignal vin:(NSString *)vin wiperStatus:(SDLWiperStatus)wiperStatus; + + +/** The car current GPS coordinates Optional diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m index a5b555dd4..8b9c5bfb2 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m @@ -30,28 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#import "SDLGetVehicleDataResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLHeadLampStatus.h" +#import "SDLAirbagStatus.h" +#import "SDLBeltStatus.h" #import "SDLBodyInformation.h" -#import "SDLEmergencyEvent.h" -#import "SDLTurnSignal.h" -#import "SDLElectronicParkBrakeStatus.h" -#import "SDLMyKey.h" -#import "SDLTireStatus.h" -#import "SDLWiperStatus.h" -#import "SDLECallInfo.h" -#import "SDLVehicleDataEventStatus.h" -#import "SDLDeviceStatus.h" -#import "SDLPRNDL.h" #import "SDLClusterModeStatus.h" -#import "SDLBeltStatus.h" -#import "SDLAirbagStatus.h" -#import "SDLGPSData.h" #import "SDLComponentVolumeStatus.h" +#import "SDLDeviceStatus.h" +#import "SDLECallInfo.h" +#import "SDLElectronicParkBrakeStatus.h" +#import "SDLEmergencyEvent.h" #import "SDLFuelRange.h" +#import "SDLGPSData.h" +#import "SDLGetVehicleDataResponse.h" +#import "SDLHeadLampStatus.h" +#import "SDLMyKey.h" +#import "SDLPRNDL.h" #import "SDLRPCFunctionNames.h" #import "SDLRPCParameterNames.h" +#import "SDLTireStatus.h" +#import "SDLTurnSignal.h" +#import "SDLVehicleDataEventStatus.h" +#import "SDLWiperStatus.h" NS_ASSUME_NONNULL_BEGIN @@ -68,6 +68,47 @@ NS_ASSUME_NONNULL_BEGIN } #pragma clang diagnostic pop +- (nullable instancetype)initWithAccPedalPosition:(float)accPedalPosition airbagStatus:(SDLAirbagStatus *)airbagStatus beltStatus:(SDLBeltStatus *)beltStatus bodyInformation:(SDLBodyInformation *)bodyInformation cloudAppVehicleID:(NSString *)cloudAppVehicleID clusterModeStatus:(SDLClusterModeStatus *)clusterModeStatus deviceStatus:(SDLDeviceStatus *)deviceStatus driverBraking:(SDLVehicleDataEventStatus)driverBraking eCallInfo:(SDLECallInfo *)eCallInfo electronicParkBrakeStatus:(SDLElectronicParkBrakeStatus)electronicParkBrakeStatus emergencyEvent:(SDLEmergencyEvent *)emergencyEvent engineOilLife:(float)engineOilLife engineTorque:(float)engineTorque externalTemperature:(float)externalTemperature fuelLevel:(float)fuelLevel fuelLevel_State:(SDLComponentVolumeStatus)fuelLevel_State fuelRange:(NSArray<SDLFuelRange *>*)fuelRange gps:(SDLGPSData *)gps handsOffSteering:(BOOL)handsOffSteering headLampStatus:(SDLHeadLampStatus *)headLampStatus instantFuelConsumption:(float)instantFuelConsumption myKey:(SDLMyKey *)myKey odometer:(NSInteger)odometer prndl:(SDLPRNDL)prndl rpm:(NSInteger)rpm speed:(float)speed steeringWheelAngle:(float)steeringWheelAngle tirePressure:(SDLTireStatus *)tirePressure turnSignal:(SDLTurnSignal)turnSignal vin:(NSString *)vin wiperStatus:(SDLWiperStatus)wiperStatus { + self = [self init]; + if (!self) { + return nil; + } + + self.accPedalPosition = @(accPedalPosition); + 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 = fuelLevel_State; + self.fuelRange = fuelRange; + self.gps = gps; + self.handsOffSteering = @(handsOffSteering); + self.headLampStatus = headLampStatus; + self.instantFuelConsumption = @(instantFuelConsumption); + self.myKey = myKey; + self.odometer = @(odometer); + self.prndl = prndl; + self.rpm = @(rpm); + self.speed = @(speed); + self.steeringWheelAngle = @(steeringWheelAngle); + self.tirePressure = tirePressure; + self.turnSignal = turnSignal; + self.vin = vin; + self.wiperStatus = wiperStatus; + + 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 a3f749b4b..bab600a44 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -30,26 +30,26 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#import "SDLTurnSignal.h" +#import "SDLComponentVolumeStatus.h" #import "SDLElectronicParkBrakeStatus.h" -#import "SDLWiperStatus.h" -#import "SDLVehicleDataEventStatus.h" #import "SDLPRNDL.h" #import "SDLRPCNotification.h" -#import "SDLComponentVolumeStatus.h" +#import "SDLTurnSignal.h" +#import "SDLVehicleDataEventStatus.h" +#import "SDLWiperStatus.h" -@class SDLHeadLampStatus; +@class SDLAirbagStatus; +@class SDLBeltStatus; @class SDLBodyInformation; -@class SDLMyKey; -@class SDLTireStatus; -@class SDLECallInfo; -@class SDLDeviceStatus; @class SDLClusterModeStatus; -@class SDLBeltStatus; -@class SDLAirbagStatus; -@class SDLGPSData; +@class SDLDeviceStatus; +@class SDLECallInfo; @class SDLEmergencyEvent; @class SDLFuelRange; +@class SDLGPSData; +@class SDLHeadLampStatus; +@class SDLMyKey; +@class SDLTireStatus; NS_ASSUME_NONNULL_BEGIN @@ -61,6 +61,44 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLOnVehicleData : SDLRPCNotification /** + * note: the method was generated with the RPC generator. If an update required then do it either in the xml file generator/rpc_spec/MOBILE_API.xml or in the generator itself. + * @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 handsOffSteering - handsOffSteering + * @return A SDLOnVehicleData object + */ + +- (instancetype)initWithGps:(nullable SDLGPSData *)gps speed:(float)speed rpm:(nullable NSNumber<SDLUInt> *)rpm fuelLevel:(float)fuelLevel fuelLevel_State:(nullable SDLComponentVolumeStatus)fuelLevel_State instantFuelConsumption:(float)instantFuelConsumption fuelRange:(nullable NSArray<SDLFuelRange *> *)fuelRange externalTemperature:(float)externalTemperature turnSignal:(nullable SDLTurnSignal)turnSignal vin:(nullable NSString *)vin prndl:(nullable SDLPRNDL)prndl tirePressure:(nullable SDLTireStatus *)tirePressure odometer:(nullable NSNumber<SDLUInt> *)odometer beltStatus:(nullable SDLBeltStatus *)beltStatus bodyInformation:(nullable SDLBodyInformation *)bodyInformation deviceStatus:(nullable SDLDeviceStatus *)deviceStatus driverBraking:(nullable SDLVehicleDataEventStatus)driverBraking wiperStatus:(nullable SDLWiperStatus)wiperStatus headLampStatus:(nullable SDLHeadLampStatus *)headLampStatus engineTorque:(float)engineTorque accPedalPosition:(float)accPedalPosition steeringWheelAngle:(float)steeringWheelAngle engineOilLife:(float)engineOilLife electronicParkBrakeStatus:(nullable SDLElectronicParkBrakeStatus)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSString *)cloudAppVehicleID eCallInfo:(nullable SDLECallInfo *)eCallInfo airbagStatus:(nullable SDLAirbagStatus *)airbagStatus emergencyEvent:(nullable SDLEmergencyEvent *)emergencyEvent clusterModeStatus:(nullable SDLClusterModeStatus *)clusterModeStatus myKey:(nullable SDLMyKey *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering; + +/** The car current GPS coordinates */ @property (strong, nonatomic, nullable) SDLGPSData *gps; diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m index f74e2fa7e..a114a878a 100644 --- a/SmartDeviceLink/SDLOnVehicleData.m +++ b/SmartDeviceLink/SDLOnVehicleData.m @@ -30,28 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#import "SDLOnVehicleData.h" #import "NSMutableDictionary+Store.h" -#import "SDLHeadLampStatus.h" +#import "SDLAirbagStatus.h" +#import "SDLBeltStatus.h" #import "SDLBodyInformation.h" -#import "SDLEmergencyEvent.h" -#import "SDLTurnSignal.h" -#import "SDLElectronicParkBrakeStatus.h" -#import "SDLMyKey.h" -#import "SDLTireStatus.h" -#import "SDLWiperStatus.h" -#import "SDLECallInfo.h" -#import "SDLVehicleDataEventStatus.h" -#import "SDLDeviceStatus.h" -#import "SDLPRNDL.h" #import "SDLClusterModeStatus.h" -#import "SDLBeltStatus.h" -#import "SDLAirbagStatus.h" -#import "SDLGPSData.h" #import "SDLComponentVolumeStatus.h" +#import "SDLDeviceStatus.h" +#import "SDLECallInfo.h" +#import "SDLElectronicParkBrakeStatus.h" +#import "SDLEmergencyEvent.h" #import "SDLFuelRange.h" +#import "SDLGPSData.h" +#import "SDLHeadLampStatus.h" +#import "SDLMyKey.h" +#import "SDLOnVehicleData.h" +#import "SDLPRNDL.h" #import "SDLRPCFunctionNames.h" #import "SDLRPCParameterNames.h" +#import "SDLTireStatus.h" +#import "SDLTurnSignal.h" +#import "SDLVehicleDataEventStatus.h" +#import "SDLWiperStatus.h" NS_ASSUME_NONNULL_BEGIN @@ -68,6 +68,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 handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering { + 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.handsOffSteering = handsOffSteering; + 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 31080be96..a95253c1b 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -72,7 +72,7 @@ NS_ASSUME_NONNULL_BEGIN * @param wiperStatus Subscribe to wiperStatus * @return A SDLSubscribeVehicleData object */ -- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo emergencyEvent:(BOOL)emergencyEvent engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use 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:wiperStatus: instead"); +- (nullable 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:handsOffSteering:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus: instead"); /** * Convenience init for subscribing to all possible vehicle data items. @@ -107,7 +107,7 @@ NS_ASSUME_NONNULL_BEGIN * @param wiperStatus Subscribe to wiperStatus * @return A SDLSubscribeVehicleData object */ -- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use 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:wiperStatus: instead"); +- (nullable 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:handsOffSteering:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus: instead"); /** * Convenience init for subscribing to all possible vehicle data items. @@ -143,7 +143,7 @@ NS_ASSUME_NONNULL_BEGIN * @param wiperStatus Subscribe to wiperStatus * @return A SDLSubscribeVehicleData object */ -- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use 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:wiperStatus: instead"); +- (nullable 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:handsOffSteering:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus: instead"); /** * Convenience init for subscribing to all possible vehicle data items. @@ -165,6 +165,7 @@ NS_ASSUME_NONNULL_BEGIN * @param fuelLevelState Subscribe to fuelLevelState * @param fuelRange Subscribe to fuelRange * @param gps Subscribe to gps + * @param handsOffSteering Subscribe for the status whether driver hands are off the steering wheel * @param headLampStatus Subscribe to headLampStatus * @param instantFuelConsumption Subscribe to instantFuelConsumption * @param myKey Subscribe to myKey @@ -176,10 +177,46 @@ NS_ASSUME_NONNULL_BEGIN * @param tirePressure Subscribe to tirePressure * @param turnSignal Subscribe to turnSignal * @param wiperStatus Subscribe to wiperStatus - * @param handsOffSteering handsOffSteering + * + * @return A SDLSubscribeVehicleData object + */ +- (nullable 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 handsOffSteering:(BOOL)handsOffSteering 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; + +/** + * note: script created 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 handsOffSteering - handsOffSteering * @return A SDLSubscribeVehicleData object */ -- (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus handsOffSteering:(BOOL)handsOffSteering; +- (instancetype)initWithGps:(nullable NSNumber<SDLBool> *)gps speed:(nullable NSNumber<SDLBool> *)speed rpm:(nullable NSNumber<SDLBool> *)rpm fuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel fuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State instantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption fuelRange:(nullable NSNumber<SDLBool> *)fuelRange externalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature turnSignal:(nullable NSNumber<SDLBool> *)turnSignal prndl:(nullable NSNumber<SDLBool> *)prndl tirePressure:(nullable NSNumber<SDLBool> *)tirePressure odometer:(nullable NSNumber<SDLBool> *)odometer beltStatus:(nullable NSNumber<SDLBool> *)beltStatus bodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation deviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus driverBraking:(nullable NSNumber<SDLBool> *)driverBraking wiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus headLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus engineTorque:(nullable NSNumber<SDLBool> *)engineTorque accPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle engineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife electronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus cloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID eCallInfo:(nullable NSNumber<SDLBool> *)eCallInfo airbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus emergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent clusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus myKey:(nullable NSNumber<SDLBool> *)myKey handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering; /** * A boolean value. If true, subscribes GPS data. diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m index 9f3d2171d..afe81cc28 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.m +++ b/SmartDeviceLink/SDLSubscribeVehicleData.m @@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" -- (instancetype)init { +- (nullable instancetype)init { self = [super initWithName:SDLRPCFunctionNameSubscribeVehicleData]; if (!self) { return nil; @@ -50,15 +50,15 @@ 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 { +- (nullable 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]; } -- (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 { +- (nullable 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]; } -- (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 handsOffSteering:(BOOL)handsOffSteering { +- (nullable 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 handsOffSteering:(BOOL)handsOffSteering 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 { self = [self init]; if (!self) { return nil; @@ -81,11 +81,12 @@ NS_ASSUME_NONNULL_BEGIN self.fuelLevel = @(fuelLevel); self.fuelLevel_State = @(fuelLevelState); self.fuelRange = @(fuelRange); - self.myKey = @(myKey); - self.odometer = @(odometer); self.gps = @(gps); + self.handsOffSteering = @(handsOffSteering); self.headLampStatus = @(headLampStatus); self.instantFuelConsumption = @(instantFuelConsumption); + self.myKey = @(myKey); + self.odometer = @(odometer); self.prndl = @(prndl); self.rpm = @(rpm); self.speed = @(speed); @@ -93,12 +94,11 @@ NS_ASSUME_NONNULL_BEGIN self.tirePressure = @(tirePressure); self.turnSignal = @(turnSignal); self.wiperStatus = @(wiperStatus); - self.handsOffSteering = @(handsOffSteering); 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 { +- (nullable 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 { self = [self init]; if (!self) { return nil; @@ -137,6 +137,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 handsOffSteering:(nullable NSNumber<SDLBool> *)handsOffSteering { + 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.handsOffSteering = handsOffSteering; + 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 3d0b7c740..5e48185f0 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -42,6 +42,110 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLSubscribeVehicleDataResponse : SDLRPCResponse /** + * Convenience initializer, initializes a new allocated object of the class SDLSubscribeVehicleDataResponse + * + * @paramn accPedalPosition The result of requesting to subscribe to the accelerator pedal position (percentage depressed), optional + * @param airbagStatus The result of requesting to subscribe to the airbag status, optional + * @param beltStatus The result of requesting to subscribe to the status of the seat belts., optional + * @param bodyInformation The result of requesting to subscribe to the body information including power modes., optional + * @param cloudAppVehicleID The result of requesting to subscribe to the cloud app vehicle ID, optional + * @param clusterModes The result of requesting to subscribe to the cluster modes, optional + * @param deviceStatus The result of requesting to subscribe to the device status including signal and battery strength., optional + * @param driverBraking The result of requesting to subscribe to the status of the brake pedal., optional + * @param eCallInfo The result of requesting to subscribe to the emergency call info, optional + * @param electronicParkBrakeStatus The result of requesting to subscribe to the electronic parking brake status, optional + * @param emergencyEvent The result of requesting to subscribe to the emergency event, optional + * @param engineOilLife The result of requesting to subscribe to the estimated percentage of remaining oil life of the engine., optional + * @param engineTorque The result of requesting to subscribe to the torque value for engine (in Nm) on non-diesel variants., optional + * @param externalTemperature The result of requesting to subscribe to the external temperature in degrees celsius., optional + * @param fuelLevel The result of requesting to subscribe to the fuel level in the tank (percentage), optional + * @param fuelLevel_State The result of requesting to subscribe to the fuel level state., optional + * @param fuelRange The result of requesting to subscribe to the fuel range., optional + * @param gps The result of requesting to subscribe to the GPSData., optional + * @param handsOffSteering To indicate whether driver hands are off the steering wheel, optional + * @param headLampStatus The result of requesting to subscribe to the status of the head lamps., optional + * @param instantFuelConsumption The result of requesting to subscribe to the instantaneous fuel consumption in microlitres., optional + * @param myKey The result of requesting to subscribe to the myKey status, optional + * @param odometer The result of requesting to subscribe to the odometer in km., optional + * @param prndl The result of requesting to subscribe to the PRNDL status., optional + * @param rpm The result of requesting to subscribe to the number of revolutions per minute of the engine., optional + * @param speed The result of requesting to subscribe to the vehicle speed in kilometers per hour., optional + * @param steeringWheelAngle The result of requesting to subscribe to the current angle of the steering wheel (in deg), optional + * @param tirePressure The result of requesting to subscribe to the tireStatus., optional + * @param turnSignal The result of requesting to subscribe to the turn signal, optional + * @param wiperStatus The result of requesting to subscribe to the status of the wipers., optional + * + * @return an initialized objectof the class SDLSubscribeVehicleDataResponse + */ + +- (nullable instancetype)initWithAccPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition + airbagStatus:(nullable SDLVehicleDataResult *)airbagStatus + beltStatus:(nullable SDLVehicleDataResult *)beltStatus + bodyInformation:(nullable SDLVehicleDataResult *)bodyInformation + cloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID + clusterModes:(nullable SDLVehicleDataResult *)clusterModes + deviceStatus:(nullable SDLVehicleDataResult *)deviceStatus + driverBraking:(nullable SDLVehicleDataResult *)driverBraking + eCallInfo:(nullable SDLVehicleDataResult *)eCallInfo + electronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus + emergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent + engineOilLife:(nullable SDLVehicleDataResult *)engineOilLife + engineTorque:(nullable SDLVehicleDataResult *)engineTorque + externalTemperature:(nullable SDLVehicleDataResult *)externalTemperature + fuelLevel:(nullable SDLVehicleDataResult *)fuelLevel + fuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State + fuelRange:(nullable SDLVehicleDataResult *)fuelRange + gps:(nullable SDLVehicleDataResult *)gps + handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering + headLampStatus:(nullable SDLVehicleDataResult *)headLampStatus + instantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption + myKey:(nullable SDLVehicleDataResult *)myKey + odometer:(nullable SDLVehicleDataResult *)odometer + prndl:(nullable SDLVehicleDataResult *)prndl + rpm:(nullable SDLVehicleDataResult *)rpm + speed:(nullable SDLVehicleDataResult *)speed + steeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle + tirePressure:(nullable SDLVehicleDataResult *)tirePressure + turnSignal:(nullable SDLVehicleDataResult *)turnSignal + wiperStatus:(nullable SDLVehicleDataResult *)wiperStatus; + +/** + * note: auto generated initializer in comparision with the manually created one (see above) + * @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 handsOffSteering - handsOffSteering + * @return A SDLSubscribeVehicleDataResponse object + */ +- (instancetype)initWithGps:(nullable SDLVehicleDataResult *)gps speed:(nullable SDLVehicleDataResult *)speed rpm:(nullable SDLVehicleDataResult *)rpm fuelLevel:(nullable SDLVehicleDataResult *)fuelLevel fuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State instantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption fuelRange:(nullable SDLVehicleDataResult *)fuelRange externalTemperature:(nullable SDLVehicleDataResult *)externalTemperature turnSignal:(nullable SDLVehicleDataResult *)turnSignal prndl:(nullable SDLVehicleDataResult *)prndl tirePressure:(nullable SDLVehicleDataResult *)tirePressure odometer:(nullable SDLVehicleDataResult *)odometer beltStatus:(nullable SDLVehicleDataResult *)beltStatus bodyInformation:(nullable SDLVehicleDataResult *)bodyInformation deviceStatus:(nullable SDLVehicleDataResult *)deviceStatus driverBraking:(nullable SDLVehicleDataResult *)driverBraking wiperStatus:(nullable SDLVehicleDataResult *)wiperStatus headLampStatus:(nullable SDLVehicleDataResult *)headLampStatus engineTorque:(nullable SDLVehicleDataResult *)engineTorque accPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition steeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle engineOilLife:(nullable SDLVehicleDataResult *)engineOilLife electronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus cloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID eCallInfo:(nullable SDLVehicleDataResult *)eCallInfo airbagStatus:(nullable SDLVehicleDataResult *)airbagStatus emergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent clusterModes:(nullable SDLVehicleDataResult *)clusterModes myKey:(nullable SDLVehicleDataResult *)myKey handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering; + +/** The result of requesting to subscribe to the GPSData. Optional diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m index 2d2cf0ba0..fccbaeb97 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#import "SDLSubscribeVehicleDataResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLVehicleDataResult.h" #import "SDLRPCFunctionNames.h" #import "SDLRPCParameterNames.h" +#import "SDLSubscribeVehicleDataResponse.h" +#import "SDLVehicleDataResult.h" NS_ASSUME_NONNULL_BEGIN @@ -42,7 +42,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" -- (instancetype)init { +- (nullable instancetype)init { self = [super initWithName:SDLRPCFunctionNameSubscribeVehicleData]; if (!self) { return nil; @@ -51,6 +51,114 @@ NS_ASSUME_NONNULL_BEGIN } #pragma clang diagnostic pop +- (nullable instancetype)initWithAccPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition + airbagStatus:(nullable SDLVehicleDataResult *)airbagStatus + beltStatus:(nullable SDLVehicleDataResult *)beltStatus + bodyInformation:(nullable SDLVehicleDataResult *)bodyInformation + cloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID + clusterModes:(nullable SDLVehicleDataResult *)clusterModes + deviceStatus:(nullable SDLVehicleDataResult *)deviceStatus + driverBraking:(nullable SDLVehicleDataResult *)driverBraking + eCallInfo:(nullable SDLVehicleDataResult *)eCallInfo + electronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus + emergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent + engineOilLife:(nullable SDLVehicleDataResult *)engineOilLife + engineTorque:(nullable SDLVehicleDataResult *)engineTorque + externalTemperature:(nullable SDLVehicleDataResult *)externalTemperature + fuelLevel:(nullable SDLVehicleDataResult *)fuelLevel + fuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State + fuelRange:(nullable SDLVehicleDataResult *)fuelRange + gps:(nullable SDLVehicleDataResult *)gps + handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering + headLampStatus:(nullable SDLVehicleDataResult *)headLampStatus + instantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption + myKey:(nullable SDLVehicleDataResult *)myKey + odometer:(nullable SDLVehicleDataResult *)odometer + prndl:(nullable SDLVehicleDataResult *)prndl + rpm:(nullable SDLVehicleDataResult *)rpm + speed:(nullable SDLVehicleDataResult *)speed + steeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle + tirePressure:(nullable SDLVehicleDataResult *)tirePressure + turnSignal:(nullable SDLVehicleDataResult *)turnSignal + wiperStatus:(nullable SDLVehicleDataResult *)wiperStatus +{ + self = [self init]; + if (!self) { + return nil; + } + + self.accPedalPosition = accPedalPosition; + self.airbagStatus = airbagStatus; + self.beltStatus = beltStatus; + self.bodyInformation = bodyInformation; + self.cloudAppVehicleID = cloudAppVehicleID; + self.clusterModes = clusterModes; + 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 = fuelLevel_State; + self.fuelRange = fuelRange; + self.gps = gps; + self.handsOffSteering = handsOffSteering; + self.headLampStatus = headLampStatus; + self.instantFuelConsumption = instantFuelConsumption; + self.myKey = myKey; + self.odometer = odometer; + self.prndl = prndl; + self.rpm = rpm; + self.speed = speed; + self.steeringWheelAngle = steeringWheelAngle; + self.tirePressure = tirePressure; + self.turnSignal = turnSignal; + self.wiperStatus = wiperStatus; + + return self; +} + +- (instancetype)initWithGps:(nullable SDLVehicleDataResult *)gps speed:(nullable SDLVehicleDataResult *)speed rpm:(nullable SDLVehicleDataResult *)rpm fuelLevel:(nullable SDLVehicleDataResult *)fuelLevel fuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State instantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption fuelRange:(nullable SDLVehicleDataResult *)fuelRange externalTemperature:(nullable SDLVehicleDataResult *)externalTemperature turnSignal:(nullable SDLVehicleDataResult *)turnSignal prndl:(nullable SDLVehicleDataResult *)prndl tirePressure:(nullable SDLVehicleDataResult *)tirePressure odometer:(nullable SDLVehicleDataResult *)odometer beltStatus:(nullable SDLVehicleDataResult *)beltStatus bodyInformation:(nullable SDLVehicleDataResult *)bodyInformation deviceStatus:(nullable SDLVehicleDataResult *)deviceStatus driverBraking:(nullable SDLVehicleDataResult *)driverBraking wiperStatus:(nullable SDLVehicleDataResult *)wiperStatus headLampStatus:(nullable SDLVehicleDataResult *)headLampStatus engineTorque:(nullable SDLVehicleDataResult *)engineTorque accPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition steeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle engineOilLife:(nullable SDLVehicleDataResult *)engineOilLife electronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus cloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID eCallInfo:(nullable SDLVehicleDataResult *)eCallInfo airbagStatus:(nullable SDLVehicleDataResult *)airbagStatus emergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent clusterModes:(nullable SDLVehicleDataResult *)clusterModes myKey:(nullable SDLVehicleDataResult *)myKey handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering { + 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.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.handsOffSteering = handsOffSteering; + return self; +} + - (void)setGps:(nullable SDLVehicleDataResult *)gps { [self.parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index 771f6938b..30ec8bf97 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -42,6 +42,42 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLUnsubscribeVehicleDataResponse : SDLRPCResponse /** + * note: script generated 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 handsOffSteering - handsOffSteering + * @return A SDLUnsubscribeVehicleDataResponse object + */ +- (instancetype)initWithGps:(nullable SDLVehicleDataResult *)gps speed:(nullable SDLVehicleDataResult *)speed rpm:(nullable SDLVehicleDataResult *)rpm fuelLevel:(nullable SDLVehicleDataResult *)fuelLevel fuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State instantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption fuelRange:(nullable SDLVehicleDataResult *)fuelRange externalTemperature:(nullable SDLVehicleDataResult *)externalTemperature turnSignal:(nullable SDLVehicleDataResult *)turnSignal prndl:(nullable SDLVehicleDataResult *)prndl tirePressure:(nullable SDLVehicleDataResult *)tirePressure odometer:(nullable SDLVehicleDataResult *)odometer beltStatus:(nullable SDLVehicleDataResult *)beltStatus bodyInformation:(nullable SDLVehicleDataResult *)bodyInformation deviceStatus:(nullable SDLVehicleDataResult *)deviceStatus driverBraking:(nullable SDLVehicleDataResult *)driverBraking wiperStatus:(nullable SDLVehicleDataResult *)wiperStatus headLampStatus:(nullable SDLVehicleDataResult *)headLampStatus engineTorque:(nullable SDLVehicleDataResult *)engineTorque accPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition steeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle engineOilLife:(nullable SDLVehicleDataResult *)engineOilLife electronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus cloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID eCallInfo:(nullable SDLVehicleDataResult *)eCallInfo airbagStatus:(nullable SDLVehicleDataResult *)airbagStatus emergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent clusterModes:(nullable SDLVehicleDataResult *)clusterModes myKey:(nullable SDLVehicleDataResult *)myKey handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering; + +/** The result of requesting to unsubscribe to the GPSData. Optional diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m index 099cc2aaa..71e06243e 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#import "SDLUnsubscribeVehicleDataResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLVehicleDataResult.h" #import "SDLRPCFunctionNames.h" #import "SDLRPCParameterNames.h" +#import "SDLUnsubscribeVehicleDataResponse.h" +#import "SDLVehicleDataResult.h" NS_ASSUME_NONNULL_BEGIN @@ -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 handsOffSteering:(nullable SDLVehicleDataResult *)handsOffSteering { + 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.handsOffSteering = handsOffSteering; + return self; +} + - (void)setGps:(nullable SDLVehicleDataResult *)gps { [self.parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m index dfaa8ada8..b5651903c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m @@ -230,7 +230,97 @@ describe(@"Getter/Setter Tests", ^ { [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:@"oemVehicleData"]; expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@"oemVehicleData")); + }); + + it(@"Should initialize an object correctly", ^{ + const float speed = 123.45; + const NSUInteger rpm = 42; + const float fuelLevel = 10.3; + SDLComponentVolumeStatus fuelLevel_State = SDLComponentVolumeStatusAlert; + const float instantFuelConsumption = 4000.63; + NSArray *fuelRangeArray = @[fuelRange, fuelRange]; + const float externalTemperature = -10.5; + NSString * const vin = @"222222222722"; + SDLTurnSignal turnSignal = SDLTurnSignalOff; + SDLPRNDL prndl = SDLPRNDLDrive; + NSUInteger odometer = 100500; + SDLVehicleDataEventStatus driverBraking = SDLVehicleDataEventStatusYes; + SDLWiperStatus wiperStatus = SDLWiperStatusStalled; + const float engineTorque = -200.124; + const float accPedalPosition = 99.99999999; + const float steeringWheelAngle = M_PI_4; + const float engineOilLife = 34.45; + SDLElectronicParkBrakeStatus electronicParkBrakeStatus = SDLElectronicParkBrakeStatusDriveActive; + const BOOL handsOffSteering = YES; + NSString * const OEMCustomVehicleData = @"customVehicleData"; + NSString * const OEMVehicleDataState = @"oemVehicleData"; + + SDLOnVehicleData *onVehicleData = + [[SDLOnVehicleData alloc] initWithGps:gps + speed:speed + rpm:@(rpm) + fuelLevel:fuelLevel + fuelLevel_State:fuelLevel_State + instantFuelConsumption:instantFuelConsumption + fuelRange:fuelRangeArray + externalTemperature:externalTemperature + turnSignal:turnSignal + vin:vin + prndl:prndl + tirePressure:tires + odometer:@(odometer) + beltStatus:belt + bodyInformation:body + deviceStatus:device + driverBraking:driverBraking + wiperStatus:wiperStatus + headLampStatus:headLamp + engineTorque:engineTorque + accPedalPosition:accPedalPosition + steeringWheelAngle:steeringWheelAngle + engineOilLife:engineOilLife + electronicParkBrakeStatus:electronicParkBrakeStatus + cloudAppVehicleID:cloudAppVehicleID + eCallInfo:eCall + airbagStatus:airbag + emergencyEvent:event + clusterModeStatus:clusterMode + myKey:myKey + handsOffSteering:@(handsOffSteering)]; + [onVehicleData setOEMCustomVehicleData:OEMCustomVehicleData withVehicleDataState:OEMVehicleDataState]; + expect([onVehicleData getOEMCustomVehicleData:OEMCustomVehicleData]).to(equal(OEMVehicleDataState)); + expect(onVehicleData.accPedalPosition).to(equal(@(accPedalPosition))); + expect(onVehicleData.airbagStatus).to(equal(airbag)); + expect(onVehicleData.beltStatus).to(equal(belt)); + expect(onVehicleData.bodyInformation).to(equal(body)); + expect(onVehicleData.cloudAppVehicleID).to(equal(cloudAppVehicleID)); + expect(onVehicleData.clusterModeStatus).to(equal(clusterMode)); + expect(onVehicleData.deviceStatus).to(equal(device)); + expect(onVehicleData.driverBraking).to(equal(driverBraking)); + expect(onVehicleData.eCallInfo).to(equal(eCall)); + expect(onVehicleData.electronicParkBrakeStatus).to(equal(electronicParkBrakeStatus)); + expect(onVehicleData.emergencyEvent).to(equal(event)); + expect(onVehicleData.engineOilLife).to(equal(@(engineOilLife))); + expect(onVehicleData.engineTorque).to(equal(@(engineTorque))); + expect(onVehicleData.externalTemperature).to(equal(@(externalTemperature))); + expect(onVehicleData.fuelLevel).to(equal(@(fuelLevel))); + expect(onVehicleData.fuelLevel_State).to(equal(fuelLevel_State)); + expect(onVehicleData.fuelRange).to(equal(fuelRangeArray)); + expect(onVehicleData.gps).to(equal(gps)); + expect(onVehicleData.handsOffSteering).to(equal(@(handsOffSteering))); + expect(onVehicleData.headLampStatus).to(equal(headLamp)); + expect(onVehicleData.instantFuelConsumption).to(equal(@(instantFuelConsumption))); + expect(onVehicleData.myKey).to(equal(myKey)); + expect(onVehicleData.odometer).to(equal(@(odometer))); + expect(onVehicleData.prndl).to(equal(prndl)); + expect(onVehicleData.rpm).to(equal(@(rpm))); + expect(onVehicleData.speed).to(equal(@(speed))); + expect(onVehicleData.steeringWheelAngle).to(equal((steeringWheelAngle))); + expect(onVehicleData.tirePressure).to(equal(tires)); + expect(onVehicleData.turnSignal).to(equal(turnSignal)); + expect(onVehicleData.vin).to(equal(vin)); + expect(onVehicleData.wiperStatus).to(equal(wiperStatus)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index 8e198e518..53e438f7c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -158,7 +158,7 @@ describe(@"initializers", ^{ context(@"init", ^{ SDLGetVehicleData* testRequest = [[SDLGetVehicleData alloc] init]; - it(@"all set", ^{ + it(@"should set all the parameters to nil", ^{ expect(testRequest.accPedalPosition).to(beNil()); expect(testRequest.airbagStatus).to(beNil()); expect(testRequest.beltStatus).to(beNil()); @@ -195,10 +195,10 @@ describe(@"initializers", ^{ context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:emergencyEvent:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:wiperStatus:", ^{ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:NO beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES emergencyEvent:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES vin:YES wiperStatus:YES]; + SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:NO beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES emergencyEvent:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES vin:YES wiperStatus:YES]; #pragma clang diagnostic pop - it(@"all set", ^{ + it(@"should set all the parameters properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@NO)); expect(testRequest.beltStatus).to(equal(@YES)); @@ -238,7 +238,7 @@ describe(@"initializers", ^{ 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(@"should set all the parameters properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); @@ -277,7 +277,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 push - it(@"all set", ^{ + it(@"should set all the parameters properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); @@ -311,40 +311,9 @@ describe(@"initializers", ^{ }); }); - 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 - handsOffSteering:YES]; - it(@"all set", ^{ + context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:handsOffSteering:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:vin:wiperStatus:", ^{ + SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] 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 handsOffSteering: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]; + it(@"should set all the parameters to YES", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); @@ -384,7 +353,7 @@ describe(@"initializers", ^{ [testRequest setOEMCustomVehicleData:@"OEMCustomVehicleData" withVehicleDataState:NO]; [testRequest setOEMCustomVehicleData:@"OEMCustomVehicleData1" withVehicleDataState:YES]; - it(@"all set", ^{ + it(@"should set all the OEMCustomVehicleData properly", ^{ expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData"]).to(equal(@NO)); expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData1"]).to(equal(@YES)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m index ac0be1a61..ca73af6f6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -158,7 +158,7 @@ describe(@"initializers", ^{ context(@"init", ^{ SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] init]; - it(@"all set", ^{ + it(@"should set all the parameters to nil", ^{ expect(testRequest.accPedalPosition).to(beNil()); expect(testRequest.airbagStatus).to(beNil()); expect(testRequest.beltStatus).to(beNil()); @@ -192,10 +192,10 @@ describe(@"initializers", ^{ }); }); -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:", ^{ - 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 handsOffSteering:YES]; + context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:handsOffSteering:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:", ^{ + 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 handsOffSteering:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES turnSignal:YES wiperStatus:YES]; - it(@"all set", ^{ + it(@"should set all the parameters to YES", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); @@ -234,7 +234,7 @@ context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformat SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES electronicParkBrakeStatus:YES emergencyEvent:YES engineOilLife:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES fuelRange:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES turnSignal:YES wiperStatus:YES]; #pragma clang diagnostic pop - it(@"all set", ^{ + it(@"should set all the parameters properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); @@ -312,7 +312,7 @@ context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformat [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:NO]; [testRequest setOEMCustomVehicleData:@"customVehicleData1" withVehicleDataState:YES]; - it(@"all set", ^{ + it(@"should set the custom data properly", ^{ expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@NO)); expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(equal(@YES)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m index 34fb18b68..a389ed8cc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -158,7 +158,7 @@ describe(@"initializers", ^{ context(@"init", ^{ SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] init]; - it(@"all set", ^{ + it(@"should set all the parameters to nil", ^{ expect(testRequest.accPedalPosition).to(beNil()); expect(testRequest.airbagStatus).to(beNil()); expect(testRequest.beltStatus).to(beNil()); @@ -192,9 +192,9 @@ describe(@"initializers", ^{ }); }); context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:", ^{ - SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] 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 handsOffSteering:YES]; + SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES cloudAppVehicleID:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES electronicParkBrakeStatus:YES emergencyEvent:YES engineOilLife:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES fuelRange:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES turnSignal:YES wiperStatus:YES handsOffSteering:YES]; - it(@"all set", ^{ + it(@"should set all the parameters to YES", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); @@ -273,7 +273,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(@"should set all the parameters properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); expect(testRequest.airbagStatus).to(equal(@YES)); expect(testRequest.beltStatus).to(equal(@YES)); @@ -311,7 +311,7 @@ describe(@"initializers", ^{ [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:NO]; [testRequest setOEMCustomVehicleData:@"customVehicleData1" withVehicleDataState:YES]; - it(@"all set", ^{ + it(@"should set all the custom data properly", ^{ expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@NO)); expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(equal(@YES)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index 324cd96e1..21426fc09 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -204,4 +204,73 @@ describe(@"Getter/Setter Tests", ^ { }); }); +describe(@"Convenience init test", ^ { + it(@"Should set and get Generic Network Signal Data", ^{ + SDLSubscribeVehicleDataResponse *testResponse = + [[SDLSubscribeVehicleDataResponse alloc] initWithAccPedalPosition:vehicleDataResult + airbagStatus:vehicleDataResult + beltStatus:vehicleDataResult + bodyInformation:vehicleDataResult + cloudAppVehicleID:vehicleDataResult + clusterModes:vehicleDataResult + deviceStatus:vehicleDataResult + driverBraking:vehicleDataResult + eCallInfo:vehicleDataResult + electronicParkBrakeStatus:vehicleDataResult + emergencyEvent:vehicleDataResult + engineOilLife:vehicleDataResult + engineTorque:vehicleDataResult + externalTemperature:vehicleDataResult + fuelLevel:vehicleDataResult + fuelLevel_State:vehicleDataResult + fuelRange:vehicleDataResult + gps:vehicleDataResult + handsOffSteering:vehicleDataResult + headLampStatus:vehicleDataResult + instantFuelConsumption:vehicleDataResult + myKey:vehicleDataResult + odometer:vehicleDataResult + prndl:vehicleDataResult + rpm:vehicleDataResult + speed:vehicleDataResult + steeringWheelAngle:vehicleDataResult + tirePressure:vehicleDataResult + turnSignal:vehicleDataResult + wiperStatus:vehicleDataResult]; + [testResponse setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:customOEMvehicleDataResult]; + + expect([testResponse getOEMCustomVehicleData:@"customOEMVehicleData"]).to(equal(customOEMvehicleDataResult)); + expect(testResponse.accPedalPosition).to(equal(vehicleDataResult)); + expect(testResponse.airbagStatus).to(equal(vehicleDataResult)); + expect(testResponse.beltStatus).to(equal(vehicleDataResult)); + expect(testResponse.bodyInformation).to(equal(vehicleDataResult)); + expect(testResponse.cloudAppVehicleID).to(equal(vehicleDataResult)); + expect(testResponse.clusterModes).to(equal(vehicleDataResult)); + expect(testResponse.deviceStatus).to(equal(vehicleDataResult)); + expect(testResponse.driverBraking).to(equal(vehicleDataResult)); + expect(testResponse.eCallInfo).to(equal(vehicleDataResult)); + expect(testResponse.electronicParkBrakeStatus).to(equal(vehicleDataResult)); + expect(testResponse.emergencyEvent).to(equal(vehicleDataResult)); + expect(testResponse.engineOilLife).to(equal(vehicleDataResult)); + expect(testResponse.engineTorque).to(equal(vehicleDataResult)); + expect(testResponse.externalTemperature).to(equal(vehicleDataResult)); + expect(testResponse.fuelLevel).to(equal(vehicleDataResult)); + expect(testResponse.fuelLevel_State).to(equal(vehicleDataResult)); + expect(testResponse.fuelRange).to(equal(vehicleDataResult)); + expect(testResponse.gps).to(equal(vehicleDataResult)); + expect(testResponse.handsOffSteering).to(equal(vehicleDataResult)); + expect(testResponse.headLampStatus).to(equal(vehicleDataResult)); + expect(testResponse.instantFuelConsumption).to(equal(vehicleDataResult)); + expect(testResponse.myKey).to(equal(vehicleDataResult)); + expect(testResponse.odometer).to(equal(vehicleDataResult)); + expect(testResponse.prndl).to(equal(vehicleDataResult)); + expect(testResponse.rpm).to(equal(vehicleDataResult)); + expect(testResponse.speed).to(equal(vehicleDataResult)); + expect(testResponse.steeringWheelAngle).to(equal(vehicleDataResult)); + expect(testResponse.tirePressure).to(equal(vehicleDataResult)); + expect(testResponse.turnSignal).to(equal(vehicleDataResult)); + expect(testResponse.wiperStatus).to(equal(vehicleDataResult)); + }); +}); + QuickSpecEnd |