Implement SDL 0173 Read Generic Network Signal Data

SmartDeviceLink/SDLGetVehicleData.h

@@ -272,6 +272,26 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nullable, strong, nonatomic) NSNumber<SDLBool> *cloudAppVehicleID;
 
+/**
+ Sets the OEM custom vehicle data state for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item.
+ @param vehicleDataState A boolean value.  If true, requests the OEM custom vehicle data item.
+
+  Added in SmartDeviceLink 6.0
+ */
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState;
+
+/**
+ Gets the OEM custom vehicle data value for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item.
+ @return The state of an OEM custom vehicle data item for the given vehicle data name.
+
+  Added in SmartDeviceLink 6.0
+ */
+- (NSNumber<SDLBool> *)getOEMCustomVehicleData:(NSString *)vehicleDataName;
+
 @end
 
 NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLGetVehicleData.m

@@ -309,6 +309,14 @@ - (void)setCloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID {
     return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSNumber.class error:nil];
 }
 
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState {
+    [self.parameters sdl_setObject:@(vehicleDataState) forName:vehicleDataName];
+}
+
+- (NSNumber<SDLBool> *)getOEMCustomVehicleData:(NSString *)vehicleDataName {
+    return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSNumber.class error:nil];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLGetVehicleDataResponse.h

@@ -186,6 +186,26 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nullable, strong, nonatomic) NSString *cloudAppVehicleID;
 
+/**
+ Sets the OEM custom vehicle data state for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item.
+ @param vehicleDataState An object containing the OEM custom vehicle data item.
+
+  Added in SmartDeviceLink 6.0
+ */
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(NSObject *)vehicleDataState;
+
+/**
+ Gets the OEM custom vehicle data item for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item.
+ @return An OEM custom vehicle data object for the given vehicle data name.
+
+  Added in SmartDeviceLink 6.0
+ */
+- (NSObject *)getOEMCustomVehicleData:(NSString *)vehicleDataName;
+
 @end
 
 NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLGetVehicleDataResponse.m

@@ -273,6 +273,14 @@ - (nullable NSString *)cloudAppVehicleID {
     return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSString.class error:nil];
 }
 
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(NSObject *)vehicleDataState {
+    [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName];
+}
+
+- (NSObject *)getOEMCustomVehicleData:(NSString *)vehicleDataName {
+    return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSObject.class error:nil];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLOnVehicleData.h

@@ -186,6 +186,26 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nullable, strong, nonatomic) NSString *cloudAppVehicleID;
 
+/**
+ Sets the OEM custom vehicle data state for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item.
+ @param vehicleDataState An object containing the OEM custom vehicle data item.
+
+  Added in SmartDeviceLink 6.0
+ */
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(NSObject *)vehicleDataState;
+
+/**
+ Gets the OEM custom vehicle data item for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item.
+ @return An OEM custom vehicle data object for the given vehicle data name.
+
+  Added in SmartDeviceLink 6.0
+ */
+- (NSObject *)getOEMCustomVehicleData:(NSString *)vehicleDataName;
+
 @end
 
 NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLOnVehicleData.m

@@ -272,6 +272,14 @@ - (nullable NSString *)cloudAppVehicleID {
     return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSString.class error:nil];
 }
 
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(NSObject *)vehicleDataState {
+    [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName];
+}
+
+- (NSObject *)getOEMCustomVehicleData:(NSString *)vehicleDataName {
+    return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSObject.class error:nil];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLRPCParameterNames.h

@@ -120,6 +120,7 @@ extern SDLRPCParameterName const SDLRPCParameterNameCurrentTemperature;
 extern SDLRPCParameterName const SDLRPCParameterNameCushion;
 extern SDLRPCParameterName const SDLRPCParameterNameCustomButtonId;
 extern SDLRPCParameterName const SDLRPCParameterNameCustomPresets;
+extern SDLRPCParameterName const SDLRPCParameterNameOEMCustomDataType;
 extern SDLRPCParameterName const SDLRPCParameterNameData;
 extern SDLRPCParameterName const SDLRPCParameterNameDataResult;
 extern SDLRPCParameterName const SDLRPCParameterNameDataType;

SmartDeviceLink/SDLRPCParameterNames.m

@@ -403,6 +403,7 @@
 SDLRPCParameterName const SDLRPCParameterNameNumberCustomPresetsAvailable = @"numCustomPresetsAvailable";
 SDLRPCParameterName const SDLRPCParameterNameNumberTicks = @"numTicks";
 SDLRPCParameterName const SDLRPCParameterNameOdometer = @"odometer";
+SDLRPCParameterName const SDLRPCParameterNameOEMCustomDataType = @"oemCustomDataType";
 SDLRPCParameterName const SDLRPCParameterNameOffset = @"offset";
 SDLRPCParameterName const SDLRPCParameterNameOnLockScreenStatus = @"OnLockScreenStatus";
 SDLRPCParameterName const SDLRPCParameterNameOnScreenPresetsAvailable = @"onScreenPresetsAvailable";

SmartDeviceLink/SDLSubscribeVehicleData.h

@@ -266,6 +266,28 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *cloudAppVehicleID;
 
+/**
+ Sets the OEM custom vehicle data state for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item.
+ @param vehicleDataState A boolean value.  If true, requests the OEM custom vehicle data item.
+
+  Added in SmartDeviceLink 6.0
+ */
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState;
+
+/**
+ Gets the OEM custom vehicle data value for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item.
+ @return The state of an OEM custom vehicle data item for the given vehicle data name.
+
+  Added in SmartDeviceLink 6.0
+ */
+- (NSNumber<SDLBool> *)getOEMCustomVehicleData:(NSString *)vehicleDataName;
+
+
+
 @end
 
 NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLSubscribeVehicleData.m

@@ -300,6 +300,14 @@ - (void)setCloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID {
     return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSNumber.class error:nil];
 }
 
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState {
+    [self.parameters sdl_setObject:@(vehicleDataState) forName:vehicleDataName];
+}
+
+- (NSNumber<SDLBool> *)getOEMCustomVehicleData:(NSString *)vehicleDataName {
+    return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSNumber.class error:nil];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLSubscribeVehicleDataResponse.h

@@ -219,6 +219,26 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (strong, nonatomic, nullable) SDLVehicleDataResult *cloudAppVehicleID;
 
+/**
+ Sets the OEM custom vehicle data state for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item.
+ @param vehicleDataState SDLVehicleDataResult object containing custom data type and result code information.
+
+  Added SmartDeviceLink 6.0
+ */
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState;
+
+/**
+ Gets the OEM custom vehicle data state for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item.
+ @return SDLVehicleDataResult An object containing custom data type and result code information.
+
+  Added SmartDeviceLink 6.0
+ */
+- (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName;
+
 @end
 
 NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLSubscribeVehicleDataResponse.m

@@ -254,6 +254,14 @@ - (nullable SDLVehicleDataResult *)cloudAppVehicleID {
     return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:SDLVehicleDataResult.class error:nil];
 }
 
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState {
+    [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName];
+}
+
+- (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName {
+    return [self.parameters sdl_objectForName:vehicleDataName ofClass:SDLVehicleDataResult.class error:nil];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLUnsubscribeVehicleData.h

@@ -268,6 +268,25 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *cloudAppVehicleID;
 
+/**
+ Sets the OEM custom vehicle data state for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item.
+ @param vehicleDataState A boolean value.  If true, requests an unsubscribes of the OEM custom vehicle data item.
+
+  Added SmartDeviceLink 6.0
+ */
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState;
+
+/**
+ Gets the OEM custom vehicle data state for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item to unsubscribe for.
+ @return A boolean value indicating if an unsubscribe request will occur for the OEM custom vehicle data item.
+
+  Added SmartDeviceLink 6.0
+ */
+- (NSNumber<SDLBool> *)getOEMCustomVehicleData:(NSString *)vehicleDataName;
 
 @end
 

SmartDeviceLink/SDLUnsubscribeVehicleData.m

@@ -300,6 +300,14 @@ - (void)setCloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID {
     return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSNumber.class error:nil];
 }
 
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState {
+    [self.parameters sdl_setObject:@(vehicleDataState) forName:vehicleDataName];
+}
+
+- (NSNumber<SDLBool> *)getOEMCustomVehicleData:(NSString *)vehicleDataName {
+    return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSNumber.class error:nil];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h

@@ -218,6 +218,26 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (strong, nonatomic, nullable) SDLVehicleDataResult *cloudAppVehicleID;
 
+/**
+ Sets the OEM custom vehicle data state for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item.
+ @param vehicleDataState SDLVehicleDataResult object containing custom data type and result code information.
+
+ Added SmartDeviceLink 6.0
+ */
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState;
+
+/**
+ Gets the OEM custom vehicle data state for any given OEM custom vehicle data name.
+
+ @param vehicleDataName The name of the OEM custom vehicle data item.
+ @return SDLVehicleDataResult object containing custom data type and result code information.
+
+ Added SmartDeviceLink 6.0
+ */
+- (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName;
+
 @end
 
 NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m

@@ -254,6 +254,14 @@ - (nullable SDLVehicleDataResult *)cloudAppVehicleID {
     return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:SDLVehicleDataResult.class error:nil];
 }
 
+- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState {
+    [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName];
+}
+
+- (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName {
+    return [self.parameters sdl_objectForName:vehicleDataName ofClass:SDLVehicleDataResult.class error:nil];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

SmartDeviceLink/SDLVehicleDataResult.h

@@ -13,11 +13,34 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface SDLVehicleDataResult : SDLRPCStruct
 
+/**
+ *  Convenience init for creating a SDLVehicleDataResult with a dataType
+ *
+ *  @param dataType The Vehicle DataType data
+ *  @param resultCode The VehicleData ResultCode data
+ */
+- (instancetype)initWithDataType:(SDLVehicleDataType)dataType resultCode:(SDLVehicleDataResultCode)resultCode;
+
+/**
+ *  Convenience init for creating a SDLVehicleDataResult with a customDataType
+ *
+ *  @param customDataType The custom dataType data
+ *  @param resultCode The VehicleData ResultCode data
+ */
+- (instancetype)initWithCustomOEMDataType:(NSString *)customDataType resultCode:(SDLVehicleDataResultCode)resultCode;
+
 /**
  Defined published data element type
  */
 @property (strong, nonatomic) SDLVehicleDataType dataType;
 
+/**
+ OEM custom defined published data element type
+
+ Added SmartDeviceLink 6.0
+ */
+@property (nullable, strong, nonatomic) NSString *customOEMDataType;
+
 /**
  Published data result code
  */

SmartDeviceLink/SDLVehicleDataResult.m

@@ -10,6 +10,30 @@
 
 @implementation SDLVehicleDataResult
 
+- (instancetype)initWithDataType:(SDLVehicleDataType)dataType resultCode:(SDLVehicleDataResultCode)resultCode {
+    self = [self init];
+    if (!self) {
+        return nil;
+    }
+
+    self.dataType = dataType;
+    self.resultCode = resultCode;
+
+    return self;
+}
+
+- (instancetype)initWithCustomOEMDataType:(NSString *)customDataType resultCode:(SDLVehicleDataResultCode)resultCode{
+    self = [self init];
+    if (!self) {
+        return nil;
+    }
+
+    self.customOEMDataType = customDataType;
+    self.resultCode = resultCode;
+
+    return self;
+}
+
 - (void)setDataType:(SDLVehicleDataType)dataType {
     [self.store sdl_setObject:dataType forName:SDLRPCParameterNameDataType];
 }
@@ -28,6 +52,15 @@ - (SDLVehicleDataResultCode)resultCode {
     return [self.store sdl_enumForName:SDLRPCParameterNameResultCode error:&error];
 }
 
+- (nullable NSString *)customOEMDataType {
+    NSError *error = nil;
+    return [self.store sdl_enumForName:SDLRPCParameterNameOEMCustomDataType error:&error];
+}
+
+- (void)setCustomOEMDataType:(nullable NSString *)oemCustomDataType {
+    [self.store sdl_setObject:oemCustomDataType forName:SDLRPCParameterNameOEMCustomDataType];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END