diff options
| author | Muller, Alexander (A.) <amulle19@ford.com> | 2017-01-11 13:07:31 -0800 |
|---|---|---|
| committer | Muller, Alexander (A.) <amulle19@ford.com> | 2017-01-11 13:07:31 -0800 |
| commit | 1f5f90d1409842bc9a0b1579f4988fe0ad94f36e (patch) | |
| tree | 29e6396af82c968f38c4820e73ab084afc36587e /SmartDeviceLink/SDLDiagnosticMessage.h | |
| parent | e8c21ac87e9756cf2a4e380aec40ef8e26e3f4d4 (diff) | |
| parent | d102326380d144e1c35e6f0ae44be2e9ab387784 (diff) | |
| download | sdl_ios-1f5f90d1409842bc9a0b1579f4988fe0ad94f36e.tar.gz | |
Merge remote-tracking branch 'origin/master' into develop
* origin/master: (30 commits)
Remove a test focus
Fixed test cases
Fix podspec not updated with latest version number
Update for v4.5.0
Follow style guide for boolean check
Updated formatting of README.md
Added steps for using the lock screen manager from SDL's bundle to the readme.
Added check when trying to upload an appIcon for a head unit that does not support graphics.
Update for v4.5.0
Fixed issue with trying to upload a file that is nil will cause an infinite loop.
Fixed an issue with initializer causing infinite loop.
Improved readability for nil-checks.
Fixed issue relating to SDLLocationDetails' searchAddress using the wrong key for object store.
Fixed formatting for some interfaces.
Fixed issue with LocationDetails' properties not properly becoming initialized.
Fixed issue with waypoints not being correctly initialized as SDLLocationDetails
Adding in nil checks for completion handlers of Streaming Media Manager.
Updated description to return correct control data name.
Update changelog for v4.5.0-beta.1
Update for v4.5.0-beta.1 release
...
# Conflicts:
# SmartDeviceLink/SDLDiagnosticMessage.m
# SmartDeviceLink/SDLGetWaypointsResponse.m
# SmartDeviceLink/SDLKeyboardProperties.h
# SmartDeviceLink/SDLLocationDetails.m
# SmartDeviceLink/SDLNames.h
# SmartDeviceLink/SDLOnWaypointChange.m
# SmartDeviceLink/SDLPerformInteraction.h
# SmartDeviceLink/SDLPerformInteraction.m
# SmartDeviceLink/SDLProxy.m
# SmartDeviceLink/SDLPutFile.h
# SmartDeviceLink/SDLReadDID.m
# SmartDeviceLink/SDLSetGlobalProperties.h
# SmartDeviceLink/SDLSetMediaClockTimer.h
# SmartDeviceLink/SDLSoftButton.h
# SmartDeviceLink/SDLUnsubscribeWaypoints.m
# SmartDeviceLink/SDLUpdateTurnList.m
# SmartDeviceLink/SDLV2ProtocolHeader.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationDetailsSpec.m
Diffstat (limited to 'SmartDeviceLink/SDLDiagnosticMessage.h')
| -rw-r--r-- | SmartDeviceLink/SDLDiagnosticMessage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SmartDeviceLink/SDLDiagnosticMessage.h b/SmartDeviceLink/SDLDiagnosticMessage.h index 157578406..3070a5684 100644 --- a/SmartDeviceLink/SDLDiagnosticMessage.h +++ b/SmartDeviceLink/SDLDiagnosticMessage.h @@ -11,7 +11,7 @@ */ @interface SDLDiagnosticMessage : SDLRPCRequest -- (instancetype)initWithTargetId:(UInt16)targetId length:(UInt16)length data:(NSArray<NSNumber<SDLInt> *> *)data; +- (instancetype)initWithTargetId:(UInt16)targetId length:(UInt16)length data:(NSArray<NSNumber<SDLUInt> *> *)data; /** * Name of target ECU |