Changed overall naming strategy to have a SmartDeviceLink framework (instead of a...

Added all 2.0 level features (vehicle data, scrollable message, audio pass thru)
Expanded 1.0 features to include additional features such as icons/graphics and softbuttons
Updated to 2.0 protocol (handles binary data for audio and graphics)

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..8fd096f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+# OS Generated Files #
+.DS_Store
+Thumbs.db

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink.xcodeproj/project.pbxproj b/SDL_iOS/SmartDeviceLink/SmartDeviceLink.xcodeproj/project.pbxproj
new file mode 100644 (file)
index 0000000..67afe98
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink.xcodeproj/project.pbxproj
@@ -0,0 +1,1873 @@
+// !$*UTF8*$!
+{
+       archiveVersion = 1;
+       classes = {
+       };
+       objectVersion = 46;
+       objects = {
+
+/* Begin PBXBuildFile section */
+               5931469617E03CFD005C49C5 /* SDLBitConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C036B17DEFF4F003E6E1A /* SDLBitConverter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               594910291840B22E0050AEE5 /* SmartDeviceLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 594910281840B22E0050AEE5 /* SmartDeviceLink.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04E217DEFF50003E6E1A /* SDLAbstractProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C034917DEFF4F003E6E1A /* SDLAbstractProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04E317DEFF50003E6E1A /* SDLAbstractProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C034A17DEFF4F003E6E1A /* SDLAbstractProtocol.m */; };
+               597C04E417DEFF50003E6E1A /* SDLAbstractTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C034B17DEFF4F003E6E1A /* SDLAbstractTransport.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04E617DEFF50003E6E1A /* SDLAddCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C034D17DEFF4F003E6E1A /* SDLAddCommand.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04E717DEFF50003E6E1A /* SDLAddCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C034E17DEFF4F003E6E1A /* SDLAddCommand.m */; };
+               597C04E817DEFF50003E6E1A /* SDLAddCommandResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C034F17DEFF4F003E6E1A /* SDLAddCommandResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04E917DEFF50003E6E1A /* SDLAddCommandResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C035017DEFF4F003E6E1A /* SDLAddCommandResponse.m */; };
+               597C04EA17DEFF50003E6E1A /* SDLAddSubMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C035117DEFF4F003E6E1A /* SDLAddSubMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04EB17DEFF50003E6E1A /* SDLAddSubMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C035217DEFF4F003E6E1A /* SDLAddSubMenu.m */; };
+               597C04EC17DEFF50003E6E1A /* SDLAddSubMenuResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C035317DEFF4F003E6E1A /* SDLAddSubMenuResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04ED17DEFF50003E6E1A /* SDLAddSubMenuResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C035417DEFF4F003E6E1A /* SDLAddSubMenuResponse.m */; };
+               597C04EE17DEFF50003E6E1A /* SDLAlert.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C035517DEFF4F003E6E1A /* SDLAlert.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04EF17DEFF50003E6E1A /* SDLAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C035617DEFF4F003E6E1A /* SDLAlert.m */; };
+               597C04F017DEFF50003E6E1A /* SDLAlertManeuver.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C035717DEFF4F003E6E1A /* SDLAlertManeuver.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04F117DEFF50003E6E1A /* SDLAlertManeuver.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C035817DEFF4F003E6E1A /* SDLAlertManeuver.m */; };
+               597C04F217DEFF50003E6E1A /* SDLAlertManeuverResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C035917DEFF4F003E6E1A /* SDLAlertManeuverResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04F317DEFF50003E6E1A /* SDLAlertManeuverResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C035A17DEFF4F003E6E1A /* SDLAlertManeuverResponse.m */; };
+               597C04F417DEFF50003E6E1A /* SDLAlertResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C035B17DEFF4F003E6E1A /* SDLAlertResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04F517DEFF50003E6E1A /* SDLAlertResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C035C17DEFF4F003E6E1A /* SDLAlertResponse.m */; };
+               597C04F617DEFF50003E6E1A /* SDLAppHMIType.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C035D17DEFF4F003E6E1A /* SDLAppHMIType.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04F717DEFF50003E6E1A /* SDLAppHMIType.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C035E17DEFF4F003E6E1A /* SDLAppHMIType.m */; };
+               597C04F817DEFF50003E6E1A /* SDLAppInterfaceUnregisteredReason.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C035F17DEFF4F003E6E1A /* SDLAppInterfaceUnregisteredReason.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04F917DEFF50003E6E1A /* SDLAppInterfaceUnregisteredReason.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C036017DEFF4F003E6E1A /* SDLAppInterfaceUnregisteredReason.m */; };
+               597C04FA17DEFF50003E6E1A /* SDLAudioPassThruCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C036117DEFF4F003E6E1A /* SDLAudioPassThruCapabilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04FB17DEFF50003E6E1A /* SDLAudioPassThruCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C036217DEFF4F003E6E1A /* SDLAudioPassThruCapabilities.m */; };
+               597C04FC17DEFF50003E6E1A /* SDLAudioStreamingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C036317DEFF4F003E6E1A /* SDLAudioStreamingState.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04FD17DEFF50003E6E1A /* SDLAudioStreamingState.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C036417DEFF4F003E6E1A /* SDLAudioStreamingState.m */; };
+               597C04FE17DEFF50003E6E1A /* SDLAudioType.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C036517DEFF4F003E6E1A /* SDLAudioType.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C04FF17DEFF50003E6E1A /* SDLAudioType.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C036617DEFF4F003E6E1A /* SDLAudioType.m */; };
+               597C050017DEFF50003E6E1A /* SDLBeltStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C036717DEFF4F003E6E1A /* SDLBeltStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C050117DEFF50003E6E1A /* SDLBeltStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C036817DEFF4F003E6E1A /* SDLBeltStatus.m */; };
+               597C050217DEFF50003E6E1A /* SDLBinaryFrameHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C036917DEFF4F003E6E1A /* SDLBinaryFrameHeader.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C050317DEFF50003E6E1A /* SDLBinaryFrameHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C036A17DEFF4F003E6E1A /* SDLBinaryFrameHeader.m */; };
+               597C050517DEFF50003E6E1A /* SDLBitConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C036C17DEFF4F003E6E1A /* SDLBitConverter.m */; };
+               597C050617DEFF50003E6E1A /* SDLBitsPerSample.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C036D17DEFF4F003E6E1A /* SDLBitsPerSample.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C050717DEFF50003E6E1A /* SDLBitsPerSample.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C036E17DEFF4F003E6E1A /* SDLBitsPerSample.m */; };
+               597C050817DEFF50003E6E1A /* SDLBodyInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C036F17DEFF4F003E6E1A /* SDLBodyInformation.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C050917DEFF50003E6E1A /* SDLBodyInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C037017DEFF4F003E6E1A /* SDLBodyInformation.m */; };
+               597C050A17DEFF50003E6E1A /* SDLButtonCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C037117DEFF4F003E6E1A /* SDLButtonCapabilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C050B17DEFF50003E6E1A /* SDLButtonCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C037217DEFF4F003E6E1A /* SDLButtonCapabilities.m */; };
+               597C050C17DEFF50003E6E1A /* SDLButtonEventMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C037317DEFF4F003E6E1A /* SDLButtonEventMode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C050D17DEFF50003E6E1A /* SDLButtonEventMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C037417DEFF4F003E6E1A /* SDLButtonEventMode.m */; };
+               597C050E17DEFF50003E6E1A /* SDLButtonName.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C037517DEFF4F003E6E1A /* SDLButtonName.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C050F17DEFF50003E6E1A /* SDLButtonName.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C037617DEFF4F003E6E1A /* SDLButtonName.m */; };
+               597C051017DEFF50003E6E1A /* SDLButtonPressMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C037717DEFF4F003E6E1A /* SDLButtonPressMode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C051117DEFF50003E6E1A /* SDLButtonPressMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C037817DEFF4F003E6E1A /* SDLButtonPressMode.m */; };
+               597C051217DEFF50003E6E1A /* SDLChangeRegistration.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C037917DEFF4F003E6E1A /* SDLChangeRegistration.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C051317DEFF50003E6E1A /* SDLChangeRegistration.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C037A17DEFF4F003E6E1A /* SDLChangeRegistration.m */; };
+               597C051417DEFF50003E6E1A /* SDLChangeRegistrationResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C037B17DEFF4F003E6E1A /* SDLChangeRegistrationResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C051517DEFF50003E6E1A /* SDLChangeRegistrationResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C037C17DEFF4F003E6E1A /* SDLChangeRegistrationResponse.m */; };
+               597C051617DEFF50003E6E1A /* SDLCharacterSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C037D17DEFF4F003E6E1A /* SDLCharacterSet.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C051717DEFF50003E6E1A /* SDLCharacterSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C037E17DEFF4F003E6E1A /* SDLCharacterSet.m */; };
+               597C051817DEFF50003E6E1A /* SDLChoice.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C037F17DEFF4F003E6E1A /* SDLChoice.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C051917DEFF50003E6E1A /* SDLChoice.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C038017DEFF4F003E6E1A /* SDLChoice.m */; };
+               597C051A17DEFF50003E6E1A /* SDLCompassDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C038117DEFF4F003E6E1A /* SDLCompassDirection.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C051B17DEFF50003E6E1A /* SDLCompassDirection.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C038217DEFF4F003E6E1A /* SDLCompassDirection.m */; };
+               597C051C17DEFF50003E6E1A /* SDLComponentVolumeStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C038317DEFF4F003E6E1A /* SDLComponentVolumeStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C051D17DEFF50003E6E1A /* SDLComponentVolumeStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C038417DEFF4F003E6E1A /* SDLComponentVolumeStatus.m */; };
+               597C051E17DEFF50003E6E1A /* SDLConsoleController.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C038517DEFF4F003E6E1A /* SDLConsoleController.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C051F17DEFF50003E6E1A /* SDLConsoleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C038617DEFF4F003E6E1A /* SDLConsoleController.m */; };
+               597C052017DEFF50003E6E1A /* SDLCreateInteractionChoiceSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C038717DEFF4F003E6E1A /* SDLCreateInteractionChoiceSet.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C052117DEFF50003E6E1A /* SDLCreateInteractionChoiceSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C038817DEFF4F003E6E1A /* SDLCreateInteractionChoiceSet.m */; };
+               597C052217DEFF50003E6E1A /* SDLCreateInteractionChoiceSetResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C038917DEFF4F003E6E1A /* SDLCreateInteractionChoiceSetResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C052317DEFF50003E6E1A /* SDLCreateInteractionChoiceSetResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C038A17DEFF4F003E6E1A /* SDLCreateInteractionChoiceSetResponse.m */; };
+               597C052417DEFF50003E6E1A /* SDLDebugTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C038B17DEFF4F003E6E1A /* SDLDebugTool.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C052517DEFF50003E6E1A /* SDLDebugTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C038C17DEFF4F003E6E1A /* SDLDebugTool.m */; };
+               597C052617DEFF50003E6E1A /* SDLDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C038D17DEFF4F003E6E1A /* SDLDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C052717DEFF50003E6E1A /* SDLDeleteCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C038E17DEFF4F003E6E1A /* SDLDeleteCommand.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C052817DEFF50003E6E1A /* SDLDeleteCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C038F17DEFF4F003E6E1A /* SDLDeleteCommand.m */; };
+               597C052917DEFF50003E6E1A /* SDLDeleteCommandResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C039017DEFF4F003E6E1A /* SDLDeleteCommandResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C052A17DEFF50003E6E1A /* SDLDeleteCommandResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C039117DEFF4F003E6E1A /* SDLDeleteCommandResponse.m */; };
+               597C052B17DEFF50003E6E1A /* SDLDeleteFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C039217DEFF4F003E6E1A /* SDLDeleteFile.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C052C17DEFF50003E6E1A /* SDLDeleteFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C039317DEFF4F003E6E1A /* SDLDeleteFile.m */; };
+               597C052D17DEFF50003E6E1A /* SDLDeleteFileResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C039417DEFF4F003E6E1A /* SDLDeleteFileResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C052E17DEFF50003E6E1A /* SDLDeleteFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C039517DEFF4F003E6E1A /* SDLDeleteFileResponse.m */; };
+               597C052F17DEFF50003E6E1A /* SDLDeleteInteractionChoiceSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C039617DEFF4F003E6E1A /* SDLDeleteInteractionChoiceSet.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C053017DEFF50003E6E1A /* SDLDeleteInteractionChoiceSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C039717DEFF4F003E6E1A /* SDLDeleteInteractionChoiceSet.m */; };
+               597C053117DEFF50003E6E1A /* SDLDeleteInteractionChoiceSetResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C039817DEFF4F003E6E1A /* SDLDeleteInteractionChoiceSetResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C053217DEFF50003E6E1A /* SDLDeleteInteractionChoiceSetResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C039917DEFF4F003E6E1A /* SDLDeleteInteractionChoiceSetResponse.m */; };
+               597C053317DEFF50003E6E1A /* SDLDeleteSubMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C039A17DEFF4F003E6E1A /* SDLDeleteSubMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C053417DEFF50003E6E1A /* SDLDeleteSubMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C039B17DEFF4F003E6E1A /* SDLDeleteSubMenu.m */; };
+               597C053517DEFF50003E6E1A /* SDLDeleteSubMenuResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C039C17DEFF4F003E6E1A /* SDLDeleteSubMenuResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C053617DEFF50003E6E1A /* SDLDeleteSubMenuResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C039D17DEFF4F003E6E1A /* SDLDeleteSubMenuResponse.m */; };
+               597C053717DEFF50003E6E1A /* SDLDeviceLevelStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C039E17DEFF4F003E6E1A /* SDLDeviceLevelStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C053817DEFF50003E6E1A /* SDLDeviceLevelStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C039F17DEFF4F003E6E1A /* SDLDeviceLevelStatus.m */; };
+               597C053917DEFF50003E6E1A /* SDLDeviceStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03A017DEFF4F003E6E1A /* SDLDeviceStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C053A17DEFF50003E6E1A /* SDLDeviceStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03A117DEFF4F003E6E1A /* SDLDeviceStatus.m */; };
+               597C053B17DEFF50003E6E1A /* SDLDIDResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03A217DEFF4F003E6E1A /* SDLDIDResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C053C17DEFF50003E6E1A /* SDLDIDResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03A317DEFF4F003E6E1A /* SDLDIDResult.m */; };
+               597C053D17DEFF50003E6E1A /* SDLDimension.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03A417DEFF4F003E6E1A /* SDLDimension.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C053E17DEFF50003E6E1A /* SDLDimension.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03A517DEFF4F003E6E1A /* SDLDimension.m */; };
+               597C053F17DEFF50003E6E1A /* SDLDisplayCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03A617DEFF4F003E6E1A /* SDLDisplayCapabilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C054017DEFF50003E6E1A /* SDLDisplayCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03A717DEFF4F003E6E1A /* SDLDisplayCapabilities.m */; };
+               597C054117DEFF50003E6E1A /* SDLDisplayType.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03A817DEFF4F003E6E1A /* SDLDisplayType.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C054217DEFF50003E6E1A /* SDLDisplayType.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03A917DEFF4F003E6E1A /* SDLDisplayType.m */; };
+               597C054317DEFF50003E6E1A /* SDLDriverDistractionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03AA17DEFF4F003E6E1A /* SDLDriverDistractionState.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C054417DEFF50003E6E1A /* SDLDriverDistractionState.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03AB17DEFF4F003E6E1A /* SDLDriverDistractionState.m */; };
+               597C054517DEFF50003E6E1A /* SDLEncodedSyncPData.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03AC17DEFF4F003E6E1A /* SDLEncodedSyncPData.h */; };
+               597C054617DEFF50003E6E1A /* SDLEncodedSyncPData.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03AD17DEFF4F003E6E1A /* SDLEncodedSyncPData.m */; };
+               597C054717DEFF50003E6E1A /* SDLEncodedSyncPDataResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03AE17DEFF4F003E6E1A /* SDLEncodedSyncPDataResponse.h */; };
+               597C054817DEFF50003E6E1A /* SDLEncodedSyncPDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03AF17DEFF4F003E6E1A /* SDLEncodedSyncPDataResponse.m */; };
+               597C054917DEFF50003E6E1A /* SDLEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03B017DEFF4F003E6E1A /* SDLEncoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C054A17DEFF50003E6E1A /* SDLEndAudioPassThru.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03B117DEFF4F003E6E1A /* SDLEndAudioPassThru.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C054B17DEFF50003E6E1A /* SDLEndAudioPassThru.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03B217DEFF4F003E6E1A /* SDLEndAudioPassThru.m */; };
+               597C054C17DEFF50003E6E1A /* SDLEndAudioPassThruResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03B317DEFF4F003E6E1A /* SDLEndAudioPassThruResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C054D17DEFF50003E6E1A /* SDLEndAudioPassThruResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03B417DEFF4F003E6E1A /* SDLEndAudioPassThruResponse.m */; };
+               597C054E17DEFF50003E6E1A /* SDLEngineInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03B517DEFF4F003E6E1A /* SDLEngineInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C054F17DEFF50003E6E1A /* SDLEngineInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03B617DEFF4F003E6E1A /* SDLEngineInfo.m */; };
+               597C055017DEFF50003E6E1A /* SDLEnum.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03B717DEFF4F003E6E1A /* SDLEnum.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C055117DEFF50003E6E1A /* SDLEnum.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03B817DEFF4F003E6E1A /* SDLEnum.m */; };
+               597C055217DEFF50003E6E1A /* SDLFileType.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03B917DEFF4F003E6E1A /* SDLFileType.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C055317DEFF50003E6E1A /* SDLFileType.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03BA17DEFF4F003E6E1A /* SDLFileType.m */; };
+               597C055417DEFF50003E6E1A /* SDLFunctionID.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03BB17DEFF4F003E6E1A /* SDLFunctionID.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C055517DEFF50003E6E1A /* SDLFunctionID.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03BC17DEFF4F003E6E1A /* SDLFunctionID.m */; };
+               597C055617DEFF50003E6E1A /* SDLGenericResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03BD17DEFF4F003E6E1A /* SDLGenericResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C055717DEFF50003E6E1A /* SDLGenericResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03BE17DEFF4F003E6E1A /* SDLGenericResponse.m */; };
+               597C055817DEFF50003E6E1A /* SDLGetDTCs.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03BF17DEFF4F003E6E1A /* SDLGetDTCs.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C055917DEFF50003E6E1A /* SDLGetDTCs.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03C017DEFF4F003E6E1A /* SDLGetDTCs.m */; };
+               597C055A17DEFF50003E6E1A /* SDLGetDTCsResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03C117DEFF4F003E6E1A /* SDLGetDTCsResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C055B17DEFF50003E6E1A /* SDLGetDTCsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03C217DEFF4F003E6E1A /* SDLGetDTCsResponse.m */; };
+               597C055C17DEFF50003E6E1A /* SDLGetVehicleData.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03C317DEFF4F003E6E1A /* SDLGetVehicleData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C055D17DEFF50003E6E1A /* SDLGetVehicleData.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03C417DEFF4F003E6E1A /* SDLGetVehicleData.m */; };
+               597C055E17DEFF50003E6E1A /* SDLGetVehicleDataResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03C517DEFF4F003E6E1A /* SDLGetVehicleDataResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C055F17DEFF50003E6E1A /* SDLGetVehicleDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03C617DEFF4F003E6E1A /* SDLGetVehicleDataResponse.m */; };
+               597C056017DEFF50003E6E1A /* SDLGlobalProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03C717DEFF4F003E6E1A /* SDLGlobalProperty.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C056117DEFF50003E6E1A /* SDLGlobalProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03C817DEFF4F003E6E1A /* SDLGlobalProperty.m */; };
+               597C056217DEFF50003E6E1A /* SDLGPSData.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03C917DEFF4F003E6E1A /* SDLGPSData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C056317DEFF50003E6E1A /* SDLGPSData.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03CA17DEFF4F003E6E1A /* SDLGPSData.m */; };
+               597C056417DEFF50003E6E1A /* SDLHeadLampStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03CB17DEFF4F003E6E1A /* SDLHeadLampStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C056517DEFF50003E6E1A /* SDLHeadLampStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03CC17DEFF4F003E6E1A /* SDLHeadLampStatus.m */; };
+               597C056617DEFF50003E6E1A /* SDLHMILevel.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03CD17DEFF4F003E6E1A /* SDLHMILevel.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C056717DEFF50003E6E1A /* SDLHMILevel.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03CE17DEFF4F003E6E1A /* SDLHMILevel.m */; };
+               597C056817DEFF50003E6E1A /* SDLHMIPermissions.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03CF17DEFF4F003E6E1A /* SDLHMIPermissions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C056917DEFF50003E6E1A /* SDLHMIPermissions.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03D017DEFF4F003E6E1A /* SDLHMIPermissions.m */; };
+               597C056A17DEFF50003E6E1A /* SDLHMIZoneCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03D117DEFF4F003E6E1A /* SDLHMIZoneCapabilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C056B17DEFF50003E6E1A /* SDLHMIZoneCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03D217DEFF4F003E6E1A /* SDLHMIZoneCapabilities.m */; };
+               597C056C17DEFF50003E6E1A /* SDLIgnitionStableStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03D317DEFF4F003E6E1A /* SDLIgnitionStableStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C056D17DEFF50003E6E1A /* SDLIgnitionStableStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03D417DEFF4F003E6E1A /* SDLIgnitionStableStatus.m */; };
+               597C056E17DEFF50003E6E1A /* SDLIgnitionStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03D517DEFF4F003E6E1A /* SDLIgnitionStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C056F17DEFF50003E6E1A /* SDLIgnitionStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03D617DEFF4F003E6E1A /* SDLIgnitionStatus.m */; };
+               597C057017DEFF50003E6E1A /* SDLImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03D717DEFF4F003E6E1A /* SDLImage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C057117DEFF50003E6E1A /* SDLImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03D817DEFF4F003E6E1A /* SDLImage.m */; };
+               597C057217DEFF50003E6E1A /* SDLImageType.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03D917DEFF4F003E6E1A /* SDLImageType.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C057317DEFF50003E6E1A /* SDLImageType.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03DA17DEFF4F003E6E1A /* SDLImageType.m */; };
+               597C057417DEFF50003E6E1A /* SDLInteractionMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03DB17DEFF4F003E6E1A /* SDLInteractionMode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C057517DEFF50003E6E1A /* SDLInteractionMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03DC17DEFF4F003E6E1A /* SDLInteractionMode.m */; };
+               597C057617DEFF50003E6E1A /* SDLIProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03DD17DEFF4F003E6E1A /* SDLIProxy.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C057717DEFF50003E6E1A /* SDLJingle.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03DE17DEFF4F003E6E1A /* SDLJingle.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C057817DEFF50003E6E1A /* SDLJingle.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03DF17DEFF4F003E6E1A /* SDLJingle.m */; };
+               597C057917DEFF50003E6E1A /* SDLJsonDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03E017DEFF4F003E6E1A /* SDLJsonDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C057A17DEFF50003E6E1A /* SDLJsonDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03E117DEFF4F003E6E1A /* SDLJsonDecoder.m */; };
+               597C057B17DEFF50003E6E1A /* SDLJsonEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03E217DEFF4F003E6E1A /* SDLJsonEncoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C057C17DEFF50003E6E1A /* SDLJsonEncoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03E317DEFF4F003E6E1A /* SDLJsonEncoder.m */; };
+               597C057D17DEFF50003E6E1A /* SDLLanguage.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03E417DEFF4F003E6E1A /* SDLLanguage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C057E17DEFF50003E6E1A /* SDLLanguage.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03E517DEFF4F003E6E1A /* SDLLanguage.m */; };
+               597C057F17DEFF50003E6E1A /* SDLListFiles.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03E617DEFF4F003E6E1A /* SDLListFiles.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C058017DEFF50003E6E1A /* SDLListFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03E717DEFF4F003E6E1A /* SDLListFiles.m */; };
+               597C058117DEFF50003E6E1A /* SDLListFilesResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03E817DEFF4F003E6E1A /* SDLListFilesResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C058217DEFF50003E6E1A /* SDLListFilesResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03E917DEFF4F003E6E1A /* SDLListFilesResponse.m */; };
+               597C058317DEFF50003E6E1A /* SDLMaintenanceModeStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03EA17DEFF4F003E6E1A /* SDLMaintenanceModeStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C058417DEFF50003E6E1A /* SDLMaintenanceModeStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03EB17DEFF4F003E6E1A /* SDLMaintenanceModeStatus.m */; };
+               597C058517DEFF50003E6E1A /* SDLMediaClockFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03EC17DEFF4F003E6E1A /* SDLMediaClockFormat.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C058617DEFF50003E6E1A /* SDLMediaClockFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03ED17DEFF4F003E6E1A /* SDLMediaClockFormat.m */; };
+               597C058717DEFF50003E6E1A /* SDLMenuParams.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03EE17DEFF4F003E6E1A /* SDLMenuParams.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C058817DEFF50003E6E1A /* SDLMenuParams.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03EF17DEFF4F003E6E1A /* SDLMenuParams.m */; };
+               597C058917DEFF50003E6E1A /* SDLNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03F017DEFF4F003E6E1A /* SDLNames.h */; settings = {ATTRIBUTES = (); }; };
+               597C058A17DEFF50003E6E1A /* SDLOnAppInterfaceUnregistered.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03F117DEFF4F003E6E1A /* SDLOnAppInterfaceUnregistered.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C058B17DEFF50003E6E1A /* SDLOnAppInterfaceUnregistered.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03F217DEFF4F003E6E1A /* SDLOnAppInterfaceUnregistered.m */; };
+               597C058C17DEFF50003E6E1A /* SDLOnAudioPassThru.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03F317DEFF4F003E6E1A /* SDLOnAudioPassThru.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C058D17DEFF50003E6E1A /* SDLOnAudioPassThru.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03F417DEFF4F003E6E1A /* SDLOnAudioPassThru.m */; };
+               597C058E17DEFF50003E6E1A /* SDLOnButtonEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03F517DEFF4F003E6E1A /* SDLOnButtonEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C058F17DEFF50003E6E1A /* SDLOnButtonEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03F617DEFF4F003E6E1A /* SDLOnButtonEvent.m */; };
+               597C059017DEFF50003E6E1A /* SDLOnButtonPress.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03F717DEFF4F003E6E1A /* SDLOnButtonPress.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C059117DEFF50003E6E1A /* SDLOnButtonPress.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03F817DEFF4F003E6E1A /* SDLOnButtonPress.m */; };
+               597C059217DEFF50003E6E1A /* SDLOnCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03F917DEFF4F003E6E1A /* SDLOnCommand.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C059317DEFF50003E6E1A /* SDLOnCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03FA17DEFF4F003E6E1A /* SDLOnCommand.m */; };
+               597C059417DEFF50003E6E1A /* SDLOnDriverDistraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03FB17DEFF4F003E6E1A /* SDLOnDriverDistraction.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C059517DEFF50003E6E1A /* SDLOnDriverDistraction.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03FC17DEFF4F003E6E1A /* SDLOnDriverDistraction.m */; };
+               597C059617DEFF50003E6E1A /* SDLOnEncodedSyncPData.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03FD17DEFF4F003E6E1A /* SDLOnEncodedSyncPData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C059717DEFF50003E6E1A /* SDLOnEncodedSyncPData.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C03FE17DEFF4F003E6E1A /* SDLOnEncodedSyncPData.m */; };
+               597C059817DEFF50003E6E1A /* SDLOnHMIStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C03FF17DEFF4F003E6E1A /* SDLOnHMIStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C059917DEFF50003E6E1A /* SDLOnHMIStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C040017DEFF4F003E6E1A /* SDLOnHMIStatus.m */; };
+               597C059A17DEFF50003E6E1A /* SDLOnLanguageChange.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C040117DEFF4F003E6E1A /* SDLOnLanguageChange.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C059B17DEFF50003E6E1A /* SDLOnLanguageChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C040217DEFF4F003E6E1A /* SDLOnLanguageChange.m */; };
+               597C059C17DEFF50003E6E1A /* SDLOnPermissionsChange.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C040317DEFF4F003E6E1A /* SDLOnPermissionsChange.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C059D17DEFF50003E6E1A /* SDLOnPermissionsChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C040417DEFF4F003E6E1A /* SDLOnPermissionsChange.m */; };
+               597C059E17DEFF50003E6E1A /* SDLOnSyncPData.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C040517DEFF4F003E6E1A /* SDLOnSyncPData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C059F17DEFF50003E6E1A /* SDLOnSyncPData.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C040617DEFF4F003E6E1A /* SDLOnSyncPData.m */; };
+               597C05A017DEFF50003E6E1A /* SDLOnTBTClientState.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C040717DEFF4F003E6E1A /* SDLOnTBTClientState.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05A117DEFF50003E6E1A /* SDLOnTBTClientState.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C040817DEFF4F003E6E1A /* SDLOnTBTClientState.m */; };
+               597C05A217DEFF50003E6E1A /* SDLOnVehicleData.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C040917DEFF4F003E6E1A /* SDLOnVehicleData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05A317DEFF50003E6E1A /* SDLOnVehicleData.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C040A17DEFF4F003E6E1A /* SDLOnVehicleData.m */; };
+               597C05A417DEFF50003E6E1A /* SDLParameterPermissions.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C040B17DEFF4F003E6E1A /* SDLParameterPermissions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05A517DEFF50003E6E1A /* SDLParameterPermissions.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C040C17DEFF4F003E6E1A /* SDLParameterPermissions.m */; };
+               597C05A617DEFF50003E6E1A /* SDLPerformAudioPassThru.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C040D17DEFF4F003E6E1A /* SDLPerformAudioPassThru.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05A717DEFF50003E6E1A /* SDLPerformAudioPassThru.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C040E17DEFF4F003E6E1A /* SDLPerformAudioPassThru.m */; };
+               597C05A817DEFF50003E6E1A /* SDLPerformAudioPassThruResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C040F17DEFF4F003E6E1A /* SDLPerformAudioPassThruResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05A917DEFF50003E6E1A /* SDLPerformAudioPassThruResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C041017DEFF4F003E6E1A /* SDLPerformAudioPassThruResponse.m */; };
+               597C05AA17DEFF50003E6E1A /* SDLPerformInteraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C041117DEFF4F003E6E1A /* SDLPerformInteraction.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05AB17DEFF50003E6E1A /* SDLPerformInteraction.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C041217DEFF4F003E6E1A /* SDLPerformInteraction.m */; };
+               597C05AC17DEFF50003E6E1A /* SDLPerformInteractionResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C041317DEFF4F003E6E1A /* SDLPerformInteractionResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05AD17DEFF50003E6E1A /* SDLPerformInteractionResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C041417DEFF4F003E6E1A /* SDLPerformInteractionResponse.m */; };
+               597C05AE17DEFF50003E6E1A /* SDLPermissionItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C041517DEFF4F003E6E1A /* SDLPermissionItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05AF17DEFF50003E6E1A /* SDLPermissionItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C041617DEFF4F003E6E1A /* SDLPermissionItem.m */; };
+               597C05B017DEFF50003E6E1A /* SDLPermissionStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C041717DEFF4F003E6E1A /* SDLPermissionStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05B117DEFF50003E6E1A /* SDLPermissionStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C041817DEFF4F003E6E1A /* SDLPermissionStatus.m */; };
+               597C05B217DEFF50003E6E1A /* SDLPresetBankCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C041917DEFF4F003E6E1A /* SDLPresetBankCapabilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05B317DEFF50003E6E1A /* SDLPresetBankCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C041A17DEFF4F003E6E1A /* SDLPresetBankCapabilities.m */; };
+               597C05B417DEFF50003E6E1A /* SDLPrimaryAudioSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C041B17DEFF4F003E6E1A /* SDLPrimaryAudioSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05B517DEFF50003E6E1A /* SDLPrimaryAudioSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C041C17DEFF4F003E6E1A /* SDLPrimaryAudioSource.m */; };
+               597C05B617DEFF50003E6E1A /* SDLPRNDL.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C041D17DEFF4F003E6E1A /* SDLPRNDL.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05B717DEFF50003E6E1A /* SDLPRNDL.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C041E17DEFF4F003E6E1A /* SDLPRNDL.m */; };
+               597C05B817DEFF50003E6E1A /* SDLIProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C041F17DEFF4F003E6E1A /* SDLIProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05B917DEFF50003E6E1A /* SDLProtocolFrameHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C042017DEFF4F003E6E1A /* SDLProtocolFrameHeader.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05BA17DEFF50003E6E1A /* SDLProtocolFrameHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C042117DEFF4F003E6E1A /* SDLProtocolFrameHeader.m */; };
+               597C05BB17DEFF50003E6E1A /* SDLProtocolFrameHeaderFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C042217DEFF4F003E6E1A /* SDLProtocolFrameHeaderFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05BC17DEFF50003E6E1A /* SDLProtocolFrameHeaderFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C042317DEFF4F003E6E1A /* SDLProtocolFrameHeaderFactory.m */; };
+               597C05BD17DEFF50003E6E1A /* SDLProtocolListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C042417DEFF4F003E6E1A /* SDLProtocolListener.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05BE17DEFF50003E6E1A /* SDLProtocolMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C042517DEFF4F003E6E1A /* SDLProtocolMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05BF17DEFF50003E6E1A /* SDLProtocolMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C042617DEFF4F003E6E1A /* SDLProtocolMessage.m */; };
+               597C05C017DEFF50003E6E1A /* SDLProxyListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C042717DEFF4F003E6E1A /* SDLProxyListener.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05C117DEFF50003E6E1A /* SDLPutFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C042817DEFF4F003E6E1A /* SDLPutFile.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05C217DEFF50003E6E1A /* SDLPutFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C042917DEFF4F003E6E1A /* SDLPutFile.m */; };
+               597C05C317DEFF50003E6E1A /* SDLPutFileResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C042A17DEFF4F003E6E1A /* SDLPutFileResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05C417DEFF50003E6E1A /* SDLPutFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C042B17DEFF4F003E6E1A /* SDLPutFileResponse.m */; };
+               597C05C517DEFF50003E6E1A /* SDLReadDID.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C042C17DEFF4F003E6E1A /* SDLReadDID.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05C617DEFF50003E6E1A /* SDLReadDID.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C042D17DEFF4F003E6E1A /* SDLReadDID.m */; };
+               597C05C717DEFF50003E6E1A /* SDLReadDIDResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C042E17DEFF4F003E6E1A /* SDLReadDIDResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05C817DEFF50003E6E1A /* SDLReadDIDResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C042F17DEFF4F003E6E1A /* SDLReadDIDResponse.m */; };
+               597C05C917DEFF50003E6E1A /* SDLRegisterAppInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C043017DEFF4F003E6E1A /* SDLRegisterAppInterface.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05CA17DEFF50003E6E1A /* SDLRegisterAppInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C043117DEFF4F003E6E1A /* SDLRegisterAppInterface.m */; };
+               597C05CB17DEFF50003E6E1A /* SDLRegisterAppInterfaceResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C043217DEFF4F003E6E1A /* SDLRegisterAppInterfaceResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05CC17DEFF50003E6E1A /* SDLRegisterAppInterfaceResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C043317DEFF4F003E6E1A /* SDLRegisterAppInterfaceResponse.m */; };
+               597C05CD17DEFF50003E6E1A /* SDLResetGlobalProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C043417DEFF4F003E6E1A /* SDLResetGlobalProperties.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05CE17DEFF50003E6E1A /* SDLResetGlobalProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C043517DEFF4F003E6E1A /* SDLResetGlobalProperties.m */; };
+               597C05CF17DEFF50003E6E1A /* SDLResetGlobalPropertiesResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C043617DEFF4F003E6E1A /* SDLResetGlobalPropertiesResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05D017DEFF50003E6E1A /* SDLResetGlobalPropertiesResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C043717DEFF4F003E6E1A /* SDLResetGlobalPropertiesResponse.m */; };
+               597C05D117DEFF50003E6E1A /* SDLResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C043817DEFF4F003E6E1A /* SDLResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05D217DEFF50003E6E1A /* SDLResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C043917DEFF4F003E6E1A /* SDLResult.m */; };
+               597C05D317DEFF50003E6E1A /* SDLRPCMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C043A17DEFF4F003E6E1A /* SDLRPCMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05D417DEFF50003E6E1A /* SDLRPCMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C043B17DEFF4F003E6E1A /* SDLRPCMessage.m */; };
+               597C05D517DEFF50003E6E1A /* SDLRPCMessageType.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C043C17DEFF4F003E6E1A /* SDLRPCMessageType.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05D617DEFF50003E6E1A /* SDLRPCMessageType.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C043D17DEFF4F003E6E1A /* SDLRPCMessageType.m */; };
+               597C05D717DEFF50003E6E1A /* SDLRPCNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C043E17DEFF4F003E6E1A /* SDLRPCNotification.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05D817DEFF50003E6E1A /* SDLRPCNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C043F17DEFF4F003E6E1A /* SDLRPCNotification.m */; };
+               597C05D917DEFF50003E6E1A /* SDLRPCRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C044017DEFF4F003E6E1A /* SDLRPCRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05DA17DEFF50003E6E1A /* SDLRPCRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C044117DEFF4F003E6E1A /* SDLRPCRequest.m */; };
+               597C05DB17DEFF50003E6E1A /* SDLRPCRequestFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C044217DEFF4F003E6E1A /* SDLRPCRequestFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05DC17DEFF50003E6E1A /* SDLRPCRequestFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C044317DEFF4F003E6E1A /* SDLRPCRequestFactory.m */; };
+               597C05DD17DEFF50003E6E1A /* SDLRPCResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C044417DEFF4F003E6E1A /* SDLRPCResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05DE17DEFF50003E6E1A /* SDLRPCResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C044517DEFF4F003E6E1A /* SDLRPCResponse.m */; };
+               597C05DF17DEFF50003E6E1A /* SDLSamplingRate.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C044617DEFF4F003E6E1A /* SDLSamplingRate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05E017DEFF50003E6E1A /* SDLSamplingRate.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C044717DEFF4F003E6E1A /* SDLSamplingRate.m */; };
+               597C05E117DEFF50003E6E1A /* SDLScrollableMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C044817DEFF4F003E6E1A /* SDLScrollableMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05E217DEFF50003E6E1A /* SDLScrollableMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C044917DEFF4F003E6E1A /* SDLScrollableMessage.m */; };
+               597C05E317DEFF50003E6E1A /* SDLScrollableMessageResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C044A17DEFF4F003E6E1A /* SDLScrollableMessageResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05E417DEFF50003E6E1A /* SDLScrollableMessageResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C044B17DEFF4F003E6E1A /* SDLScrollableMessageResponse.m */; };
+               597C05E517DEFF50003E6E1A /* SDLSetAppIcon.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C044C17DEFF4F003E6E1A /* SDLSetAppIcon.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05E617DEFF50003E6E1A /* SDLSetAppIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C044D17DEFF4F003E6E1A /* SDLSetAppIcon.m */; };
+               597C05E717DEFF50003E6E1A /* SDLSetAppIconResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C044E17DEFF4F003E6E1A /* SDLSetAppIconResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05E817DEFF50003E6E1A /* SDLSetAppIconResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C044F17DEFF4F003E6E1A /* SDLSetAppIconResponse.m */; };
+               597C05E917DEFF50003E6E1A /* SDLSetDisplayLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C045017DEFF4F003E6E1A /* SDLSetDisplayLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05EA17DEFF50003E6E1A /* SDLSetDisplayLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C045117DEFF4F003E6E1A /* SDLSetDisplayLayout.m */; };
+               597C05EB17DEFF50003E6E1A /* SDLSetDisplayLayoutResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C045217DEFF4F003E6E1A /* SDLSetDisplayLayoutResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05EC17DEFF50003E6E1A /* SDLSetDisplayLayoutResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C045317DEFF4F003E6E1A /* SDLSetDisplayLayoutResponse.m */; };
+               597C05ED17DEFF50003E6E1A /* SDLSetGlobalProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C045417DEFF4F003E6E1A /* SDLSetGlobalProperties.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05EE17DEFF50003E6E1A /* SDLSetGlobalProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C045517DEFF4F003E6E1A /* SDLSetGlobalProperties.m */; };
+               597C05EF17DEFF50003E6E1A /* SDLSetGlobalPropertiesResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C045617DEFF4F003E6E1A /* SDLSetGlobalPropertiesResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05F017DEFF50003E6E1A /* SDLSetGlobalPropertiesResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C045717DEFF4F003E6E1A /* SDLSetGlobalPropertiesResponse.m */; };
+               597C05F117DEFF50003E6E1A /* SDLSetMediaClockTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C045817DEFF4F003E6E1A /* SDLSetMediaClockTimer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05F217DEFF50003E6E1A /* SDLSetMediaClockTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C045917DEFF4F003E6E1A /* SDLSetMediaClockTimer.m */; };
+               597C05F317DEFF50003E6E1A /* SDLSetMediaClockTimerResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C045A17DEFF4F003E6E1A /* SDLSetMediaClockTimerResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05F417DEFF50003E6E1A /* SDLSetMediaClockTimerResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C045B17DEFF4F003E6E1A /* SDLSetMediaClockTimerResponse.m */; };
+               597C05F517DEFF50003E6E1A /* SDLShow.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C045C17DEFF4F003E6E1A /* SDLShow.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05F617DEFF50003E6E1A /* SDLShow.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C045D17DEFF4F003E6E1A /* SDLShow.m */; };
+               597C05F717DEFF50003E6E1A /* SDLShowConstantTBT.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C045E17DEFF4F003E6E1A /* SDLShowConstantTBT.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05F817DEFF50003E6E1A /* SDLShowConstantTBT.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C045F17DEFF4F003E6E1A /* SDLShowConstantTBT.m */; };
+               597C05F917DEFF50003E6E1A /* SDLShowConstantTBTResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C046017DEFF4F003E6E1A /* SDLShowConstantTBTResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05FA17DEFF50003E6E1A /* SDLShowConstantTBTResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C046117DEFF4F003E6E1A /* SDLShowConstantTBTResponse.m */; };
+               597C05FB17DEFF50003E6E1A /* SDLShowResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C046217DEFF4F003E6E1A /* SDLShowResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05FC17DEFF50003E6E1A /* SDLShowResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C046317DEFF4F003E6E1A /* SDLShowResponse.m */; };
+               597C05FD17DEFF50003E6E1A /* SDLSingleTireStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C046417DEFF4F003E6E1A /* SDLSingleTireStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C05FE17DEFF50003E6E1A /* SDLSingleTireStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C046517DEFF4F003E6E1A /* SDLSingleTireStatus.m */; };
+               597C05FF17DEFF50003E6E1A /* SDLSiphonServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C046617DEFF4F003E6E1A /* SDLSiphonServer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C060017DEFF50003E6E1A /* SDLSiphonServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C046717DEFF4F003E6E1A /* SDLSiphonServer.m */; };
+               597C060117DEFF50003E6E1A /* SDLSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C046817DEFF4F003E6E1A /* SDLSlider.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C060217DEFF50003E6E1A /* SDLSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C046917DEFF4F003E6E1A /* SDLSlider.m */; };
+               597C060317DEFF50003E6E1A /* SDLSliderResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C046A17DEFF4F003E6E1A /* SDLSliderResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C060417DEFF50003E6E1A /* SDLSliderResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C046B17DEFF4F003E6E1A /* SDLSliderResponse.m */; };
+               597C060517DEFF50003E6E1A /* SDLSoftButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C046C17DEFF4F003E6E1A /* SDLSoftButton.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C060617DEFF50003E6E1A /* SDLSoftButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C046D17DEFF4F003E6E1A /* SDLSoftButton.m */; };
+               597C060717DEFF50003E6E1A /* SDLSoftButtonCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C046E17DEFF4F003E6E1A /* SDLSoftButtonCapabilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C060817DEFF50003E6E1A /* SDLSoftButtonCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C046F17DEFF4F003E6E1A /* SDLSoftButtonCapabilities.m */; };
+               597C060917DEFF50003E6E1A /* SDLSoftButtonType.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C047017DEFF4F003E6E1A /* SDLSoftButtonType.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C060A17DEFF50003E6E1A /* SDLSoftButtonType.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C047117DEFF4F003E6E1A /* SDLSoftButtonType.m */; };
+               597C060B17DEFF50003E6E1A /* SDLSpeak.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C047217DEFF4F003E6E1A /* SDLSpeak.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C060C17DEFF50003E6E1A /* SDLSpeak.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C047317DEFF4F003E6E1A /* SDLSpeak.m */; };
+               597C060D17DEFF50003E6E1A /* SDLSpeakResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C047417DEFF4F003E6E1A /* SDLSpeakResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C060E17DEFF50003E6E1A /* SDLSpeakResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C047517DEFF4F003E6E1A /* SDLSpeakResponse.m */; };
+               597C060F17DEFF50003E6E1A /* SDLSpeechCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C047617DEFF4F003E6E1A /* SDLSpeechCapabilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C061017DEFF50003E6E1A /* SDLSpeechCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C047717DEFF4F003E6E1A /* SDLSpeechCapabilities.m */; };
+               597C061117DEFF50003E6E1A /* SDLStartTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C047817DEFF4F003E6E1A /* SDLStartTime.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C061217DEFF50003E6E1A /* SDLStartTime.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C047917DEFF4F003E6E1A /* SDLStartTime.m */; };
+               597C061317DEFF50003E6E1A /* SDLSubscribeButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C047A17DEFF4F003E6E1A /* SDLSubscribeButton.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C061417DEFF50003E6E1A /* SDLSubscribeButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C047B17DEFF4F003E6E1A /* SDLSubscribeButton.m */; };
+               597C061517DEFF50003E6E1A /* SDLSubscribeButtonResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C047C17DEFF4F003E6E1A /* SDLSubscribeButtonResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C061617DEFF50003E6E1A /* SDLSubscribeButtonResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C047D17DEFF4F003E6E1A /* SDLSubscribeButtonResponse.m */; };
+               597C061717DEFF50003E6E1A /* SDLSubscribeVehicleData.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C047E17DEFF4F003E6E1A /* SDLSubscribeVehicleData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C061817DEFF50003E6E1A /* SDLSubscribeVehicleData.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C047F17DEFF4F003E6E1A /* SDLSubscribeVehicleData.m */; };
+               597C061917DEFF50003E6E1A /* SDLSubscribeVehicleDataResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C048017DEFF4F003E6E1A /* SDLSubscribeVehicleDataResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C061A17DEFF50003E6E1A /* SDLSubscribeVehicleDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C048117DEFF4F003E6E1A /* SDLSubscribeVehicleDataResponse.m */; };
+               597C061B17DEFF50003E6E1A /* SDLIAPTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C048217DEFF4F003E6E1A /* SDLIAPTransport.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C061C17DEFF50003E6E1A /* SDLIAPTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C048317DEFF4F003E6E1A /* SDLIAPTransport.m */; };
+               597C061D17DEFF50003E6E1A /* SDLSyncMsgVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C048417DEFF4F003E6E1A /* SDLSyncMsgVersion.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C061E17DEFF50003E6E1A /* SDLSyncMsgVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C048517DEFF4F003E6E1A /* SDLSyncMsgVersion.m */; };
+               597C061F17DEFF50003E6E1A /* SDLSyncPData.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C048617DEFF4F003E6E1A /* SDLSyncPData.h */; };
+               597C062017DEFF50003E6E1A /* SDLSyncPData.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C048717DEFF4F003E6E1A /* SDLSyncPData.m */; };
+               597C062117DEFF50003E6E1A /* SDLSyncPDataResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C048817DEFF4F003E6E1A /* SDLSyncPDataResponse.h */; };
+               597C062217DEFF50003E6E1A /* SDLSyncPDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C048917DEFF4F003E6E1A /* SDLSyncPDataResponse.m */; };
+               597C062317DEFF50003E6E1A /* SDLProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C048A17DEFF4F003E6E1A /* SDLProxy.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C062417DEFF50003E6E1A /* SDLProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C048B17DEFF4F003E6E1A /* SDLProxy.m */; };
+               597C062517DEFF50003E6E1A /* SDLProxyFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C048C17DEFF4F003E6E1A /* SDLProxyFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C062617DEFF50003E6E1A /* SDLProxyFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C048D17DEFF4F003E6E1A /* SDLProxyFactory.m */; };
+               597C062717DEFF50003E6E1A /* SDLTCPTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C048E17DEFF4F003E6E1A /* SDLTCPTransport.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C062817DEFF50003E6E1A /* SDLTCPTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C048F17DEFF4F003E6E1A /* SDLTCPTransport.m */; };
+               597C062917DEFF50003E6E1A /* SDLITransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C049017DEFF4F003E6E1A /* SDLITransport.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C062A17DEFF50003E6E1A /* SDLSystemAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C049117DEFF4F003E6E1A /* SDLSystemAction.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C062B17DEFF50003E6E1A /* SDLSystemAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C049217DEFF4F003E6E1A /* SDLSystemAction.m */; };
+               597C062C17DEFF50003E6E1A /* SDLSystemContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C049317DEFF4F003E6E1A /* SDLSystemContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C062D17DEFF50003E6E1A /* SDLSystemContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C049417DEFF4F003E6E1A /* SDLSystemContext.m */; };
+               597C062E17DEFF50003E6E1A /* SDLTBTState.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C049517DEFF4F003E6E1A /* SDLTBTState.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C062F17DEFF50003E6E1A /* SDLTBTState.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C049617DEFF4F003E6E1A /* SDLTBTState.m */; };
+               597C063017DEFF50003E6E1A /* SDLTextAlignment.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C049717DEFF4F003E6E1A /* SDLTextAlignment.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C063117DEFF50003E6E1A /* SDLTextAlignment.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C049817DEFF4F003E6E1A /* SDLTextAlignment.m */; };
+               597C063217DEFF50003E6E1A /* SDLTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C049917DEFF50003E6E1A /* SDLTextField.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C063317DEFF50003E6E1A /* SDLTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C049A17DEFF50003E6E1A /* SDLTextField.m */; };
+               597C063417DEFF50003E6E1A /* SDLTextFieldName.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C049B17DEFF50003E6E1A /* SDLTextFieldName.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C063517DEFF50003E6E1A /* SDLTextFieldName.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C049C17DEFF50003E6E1A /* SDLTextFieldName.m */; };
+               597C063617DEFF50003E6E1A /* SDLTireStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C049D17DEFF50003E6E1A /* SDLTireStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C063717DEFF50003E6E1A /* SDLTireStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C049E17DEFF50003E6E1A /* SDLTireStatus.m */; };
+               597C063817DEFF50003E6E1A /* SDLTransportListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C049F17DEFF50003E6E1A /* SDLTransportListener.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C063917DEFF50003E6E1A /* SDLTriggerSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04A017DEFF50003E6E1A /* SDLTriggerSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C063A17DEFF50003E6E1A /* SDLTriggerSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04A117DEFF50003E6E1A /* SDLTriggerSource.m */; };
+               597C063B17DEFF50003E6E1A /* SDLTTSChunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04A217DEFF50003E6E1A /* SDLTTSChunk.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C063C17DEFF50003E6E1A /* SDLTTSChunk.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04A317DEFF50003E6E1A /* SDLTTSChunk.m */; };
+               597C063D17DEFF50003E6E1A /* SDLTTSChunkFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04A417DEFF50003E6E1A /* SDLTTSChunkFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C063E17DEFF50003E6E1A /* SDLTTSChunkFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04A517DEFF50003E6E1A /* SDLTTSChunkFactory.m */; };
+               597C063F17DEFF50003E6E1A /* SDLTurn.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04A617DEFF50003E6E1A /* SDLTurn.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C064017DEFF50003E6E1A /* SDLTurn.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04A717DEFF50003E6E1A /* SDLTurn.m */; };
+               597C064117DEFF50003E6E1A /* SDLUnregisterAppInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04A817DEFF50003E6E1A /* SDLUnregisterAppInterface.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C064217DEFF50003E6E1A /* SDLUnregisterAppInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04A917DEFF50003E6E1A /* SDLUnregisterAppInterface.m */; };
+               597C064317DEFF50003E6E1A /* SDLUnregisterAppInterfaceResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04AA17DEFF50003E6E1A /* SDLUnregisterAppInterfaceResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C064417DEFF50003E6E1A /* SDLUnregisterAppInterfaceResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04AB17DEFF50003E6E1A /* SDLUnregisterAppInterfaceResponse.m */; };
+               597C064517DEFF50003E6E1A /* SDLUnsubscribeButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04AC17DEFF50003E6E1A /* SDLUnsubscribeButton.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C064617DEFF50003E6E1A /* SDLUnsubscribeButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04AD17DEFF50003E6E1A /* SDLUnsubscribeButton.m */; };
+               597C064717DEFF50003E6E1A /* SDLUnsubscribeButtonResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04AE17DEFF50003E6E1A /* SDLUnsubscribeButtonResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C064817DEFF50003E6E1A /* SDLUnsubscribeButtonResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04AF17DEFF50003E6E1A /* SDLUnsubscribeButtonResponse.m */; };
+               597C064917DEFF50003E6E1A /* SDLUnsubscribeVehicleData.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04B017DEFF50003E6E1A /* SDLUnsubscribeVehicleData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C064A17DEFF50003E6E1A /* SDLUnsubscribeVehicleData.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04B117DEFF50003E6E1A /* SDLUnsubscribeVehicleData.m */; };
+               597C064B17DEFF50003E6E1A /* SDLUnsubscribeVehicleDataResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04B217DEFF50003E6E1A /* SDLUnsubscribeVehicleDataResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C064C17DEFF50003E6E1A /* SDLUnsubscribeVehicleDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04B317DEFF50003E6E1A /* SDLUnsubscribeVehicleDataResponse.m */; };
+               597C064D17DEFF50003E6E1A /* SDLUpdateMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04B417DEFF50003E6E1A /* SDLUpdateMode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C064E17DEFF50003E6E1A /* SDLUpdateMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04B517DEFF50003E6E1A /* SDLUpdateMode.m */; };
+               597C064F17DEFF50003E6E1A /* SDLUpdateTurnList.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04B617DEFF50003E6E1A /* SDLUpdateTurnList.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C065017DEFF50003E6E1A /* SDLUpdateTurnList.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04B717DEFF50003E6E1A /* SDLUpdateTurnList.m */; };
+               597C065117DEFF50003E6E1A /* SDLUpdateTurnListResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04B817DEFF50003E6E1A /* SDLUpdateTurnListResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C065217DEFF50003E6E1A /* SDLUpdateTurnListResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04B917DEFF50003E6E1A /* SDLUpdateTurnListResponse.m */; };
+               597C065317DEFF50003E6E1A /* SDLVehicleDataActiveStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04BA17DEFF50003E6E1A /* SDLVehicleDataActiveStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C065417DEFF50003E6E1A /* SDLVehicleDataActiveStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04BB17DEFF50003E6E1A /* SDLVehicleDataActiveStatus.m */; };
+               597C065517DEFF50003E6E1A /* SDLVehicleDataEventStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04BC17DEFF50003E6E1A /* SDLVehicleDataEventStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C065617DEFF50003E6E1A /* SDLVehicleDataEventStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04BD17DEFF50003E6E1A /* SDLVehicleDataEventStatus.m */; };
+               597C065717DEFF50003E6E1A /* SDLVehicleDataNotificationStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04BE17DEFF50003E6E1A /* SDLVehicleDataNotificationStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C065817DEFF50003E6E1A /* SDLVehicleDataNotificationStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04BF17DEFF50003E6E1A /* SDLVehicleDataNotificationStatus.m */; };
+               597C065917DEFF50003E6E1A /* SDLVehicleDataResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04C017DEFF50003E6E1A /* SDLVehicleDataResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C065A17DEFF50003E6E1A /* SDLVehicleDataResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04C117DEFF50003E6E1A /* SDLVehicleDataResult.m */; };
+               597C065B17DEFF50003E6E1A /* SDLVehicleDataResultCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04C217DEFF50003E6E1A /* SDLVehicleDataResultCode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C065C17DEFF50003E6E1A /* SDLVehicleDataResultCode.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04C317DEFF50003E6E1A /* SDLVehicleDataResultCode.m */; };
+               597C065D17DEFF50003E6E1A /* SDLVehicleDataStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04C417DEFF50003E6E1A /* SDLVehicleDataStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C065E17DEFF50003E6E1A /* SDLVehicleDataStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04C517DEFF50003E6E1A /* SDLVehicleDataStatus.m */; };
+               597C065F17DEFF50003E6E1A /* SDLVehicleDataType.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04C617DEFF50003E6E1A /* SDLVehicleDataType.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C066017DEFF50003E6E1A /* SDLVehicleDataType.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04C717DEFF50003E6E1A /* SDLVehicleDataType.m */; };
+               597C066117DEFF50003E6E1A /* SDLVehicleType.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04C817DEFF50003E6E1A /* SDLVehicleType.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C066217DEFF50003E6E1A /* SDLVehicleType.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04C917DEFF50003E6E1A /* SDLVehicleType.m */; };
+               597C066317DEFF50003E6E1A /* SDLVrCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04CA17DEFF50003E6E1A /* SDLVrCapabilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C066417DEFF50003E6E1A /* SDLVrCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04CB17DEFF50003E6E1A /* SDLVrCapabilities.m */; };
+               597C066517DEFF50003E6E1A /* SDLVrHelpItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04CC17DEFF50003E6E1A /* SDLVrHelpItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C066617DEFF50003E6E1A /* SDLVrHelpItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04CD17DEFF50003E6E1A /* SDLVrHelpItem.m */; };
+               597C066717DEFF50003E6E1A /* SDLWarningLightStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04CE17DEFF50003E6E1A /* SDLWarningLightStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C066817DEFF50003E6E1A /* SDLWarningLightStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04CF17DEFF50003E6E1A /* SDLWarningLightStatus.m */; };
+               597C066917DEFF50003E6E1A /* SDLWiperStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04D017DEFF50003E6E1A /* SDLWiperStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C066A17DEFF50003E6E1A /* SDLWiperStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04D117DEFF50003E6E1A /* SDLWiperStatus.m */; };
+               597C066B17DEFF51003E6E1A /* SDLProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 597C04D217DEFF50003E6E1A /* SDLProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               597C066C17DEFF51003E6E1A /* SDLProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 597C04D317DEFF50003E6E1A /* SDLProtocol.m */; };
+               5986A386183FD62A0003BAC6 /* SDLAbstractTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 5986A385183FD62A0003BAC6 /* SDLAbstractTransport.m */; };
+               FBAC28E1181FEAF4003210A2 /* SDLExternalLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = FBAC28E0181FEAF4003210A2 /* SDLExternalLibrary.h */; settings = {ATTRIBUTES = (Public, ); }; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+               5913386217DEFC5E00CF214C /* SmartDeviceLink-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SmartDeviceLink-Info.plist"; sourceTree = "<group>"; };
+               5913386417DEFC5E00CF214C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+               5913387B17DEFCB300CF214C /* SmartDeviceLink.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SmartDeviceLink.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+               594910281840B22E0050AEE5 /* SmartDeviceLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmartDeviceLink.h; sourceTree = "<group>"; };
+               597C034917DEFF4F003E6E1A /* SDLAbstractProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAbstractProtocol.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C034A17DEFF4F003E6E1A /* SDLAbstractProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAbstractProtocol.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C034B17DEFF4F003E6E1A /* SDLAbstractTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAbstractTransport.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C034D17DEFF4F003E6E1A /* SDLAddCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAddCommand.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C034E17DEFF4F003E6E1A /* SDLAddCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAddCommand.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C034F17DEFF4F003E6E1A /* SDLAddCommandResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAddCommandResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C035017DEFF4F003E6E1A /* SDLAddCommandResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAddCommandResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C035117DEFF4F003E6E1A /* SDLAddSubMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAddSubMenu.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C035217DEFF4F003E6E1A /* SDLAddSubMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAddSubMenu.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C035317DEFF4F003E6E1A /* SDLAddSubMenuResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAddSubMenuResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C035417DEFF4F003E6E1A /* SDLAddSubMenuResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAddSubMenuResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C035517DEFF4F003E6E1A /* SDLAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAlert.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C035617DEFF4F003E6E1A /* SDLAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAlert.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C035717DEFF4F003E6E1A /* SDLAlertManeuver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAlertManeuver.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C035817DEFF4F003E6E1A /* SDLAlertManeuver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAlertManeuver.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C035917DEFF4F003E6E1A /* SDLAlertManeuverResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAlertManeuverResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C035A17DEFF4F003E6E1A /* SDLAlertManeuverResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAlertManeuverResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C035B17DEFF4F003E6E1A /* SDLAlertResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLAlertResponse.h; sourceTree = "<group>"; };
+               597C035C17DEFF4F003E6E1A /* SDLAlertResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAlertResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C035D17DEFF4F003E6E1A /* SDLAppHMIType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAppHMIType.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C035E17DEFF4F003E6E1A /* SDLAppHMIType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAppHMIType.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C035F17DEFF4F003E6E1A /* SDLAppInterfaceUnregisteredReason.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAppInterfaceUnregisteredReason.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C036017DEFF4F003E6E1A /* SDLAppInterfaceUnregisteredReason.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAppInterfaceUnregisteredReason.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C036117DEFF4F003E6E1A /* SDLAudioPassThruCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAudioPassThruCapabilities.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C036217DEFF4F003E6E1A /* SDLAudioPassThruCapabilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAudioPassThruCapabilities.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C036317DEFF4F003E6E1A /* SDLAudioStreamingState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAudioStreamingState.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C036417DEFF4F003E6E1A /* SDLAudioStreamingState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAudioStreamingState.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C036517DEFF4F003E6E1A /* SDLAudioType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLAudioType.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C036617DEFF4F003E6E1A /* SDLAudioType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAudioType.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C036717DEFF4F003E6E1A /* SDLBeltStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLBeltStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C036817DEFF4F003E6E1A /* SDLBeltStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLBeltStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C036917DEFF4F003E6E1A /* SDLBinaryFrameHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLBinaryFrameHeader.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C036A17DEFF4F003E6E1A /* SDLBinaryFrameHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLBinaryFrameHeader.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C036B17DEFF4F003E6E1A /* SDLBitConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLBitConverter.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C036C17DEFF4F003E6E1A /* SDLBitConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLBitConverter.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C036D17DEFF4F003E6E1A /* SDLBitsPerSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLBitsPerSample.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C036E17DEFF4F003E6E1A /* SDLBitsPerSample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLBitsPerSample.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C036F17DEFF4F003E6E1A /* SDLBodyInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLBodyInformation.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C037017DEFF4F003E6E1A /* SDLBodyInformation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLBodyInformation.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C037117DEFF4F003E6E1A /* SDLButtonCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLButtonCapabilities.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C037217DEFF4F003E6E1A /* SDLButtonCapabilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLButtonCapabilities.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C037317DEFF4F003E6E1A /* SDLButtonEventMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLButtonEventMode.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C037417DEFF4F003E6E1A /* SDLButtonEventMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLButtonEventMode.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C037517DEFF4F003E6E1A /* SDLButtonName.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLButtonName.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C037617DEFF4F003E6E1A /* SDLButtonName.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLButtonName.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C037717DEFF4F003E6E1A /* SDLButtonPressMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLButtonPressMode.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C037817DEFF4F003E6E1A /* SDLButtonPressMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLButtonPressMode.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C037917DEFF4F003E6E1A /* SDLChangeRegistration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLChangeRegistration.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C037A17DEFF4F003E6E1A /* SDLChangeRegistration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLChangeRegistration.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C037B17DEFF4F003E6E1A /* SDLChangeRegistrationResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLChangeRegistrationResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C037C17DEFF4F003E6E1A /* SDLChangeRegistrationResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLChangeRegistrationResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C037D17DEFF4F003E6E1A /* SDLCharacterSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLCharacterSet.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C037E17DEFF4F003E6E1A /* SDLCharacterSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLCharacterSet.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C037F17DEFF4F003E6E1A /* SDLChoice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLChoice.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C038017DEFF4F003E6E1A /* SDLChoice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLChoice.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C038117DEFF4F003E6E1A /* SDLCompassDirection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLCompassDirection.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C038217DEFF4F003E6E1A /* SDLCompassDirection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLCompassDirection.m; sourceTree = "<group>"; };
+               597C038317DEFF4F003E6E1A /* SDLComponentVolumeStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLComponentVolumeStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C038417DEFF4F003E6E1A /* SDLComponentVolumeStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLComponentVolumeStatus.m; sourceTree = "<group>"; };
+               597C038517DEFF4F003E6E1A /* SDLConsoleController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLConsoleController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C038617DEFF4F003E6E1A /* SDLConsoleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLConsoleController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C038717DEFF4F003E6E1A /* SDLCreateInteractionChoiceSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLCreateInteractionChoiceSet.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C038817DEFF4F003E6E1A /* SDLCreateInteractionChoiceSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLCreateInteractionChoiceSet.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C038917DEFF4F003E6E1A /* SDLCreateInteractionChoiceSetResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLCreateInteractionChoiceSetResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C038A17DEFF4F003E6E1A /* SDLCreateInteractionChoiceSetResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLCreateInteractionChoiceSetResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C038B17DEFF4F003E6E1A /* SDLDebugTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDebugTool.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C038C17DEFF4F003E6E1A /* SDLDebugTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLDebugTool.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C038D17DEFF4F003E6E1A /* SDLDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDecoder.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C038E17DEFF4F003E6E1A /* SDLDeleteCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDeleteCommand.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C038F17DEFF4F003E6E1A /* SDLDeleteCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLDeleteCommand.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C039017DEFF4F003E6E1A /* SDLDeleteCommandResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDeleteCommandResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C039117DEFF4F003E6E1A /* SDLDeleteCommandResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLDeleteCommandResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C039217DEFF4F003E6E1A /* SDLDeleteFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDeleteFile.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C039317DEFF4F003E6E1A /* SDLDeleteFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLDeleteFile.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C039417DEFF4F003E6E1A /* SDLDeleteFileResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDeleteFileResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C039517DEFF4F003E6E1A /* SDLDeleteFileResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLDeleteFileResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C039617DEFF4F003E6E1A /* SDLDeleteInteractionChoiceSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDeleteInteractionChoiceSet.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C039717DEFF4F003E6E1A /* SDLDeleteInteractionChoiceSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLDeleteInteractionChoiceSet.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C039817DEFF4F003E6E1A /* SDLDeleteInteractionChoiceSetResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDeleteInteractionChoiceSetResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C039917DEFF4F003E6E1A /* SDLDeleteInteractionChoiceSetResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLDeleteInteractionChoiceSetResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C039A17DEFF4F003E6E1A /* SDLDeleteSubMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDeleteSubMenu.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C039B17DEFF4F003E6E1A /* SDLDeleteSubMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLDeleteSubMenu.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C039C17DEFF4F003E6E1A /* SDLDeleteSubMenuResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDeleteSubMenuResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C039D17DEFF4F003E6E1A /* SDLDeleteSubMenuResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLDeleteSubMenuResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C039E17DEFF4F003E6E1A /* SDLDeviceLevelStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDeviceLevelStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C039F17DEFF4F003E6E1A /* SDLDeviceLevelStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLDeviceLevelStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03A017DEFF4F003E6E1A /* SDLDeviceStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDeviceStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03A117DEFF4F003E6E1A /* SDLDeviceStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLDeviceStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03A217DEFF4F003E6E1A /* SDLDIDResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDIDResult.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03A317DEFF4F003E6E1A /* SDLDIDResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLDIDResult.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03A417DEFF4F003E6E1A /* SDLDimension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDimension.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03A517DEFF4F003E6E1A /* SDLDimension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDimension.m; sourceTree = "<group>"; };
+               597C03A617DEFF4F003E6E1A /* SDLDisplayCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDisplayCapabilities.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03A717DEFF4F003E6E1A /* SDLDisplayCapabilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLDisplayCapabilities.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03A817DEFF4F003E6E1A /* SDLDisplayType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDisplayType.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03A917DEFF4F003E6E1A /* SDLDisplayType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDisplayType.m; sourceTree = "<group>"; };
+               597C03AA17DEFF4F003E6E1A /* SDLDriverDistractionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLDriverDistractionState.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03AB17DEFF4F003E6E1A /* SDLDriverDistractionState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDriverDistractionState.m; sourceTree = "<group>"; };
+               597C03AC17DEFF4F003E6E1A /* SDLEncodedSyncPData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLEncodedSyncPData.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03AD17DEFF4F003E6E1A /* SDLEncodedSyncPData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLEncodedSyncPData.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03AE17DEFF4F003E6E1A /* SDLEncodedSyncPDataResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLEncodedSyncPDataResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03AF17DEFF4F003E6E1A /* SDLEncodedSyncPDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLEncodedSyncPDataResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03B017DEFF4F003E6E1A /* SDLEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLEncoder.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03B117DEFF4F003E6E1A /* SDLEndAudioPassThru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLEndAudioPassThru.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03B217DEFF4F003E6E1A /* SDLEndAudioPassThru.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLEndAudioPassThru.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03B317DEFF4F003E6E1A /* SDLEndAudioPassThruResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLEndAudioPassThruResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03B417DEFF4F003E6E1A /* SDLEndAudioPassThruResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLEndAudioPassThruResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03B517DEFF4F003E6E1A /* SDLEngineInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLEngineInfo.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03B617DEFF4F003E6E1A /* SDLEngineInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLEngineInfo.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03B717DEFF4F003E6E1A /* SDLEnum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLEnum.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03B817DEFF4F003E6E1A /* SDLEnum.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLEnum.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03B917DEFF4F003E6E1A /* SDLFileType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLFileType.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03BA17DEFF4F003E6E1A /* SDLFileType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLFileType.m; sourceTree = "<group>"; };
+               597C03BB17DEFF4F003E6E1A /* SDLFunctionID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLFunctionID.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03BC17DEFF4F003E6E1A /* SDLFunctionID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLFunctionID.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03BD17DEFF4F003E6E1A /* SDLGenericResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLGenericResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03BE17DEFF4F003E6E1A /* SDLGenericResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLGenericResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03BF17DEFF4F003E6E1A /* SDLGetDTCs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLGetDTCs.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03C017DEFF4F003E6E1A /* SDLGetDTCs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLGetDTCs.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03C117DEFF4F003E6E1A /* SDLGetDTCsResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLGetDTCsResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03C217DEFF4F003E6E1A /* SDLGetDTCsResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLGetDTCsResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03C317DEFF4F003E6E1A /* SDLGetVehicleData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLGetVehicleData.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03C417DEFF4F003E6E1A /* SDLGetVehicleData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLGetVehicleData.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03C517DEFF4F003E6E1A /* SDLGetVehicleDataResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLGetVehicleDataResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03C617DEFF4F003E6E1A /* SDLGetVehicleDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLGetVehicleDataResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03C717DEFF4F003E6E1A /* SDLGlobalProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLGlobalProperty.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03C817DEFF4F003E6E1A /* SDLGlobalProperty.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLGlobalProperty.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03C917DEFF4F003E6E1A /* SDLGPSData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLGPSData.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03CA17DEFF4F003E6E1A /* SDLGPSData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLGPSData.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03CB17DEFF4F003E6E1A /* SDLHeadLampStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLHeadLampStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03CC17DEFF4F003E6E1A /* SDLHeadLampStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLHeadLampStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03CD17DEFF4F003E6E1A /* SDLHMILevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLHMILevel.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03CE17DEFF4F003E6E1A /* SDLHMILevel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLHMILevel.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03CF17DEFF4F003E6E1A /* SDLHMIPermissions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLHMIPermissions.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03D017DEFF4F003E6E1A /* SDLHMIPermissions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLHMIPermissions.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03D117DEFF4F003E6E1A /* SDLHMIZoneCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLHMIZoneCapabilities.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03D217DEFF4F003E6E1A /* SDLHMIZoneCapabilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLHMIZoneCapabilities.m; sourceTree = "<group>"; };
+               597C03D317DEFF4F003E6E1A /* SDLIgnitionStableStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLIgnitionStableStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03D417DEFF4F003E6E1A /* SDLIgnitionStableStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLIgnitionStableStatus.m; sourceTree = "<group>"; };
+               597C03D517DEFF4F003E6E1A /* SDLIgnitionStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLIgnitionStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03D617DEFF4F003E6E1A /* SDLIgnitionStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLIgnitionStatus.m; sourceTree = "<group>"; };
+               597C03D717DEFF4F003E6E1A /* SDLImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLImage.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03D817DEFF4F003E6E1A /* SDLImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLImage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03D917DEFF4F003E6E1A /* SDLImageType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLImageType.h; sourceTree = "<group>"; };
+               597C03DA17DEFF4F003E6E1A /* SDLImageType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLImageType.m; sourceTree = "<group>"; };
+               597C03DB17DEFF4F003E6E1A /* SDLInteractionMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLInteractionMode.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03DC17DEFF4F003E6E1A /* SDLInteractionMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLInteractionMode.m; sourceTree = "<group>"; };
+               597C03DD17DEFF4F003E6E1A /* SDLIProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLIProxy.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03DE17DEFF4F003E6E1A /* SDLJingle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLJingle.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03DF17DEFF4F003E6E1A /* SDLJingle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLJingle.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03E017DEFF4F003E6E1A /* SDLJsonDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLJsonDecoder.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03E117DEFF4F003E6E1A /* SDLJsonDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLJsonDecoder.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03E217DEFF4F003E6E1A /* SDLJsonEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLJsonEncoder.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03E317DEFF4F003E6E1A /* SDLJsonEncoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLJsonEncoder.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03E417DEFF4F003E6E1A /* SDLLanguage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLLanguage.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03E517DEFF4F003E6E1A /* SDLLanguage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLLanguage.m; sourceTree = "<group>"; };
+               597C03E617DEFF4F003E6E1A /* SDLListFiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLListFiles.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03E717DEFF4F003E6E1A /* SDLListFiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLListFiles.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03E817DEFF4F003E6E1A /* SDLListFilesResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLListFilesResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03E917DEFF4F003E6E1A /* SDLListFilesResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLListFilesResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03EA17DEFF4F003E6E1A /* SDLMaintenanceModeStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLMaintenanceModeStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03EB17DEFF4F003E6E1A /* SDLMaintenanceModeStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLMaintenanceModeStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03EC17DEFF4F003E6E1A /* SDLMediaClockFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLMediaClockFormat.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03ED17DEFF4F003E6E1A /* SDLMediaClockFormat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLMediaClockFormat.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03EE17DEFF4F003E6E1A /* SDLMenuParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLMenuParams.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03EF17DEFF4F003E6E1A /* SDLMenuParams.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLMenuParams.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03F017DEFF4F003E6E1A /* SDLNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLNames.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03F117DEFF4F003E6E1A /* SDLOnAppInterfaceUnregistered.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLOnAppInterfaceUnregistered.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03F217DEFF4F003E6E1A /* SDLOnAppInterfaceUnregistered.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLOnAppInterfaceUnregistered.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03F317DEFF4F003E6E1A /* SDLOnAudioPassThru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLOnAudioPassThru.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03F417DEFF4F003E6E1A /* SDLOnAudioPassThru.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLOnAudioPassThru.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03F517DEFF4F003E6E1A /* SDLOnButtonEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLOnButtonEvent.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03F617DEFF4F003E6E1A /* SDLOnButtonEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLOnButtonEvent.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03F717DEFF4F003E6E1A /* SDLOnButtonPress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLOnButtonPress.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03F817DEFF4F003E6E1A /* SDLOnButtonPress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLOnButtonPress.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03F917DEFF4F003E6E1A /* SDLOnCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLOnCommand.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03FA17DEFF4F003E6E1A /* SDLOnCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLOnCommand.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03FB17DEFF4F003E6E1A /* SDLOnDriverDistraction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLOnDriverDistraction.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03FC17DEFF4F003E6E1A /* SDLOnDriverDistraction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLOnDriverDistraction.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03FD17DEFF4F003E6E1A /* SDLOnEncodedSyncPData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLOnEncodedSyncPData.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C03FE17DEFF4F003E6E1A /* SDLOnEncodedSyncPData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLOnEncodedSyncPData.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C03FF17DEFF4F003E6E1A /* SDLOnHMIStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLOnHMIStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C040017DEFF4F003E6E1A /* SDLOnHMIStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLOnHMIStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C040117DEFF4F003E6E1A /* SDLOnLanguageChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLOnLanguageChange.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C040217DEFF4F003E6E1A /* SDLOnLanguageChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLOnLanguageChange.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C040317DEFF4F003E6E1A /* SDLOnPermissionsChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLOnPermissionsChange.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C040417DEFF4F003E6E1A /* SDLOnPermissionsChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLOnPermissionsChange.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C040517DEFF4F003E6E1A /* SDLOnSyncPData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLOnSyncPData.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C040617DEFF4F003E6E1A /* SDLOnSyncPData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLOnSyncPData.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C040717DEFF4F003E6E1A /* SDLOnTBTClientState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLOnTBTClientState.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C040817DEFF4F003E6E1A /* SDLOnTBTClientState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLOnTBTClientState.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C040917DEFF4F003E6E1A /* SDLOnVehicleData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLOnVehicleData.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C040A17DEFF4F003E6E1A /* SDLOnVehicleData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLOnVehicleData.m; sourceTree = "<group>"; };
+               597C040B17DEFF4F003E6E1A /* SDLParameterPermissions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLParameterPermissions.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C040C17DEFF4F003E6E1A /* SDLParameterPermissions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLParameterPermissions.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C040D17DEFF4F003E6E1A /* SDLPerformAudioPassThru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLPerformAudioPassThru.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C040E17DEFF4F003E6E1A /* SDLPerformAudioPassThru.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLPerformAudioPassThru.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C040F17DEFF4F003E6E1A /* SDLPerformAudioPassThruResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLPerformAudioPassThruResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C041017DEFF4F003E6E1A /* SDLPerformAudioPassThruResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLPerformAudioPassThruResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C041117DEFF4F003E6E1A /* SDLPerformInteraction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLPerformInteraction.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C041217DEFF4F003E6E1A /* SDLPerformInteraction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLPerformInteraction.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C041317DEFF4F003E6E1A /* SDLPerformInteractionResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLPerformInteractionResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C041417DEFF4F003E6E1A /* SDLPerformInteractionResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLPerformInteractionResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C041517DEFF4F003E6E1A /* SDLPermissionItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLPermissionItem.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C041617DEFF4F003E6E1A /* SDLPermissionItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLPermissionItem.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C041717DEFF4F003E6E1A /* SDLPermissionStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLPermissionStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C041817DEFF4F003E6E1A /* SDLPermissionStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLPermissionStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C041917DEFF4F003E6E1A /* SDLPresetBankCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLPresetBankCapabilities.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C041A17DEFF4F003E6E1A /* SDLPresetBankCapabilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLPresetBankCapabilities.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C041B17DEFF4F003E6E1A /* SDLPrimaryAudioSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLPrimaryAudioSource.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C041C17DEFF4F003E6E1A /* SDLPrimaryAudioSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLPrimaryAudioSource.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C041D17DEFF4F003E6E1A /* SDLPRNDL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLPRNDL.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C041E17DEFF4F003E6E1A /* SDLPRNDL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLPRNDL.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C041F17DEFF4F003E6E1A /* SDLIProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLIProtocol.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C042017DEFF4F003E6E1A /* SDLProtocolFrameHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLProtocolFrameHeader.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C042117DEFF4F003E6E1A /* SDLProtocolFrameHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLProtocolFrameHeader.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C042217DEFF4F003E6E1A /* SDLProtocolFrameHeaderFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLProtocolFrameHeaderFactory.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C042317DEFF4F003E6E1A /* SDLProtocolFrameHeaderFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLProtocolFrameHeaderFactory.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C042417DEFF4F003E6E1A /* SDLProtocolListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLProtocolListener.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C042517DEFF4F003E6E1A /* SDLProtocolMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLProtocolMessage.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C042617DEFF4F003E6E1A /* SDLProtocolMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLProtocolMessage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C042717DEFF4F003E6E1A /* SDLProxyListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLProxyListener.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C042817DEFF4F003E6E1A /* SDLPutFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLPutFile.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C042917DEFF4F003E6E1A /* SDLPutFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLPutFile.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C042A17DEFF4F003E6E1A /* SDLPutFileResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLPutFileResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C042B17DEFF4F003E6E1A /* SDLPutFileResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLPutFileResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C042C17DEFF4F003E6E1A /* SDLReadDID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLReadDID.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C042D17DEFF4F003E6E1A /* SDLReadDID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLReadDID.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C042E17DEFF4F003E6E1A /* SDLReadDIDResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLReadDIDResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C042F17DEFF4F003E6E1A /* SDLReadDIDResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLReadDIDResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C043017DEFF4F003E6E1A /* SDLRegisterAppInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLRegisterAppInterface.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C043117DEFF4F003E6E1A /* SDLRegisterAppInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLRegisterAppInterface.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C043217DEFF4F003E6E1A /* SDLRegisterAppInterfaceResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLRegisterAppInterfaceResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C043317DEFF4F003E6E1A /* SDLRegisterAppInterfaceResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLRegisterAppInterfaceResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C043417DEFF4F003E6E1A /* SDLResetGlobalProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLResetGlobalProperties.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C043517DEFF4F003E6E1A /* SDLResetGlobalProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLResetGlobalProperties.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C043617DEFF4F003E6E1A /* SDLResetGlobalPropertiesResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLResetGlobalPropertiesResponse.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C043717DEFF4F003E6E1A /* SDLResetGlobalPropertiesResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLResetGlobalPropertiesResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C043817DEFF4F003E6E1A /* SDLResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLResult.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C043917DEFF4F003E6E1A /* SDLResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLResult.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C043A17DEFF4F003E6E1A /* SDLRPCMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRPCMessage.h; sourceTree = "<group>"; };
+               597C043B17DEFF4F003E6E1A /* SDLRPCMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCMessage.m; sourceTree = "<group>"; };
+               597C043C17DEFF4F003E6E1A /* SDLRPCMessageType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRPCMessageType.h; sourceTree = "<group>"; };
+               597C043D17DEFF4F003E6E1A /* SDLRPCMessageType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCMessageType.m; sourceTree = "<group>"; };
+               597C043E17DEFF4F003E6E1A /* SDLRPCNotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRPCNotification.h; sourceTree = "<group>"; };
+               597C043F17DEFF4F003E6E1A /* SDLRPCNotification.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCNotification.m; sourceTree = "<group>"; };
+               597C044017DEFF4F003E6E1A /* SDLRPCRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRPCRequest.h; sourceTree = "<group>"; };
+               597C044117DEFF4F003E6E1A /* SDLRPCRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCRequest.m; sourceTree = "<group>"; };
+               597C044217DEFF4F003E6E1A /* SDLRPCRequestFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLRPCRequestFactory.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C044317DEFF4F003E6E1A /* SDLRPCRequestFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLRPCRequestFactory.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C044417DEFF4F003E6E1A /* SDLRPCResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRPCResponse.h; sourceTree = "<group>"; };
+               597C044517DEFF4F003E6E1A /* SDLRPCResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCResponse.m; sourceTree = "<group>"; };
+               597C044617DEFF4F003E6E1A /* SDLSamplingRate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSamplingRate.h; sourceTree = "<group>"; };
+               597C044717DEFF4F003E6E1A /* SDLSamplingRate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSamplingRate.m; sourceTree = "<group>"; };
+               597C044817DEFF4F003E6E1A /* SDLScrollableMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLScrollableMessage.h; sourceTree = "<group>"; };
+               597C044917DEFF4F003E6E1A /* SDLScrollableMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLScrollableMessage.m; sourceTree = "<group>"; };
+               597C044A17DEFF4F003E6E1A /* SDLScrollableMessageResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLScrollableMessageResponse.h; sourceTree = "<group>"; };
+               597C044B17DEFF4F003E6E1A /* SDLScrollableMessageResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLScrollableMessageResponse.m; sourceTree = "<group>"; };
+               597C044C17DEFF4F003E6E1A /* SDLSetAppIcon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSetAppIcon.h; sourceTree = "<group>"; };
+               597C044D17DEFF4F003E6E1A /* SDLSetAppIcon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSetAppIcon.m; sourceTree = "<group>"; };
+               597C044E17DEFF4F003E6E1A /* SDLSetAppIconResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSetAppIconResponse.h; sourceTree = "<group>"; };
+               597C044F17DEFF4F003E6E1A /* SDLSetAppIconResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSetAppIconResponse.m; sourceTree = "<group>"; };
+               597C045017DEFF4F003E6E1A /* SDLSetDisplayLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSetDisplayLayout.h; sourceTree = "<group>"; };
+               597C045117DEFF4F003E6E1A /* SDLSetDisplayLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSetDisplayLayout.m; sourceTree = "<group>"; };
+               597C045217DEFF4F003E6E1A /* SDLSetDisplayLayoutResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSetDisplayLayoutResponse.h; sourceTree = "<group>"; };
+               597C045317DEFF4F003E6E1A /* SDLSetDisplayLayoutResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSetDisplayLayoutResponse.m; sourceTree = "<group>"; };
+               597C045417DEFF4F003E6E1A /* SDLSetGlobalProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSetGlobalProperties.h; sourceTree = "<group>"; };
+               597C045517DEFF4F003E6E1A /* SDLSetGlobalProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSetGlobalProperties.m; sourceTree = "<group>"; };
+               597C045617DEFF4F003E6E1A /* SDLSetGlobalPropertiesResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSetGlobalPropertiesResponse.h; sourceTree = "<group>"; };
+               597C045717DEFF4F003E6E1A /* SDLSetGlobalPropertiesResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSetGlobalPropertiesResponse.m; sourceTree = "<group>"; };
+               597C045817DEFF4F003E6E1A /* SDLSetMediaClockTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLSetMediaClockTimer.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C045917DEFF4F003E6E1A /* SDLSetMediaClockTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLSetMediaClockTimer.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C045A17DEFF4F003E6E1A /* SDLSetMediaClockTimerResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSetMediaClockTimerResponse.h; sourceTree = "<group>"; };
+               597C045B17DEFF4F003E6E1A /* SDLSetMediaClockTimerResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLSetMediaClockTimerResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C045C17DEFF4F003E6E1A /* SDLShow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLShow.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C045D17DEFF4F003E6E1A /* SDLShow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLShow.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C045E17DEFF4F003E6E1A /* SDLShowConstantTBT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLShowConstantTBT.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C045F17DEFF4F003E6E1A /* SDLShowConstantTBT.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLShowConstantTBT.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C046017DEFF4F003E6E1A /* SDLShowConstantTBTResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLShowConstantTBTResponse.h; sourceTree = "<group>"; };
+               597C046117DEFF4F003E6E1A /* SDLShowConstantTBTResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLShowConstantTBTResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C046217DEFF4F003E6E1A /* SDLShowResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLShowResponse.h; sourceTree = "<group>"; };
+               597C046317DEFF4F003E6E1A /* SDLShowResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLShowResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C046417DEFF4F003E6E1A /* SDLSingleTireStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLSingleTireStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C046517DEFF4F003E6E1A /* SDLSingleTireStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLSingleTireStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C046617DEFF4F003E6E1A /* SDLSiphonServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSiphonServer.h; sourceTree = "<group>"; };
+               597C046717DEFF4F003E6E1A /* SDLSiphonServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLSiphonServer.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C046817DEFF4F003E6E1A /* SDLSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLSlider.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C046917DEFF4F003E6E1A /* SDLSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLSlider.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C046A17DEFF4F003E6E1A /* SDLSliderResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSliderResponse.h; sourceTree = "<group>"; };
+               597C046B17DEFF4F003E6E1A /* SDLSliderResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLSliderResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C046C17DEFF4F003E6E1A /* SDLSoftButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSoftButton.h; sourceTree = "<group>"; };
+               597C046D17DEFF4F003E6E1A /* SDLSoftButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSoftButton.m; sourceTree = "<group>"; };
+               597C046E17DEFF4F003E6E1A /* SDLSoftButtonCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSoftButtonCapabilities.h; sourceTree = "<group>"; };
+               597C046F17DEFF4F003E6E1A /* SDLSoftButtonCapabilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSoftButtonCapabilities.m; sourceTree = "<group>"; };
+               597C047017DEFF4F003E6E1A /* SDLSoftButtonType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSoftButtonType.h; sourceTree = "<group>"; };
+               597C047117DEFF4F003E6E1A /* SDLSoftButtonType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSoftButtonType.m; sourceTree = "<group>"; };
+               597C047217DEFF4F003E6E1A /* SDLSpeak.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLSpeak.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C047317DEFF4F003E6E1A /* SDLSpeak.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLSpeak.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C047417DEFF4F003E6E1A /* SDLSpeakResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSpeakResponse.h; sourceTree = "<group>"; };
+               597C047517DEFF4F003E6E1A /* SDLSpeakResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLSpeakResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C047617DEFF4F003E6E1A /* SDLSpeechCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSpeechCapabilities.h; sourceTree = "<group>"; };
+               597C047717DEFF4F003E6E1A /* SDLSpeechCapabilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLSpeechCapabilities.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C047817DEFF4F003E6E1A /* SDLStartTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLStartTime.h; sourceTree = "<group>"; };
+               597C047917DEFF4F003E6E1A /* SDLStartTime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLStartTime.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C047A17DEFF4F003E6E1A /* SDLSubscribeButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLSubscribeButton.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C047B17DEFF4F003E6E1A /* SDLSubscribeButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSubscribeButton.m; sourceTree = "<group>"; };
+               597C047C17DEFF4F003E6E1A /* SDLSubscribeButtonResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSubscribeButtonResponse.h; sourceTree = "<group>"; };
+               597C047D17DEFF4F003E6E1A /* SDLSubscribeButtonResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSubscribeButtonResponse.m; sourceTree = "<group>"; };
+               597C047E17DEFF4F003E6E1A /* SDLSubscribeVehicleData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSubscribeVehicleData.h; sourceTree = "<group>"; };
+               597C047F17DEFF4F003E6E1A /* SDLSubscribeVehicleData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSubscribeVehicleData.m; sourceTree = "<group>"; };
+               597C048017DEFF4F003E6E1A /* SDLSubscribeVehicleDataResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSubscribeVehicleDataResponse.h; sourceTree = "<group>"; };
+               597C048117DEFF4F003E6E1A /* SDLSubscribeVehicleDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSubscribeVehicleDataResponse.m; sourceTree = "<group>"; };
+               597C048217DEFF4F003E6E1A /* SDLIAPTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLIAPTransport.h; sourceTree = "<group>"; };
+               597C048317DEFF4F003E6E1A /* SDLIAPTransport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLIAPTransport.m; sourceTree = "<group>"; };
+               597C048417DEFF4F003E6E1A /* SDLSyncMsgVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSyncMsgVersion.h; sourceTree = "<group>"; };
+               597C048517DEFF4F003E6E1A /* SDLSyncMsgVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSyncMsgVersion.m; sourceTree = "<group>"; };
+               597C048617DEFF4F003E6E1A /* SDLSyncPData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSyncPData.h; sourceTree = "<group>"; };
+               597C048717DEFF4F003E6E1A /* SDLSyncPData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSyncPData.m; sourceTree = "<group>"; };
+               597C048817DEFF4F003E6E1A /* SDLSyncPDataResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSyncPDataResponse.h; sourceTree = "<group>"; };
+               597C048917DEFF4F003E6E1A /* SDLSyncPDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSyncPDataResponse.m; sourceTree = "<group>"; };
+               597C048A17DEFF4F003E6E1A /* SDLProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLProxy.h; sourceTree = "<group>"; };
+               597C048B17DEFF4F003E6E1A /* SDLProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLProxy.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C048C17DEFF4F003E6E1A /* SDLProxyFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLProxyFactory.h; sourceTree = "<group>"; };
+               597C048D17DEFF4F003E6E1A /* SDLProxyFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLProxyFactory.m; sourceTree = "<group>"; };
+               597C048E17DEFF4F003E6E1A /* SDLTCPTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTCPTransport.h; sourceTree = "<group>"; };
+               597C048F17DEFF4F003E6E1A /* SDLTCPTransport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTCPTransport.m; sourceTree = "<group>"; };
+               597C049017DEFF4F003E6E1A /* SDLITransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLITransport.h; sourceTree = "<group>"; };
+               597C049117DEFF4F003E6E1A /* SDLSystemAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSystemAction.h; sourceTree = "<group>"; };
+               597C049217DEFF4F003E6E1A /* SDLSystemAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSystemAction.m; sourceTree = "<group>"; };
+               597C049317DEFF4F003E6E1A /* SDLSystemContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSystemContext.h; sourceTree = "<group>"; };
+               597C049417DEFF4F003E6E1A /* SDLSystemContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSystemContext.m; sourceTree = "<group>"; };
+               597C049517DEFF4F003E6E1A /* SDLTBTState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTBTState.h; sourceTree = "<group>"; };
+               597C049617DEFF4F003E6E1A /* SDLTBTState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLTBTState.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C049717DEFF4F003E6E1A /* SDLTextAlignment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTextAlignment.h; sourceTree = "<group>"; };
+               597C049817DEFF4F003E6E1A /* SDLTextAlignment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTextAlignment.m; sourceTree = "<group>"; };
+               597C049917DEFF50003E6E1A /* SDLTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLTextField.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C049A17DEFF50003E6E1A /* SDLTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLTextField.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C049B17DEFF50003E6E1A /* SDLTextFieldName.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTextFieldName.h; sourceTree = "<group>"; };
+               597C049C17DEFF50003E6E1A /* SDLTextFieldName.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLTextFieldName.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C049D17DEFF50003E6E1A /* SDLTireStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLTireStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C049E17DEFF50003E6E1A /* SDLTireStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLTireStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C049F17DEFF50003E6E1A /* SDLTransportListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTransportListener.h; sourceTree = "<group>"; };
+               597C04A017DEFF50003E6E1A /* SDLTriggerSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLTriggerSource.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C04A117DEFF50003E6E1A /* SDLTriggerSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLTriggerSource.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04A217DEFF50003E6E1A /* SDLTTSChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLTTSChunk.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C04A317DEFF50003E6E1A /* SDLTTSChunk.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLTTSChunk.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04A417DEFF50003E6E1A /* SDLTTSChunkFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLTTSChunkFactory.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C04A517DEFF50003E6E1A /* SDLTTSChunkFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLTTSChunkFactory.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04A617DEFF50003E6E1A /* SDLTurn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTurn.h; sourceTree = "<group>"; };
+               597C04A717DEFF50003E6E1A /* SDLTurn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTurn.m; sourceTree = "<group>"; };
+               597C04A817DEFF50003E6E1A /* SDLUnregisterAppInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnregisterAppInterface.h; sourceTree = "<group>"; };
+               597C04A917DEFF50003E6E1A /* SDLUnregisterAppInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUnregisterAppInterface.m; sourceTree = "<group>"; };
+               597C04AA17DEFF50003E6E1A /* SDLUnregisterAppInterfaceResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnregisterAppInterfaceResponse.h; sourceTree = "<group>"; };
+               597C04AB17DEFF50003E6E1A /* SDLUnregisterAppInterfaceResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUnregisterAppInterfaceResponse.m; sourceTree = "<group>"; };
+               597C04AC17DEFF50003E6E1A /* SDLUnsubscribeButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnsubscribeButton.h; sourceTree = "<group>"; };
+               597C04AD17DEFF50003E6E1A /* SDLUnsubscribeButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLUnsubscribeButton.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04AE17DEFF50003E6E1A /* SDLUnsubscribeButtonResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnsubscribeButtonResponse.h; sourceTree = "<group>"; };
+               597C04AF17DEFF50003E6E1A /* SDLUnsubscribeButtonResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUnsubscribeButtonResponse.m; sourceTree = "<group>"; };
+               597C04B017DEFF50003E6E1A /* SDLUnsubscribeVehicleData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLUnsubscribeVehicleData.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C04B117DEFF50003E6E1A /* SDLUnsubscribeVehicleData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUnsubscribeVehicleData.m; sourceTree = "<group>"; };
+               597C04B217DEFF50003E6E1A /* SDLUnsubscribeVehicleDataResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnsubscribeVehicleDataResponse.h; sourceTree = "<group>"; };
+               597C04B317DEFF50003E6E1A /* SDLUnsubscribeVehicleDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLUnsubscribeVehicleDataResponse.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04B417DEFF50003E6E1A /* SDLUpdateMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUpdateMode.h; sourceTree = "<group>"; };
+               597C04B517DEFF50003E6E1A /* SDLUpdateMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUpdateMode.m; sourceTree = "<group>"; };
+               597C04B617DEFF50003E6E1A /* SDLUpdateTurnList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUpdateTurnList.h; sourceTree = "<group>"; };
+               597C04B717DEFF50003E6E1A /* SDLUpdateTurnList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUpdateTurnList.m; sourceTree = "<group>"; };
+               597C04B817DEFF50003E6E1A /* SDLUpdateTurnListResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUpdateTurnListResponse.h; sourceTree = "<group>"; };
+               597C04B917DEFF50003E6E1A /* SDLUpdateTurnListResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUpdateTurnListResponse.m; sourceTree = "<group>"; };
+               597C04BA17DEFF50003E6E1A /* SDLVehicleDataActiveStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVehicleDataActiveStatus.h; sourceTree = "<group>"; };
+               597C04BB17DEFF50003E6E1A /* SDLVehicleDataActiveStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLVehicleDataActiveStatus.m; sourceTree = "<group>"; };
+               597C04BC17DEFF50003E6E1A /* SDLVehicleDataEventStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVehicleDataEventStatus.h; sourceTree = "<group>"; };
+               597C04BD17DEFF50003E6E1A /* SDLVehicleDataEventStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLVehicleDataEventStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04BE17DEFF50003E6E1A /* SDLVehicleDataNotificationStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVehicleDataNotificationStatus.h; sourceTree = "<group>"; };
+               597C04BF17DEFF50003E6E1A /* SDLVehicleDataNotificationStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLVehicleDataNotificationStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04C017DEFF50003E6E1A /* SDLVehicleDataResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLVehicleDataResult.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C04C117DEFF50003E6E1A /* SDLVehicleDataResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLVehicleDataResult.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04C217DEFF50003E6E1A /* SDLVehicleDataResultCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVehicleDataResultCode.h; sourceTree = "<group>"; };
+               597C04C317DEFF50003E6E1A /* SDLVehicleDataResultCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLVehicleDataResultCode.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04C417DEFF50003E6E1A /* SDLVehicleDataStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVehicleDataStatus.h; sourceTree = "<group>"; };
+               597C04C517DEFF50003E6E1A /* SDLVehicleDataStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLVehicleDataStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04C617DEFF50003E6E1A /* SDLVehicleDataType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVehicleDataType.h; sourceTree = "<group>"; };
+               597C04C717DEFF50003E6E1A /* SDLVehicleDataType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLVehicleDataType.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04C817DEFF50003E6E1A /* SDLVehicleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVehicleType.h; sourceTree = "<group>"; };
+               597C04C917DEFF50003E6E1A /* SDLVehicleType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLVehicleType.m; sourceTree = "<group>"; };
+               597C04CA17DEFF50003E6E1A /* SDLVrCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVrCapabilities.h; sourceTree = "<group>"; };
+               597C04CB17DEFF50003E6E1A /* SDLVrCapabilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLVrCapabilities.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04CC17DEFF50003E6E1A /* SDLVrHelpItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLVrHelpItem.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C04CD17DEFF50003E6E1A /* SDLVrHelpItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLVrHelpItem.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04CE17DEFF50003E6E1A /* SDLWarningLightStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLWarningLightStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C04CF17DEFF50003E6E1A /* SDLWarningLightStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLWarningLightStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04D017DEFF50003E6E1A /* SDLWiperStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLWiperStatus.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C04D117DEFF50003E6E1A /* SDLWiperStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLWiperStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               597C04D217DEFF50003E6E1A /* SDLProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLProtocol.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               597C04D317DEFF50003E6E1A /* SDLProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLProtocol.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               5986A385183FD62A0003BAC6 /* SDLAbstractTransport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SDLAbstractTransport.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               FBAC28E0181FEAF4003210A2 /* SDLExternalLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SDLExternalLibrary.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+               5913387817DEFCB300CF214C /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+               5913384E17DEFC5E00CF214C = {
+                       isa = PBXGroup;
+                       children = (
+                               5913386017DEFC5E00CF214C /* SmartDeviceLink */,
+                               5913385917DEFC5E00CF214C /* Frameworks */,
+                               5913385817DEFC5E00CF214C /* Products */,
+                       );
+                       sourceTree = "<group>";
+               };
+               5913385817DEFC5E00CF214C /* Products */ = {
+                       isa = PBXGroup;
+                       children = (
+                               5913387B17DEFCB300CF214C /* SmartDeviceLink.framework */,
+                       );
+                       name = Products;
+                       sourceTree = "<group>";
+               };
+               5913385917DEFC5E00CF214C /* Frameworks */ = {
+                       isa = PBXGroup;
+                       children = (
+                       );
+                       name = Frameworks;
+                       sourceTree = "<group>";
+               };
+               5913386017DEFC5E00CF214C /* SmartDeviceLink */ = {
+                       isa = PBXGroup;
+                       children = (
+                               594910281840B22E0050AEE5 /* SmartDeviceLink.h */,
+                               597C034917DEFF4F003E6E1A /* SDLAbstractProtocol.h */,
+                               597C034A17DEFF4F003E6E1A /* SDLAbstractProtocol.m */,
+                               597C034B17DEFF4F003E6E1A /* SDLAbstractTransport.h */,
+                               5986A385183FD62A0003BAC6 /* SDLAbstractTransport.m */,
+                               597C034D17DEFF4F003E6E1A /* SDLAddCommand.h */,
+                               597C034E17DEFF4F003E6E1A /* SDLAddCommand.m */,
+                               597C034F17DEFF4F003E6E1A /* SDLAddCommandResponse.h */,
+                               597C035017DEFF4F003E6E1A /* SDLAddCommandResponse.m */,
+                               597C035117DEFF4F003E6E1A /* SDLAddSubMenu.h */,
+                               597C035217DEFF4F003E6E1A /* SDLAddSubMenu.m */,
+                               597C035317DEFF4F003E6E1A /* SDLAddSubMenuResponse.h */,
+                               597C035417DEFF4F003E6E1A /* SDLAddSubMenuResponse.m */,
+                               597C035517DEFF4F003E6E1A /* SDLAlert.h */,
+                               597C035617DEFF4F003E6E1A /* SDLAlert.m */,
+                               597C035717DEFF4F003E6E1A /* SDLAlertManeuver.h */,
+                               597C035817DEFF4F003E6E1A /* SDLAlertManeuver.m */,
+                               597C035917DEFF4F003E6E1A /* SDLAlertManeuverResponse.h */,
+                               597C035A17DEFF4F003E6E1A /* SDLAlertManeuverResponse.m */,
+                               597C035B17DEFF4F003E6E1A /* SDLAlertResponse.h */,
+                               597C035C17DEFF4F003E6E1A /* SDLAlertResponse.m */,
+                               597C035D17DEFF4F003E6E1A /* SDLAppHMIType.h */,
+                               597C035E17DEFF4F003E6E1A /* SDLAppHMIType.m */,
+                               597C035F17DEFF4F003E6E1A /* SDLAppInterfaceUnregisteredReason.h */,
+                               597C036017DEFF4F003E6E1A /* SDLAppInterfaceUnregisteredReason.m */,
+                               597C036117DEFF4F003E6E1A /* SDLAudioPassThruCapabilities.h */,
+                               597C036217DEFF4F003E6E1A /* SDLAudioPassThruCapabilities.m */,
+                               597C036317DEFF4F003E6E1A /* SDLAudioStreamingState.h */,
+                               597C036417DEFF4F003E6E1A /* SDLAudioStreamingState.m */,
+                               597C036517DEFF4F003E6E1A /* SDLAudioType.h */,
+                               597C036617DEFF4F003E6E1A /* SDLAudioType.m */,
+                               597C036717DEFF4F003E6E1A /* SDLBeltStatus.h */,
+                               597C036817DEFF4F003E6E1A /* SDLBeltStatus.m */,
+                               597C036917DEFF4F003E6E1A /* SDLBinaryFrameHeader.h */,
+                               597C036A17DEFF4F003E6E1A /* SDLBinaryFrameHeader.m */,
+                               597C036B17DEFF4F003E6E1A /* SDLBitConverter.h */,
+                               597C036C17DEFF4F003E6E1A /* SDLBitConverter.m */,
+                               597C036D17DEFF4F003E6E1A /* SDLBitsPerSample.h */,
+                               597C036E17DEFF4F003E6E1A /* SDLBitsPerSample.m */,
+                               597C036F17DEFF4F003E6E1A /* SDLBodyInformation.h */,
+                               597C037017DEFF4F003E6E1A /* SDLBodyInformation.m */,
+                               597C037117DEFF4F003E6E1A /* SDLButtonCapabilities.h */,
+                               597C037217DEFF4F003E6E1A /* SDLButtonCapabilities.m */,
+                               597C037317DEFF4F003E6E1A /* SDLButtonEventMode.h */,
+                               597C037417DEFF4F003E6E1A /* SDLButtonEventMode.m */,
+                               597C037517DEFF4F003E6E1A /* SDLButtonName.h */,
+                               597C037617DEFF4F003E6E1A /* SDLButtonName.m */,
+                               597C037717DEFF4F003E6E1A /* SDLButtonPressMode.h */,
+                               597C037817DEFF4F003E6E1A /* SDLButtonPressMode.m */,
+                               597C037917DEFF4F003E6E1A /* SDLChangeRegistration.h */,
+                               597C037A17DEFF4F003E6E1A /* SDLChangeRegistration.m */,
+                               597C037B17DEFF4F003E6E1A /* SDLChangeRegistrationResponse.h */,
+                               597C037C17DEFF4F003E6E1A /* SDLChangeRegistrationResponse.m */,
+                               597C037D17DEFF4F003E6E1A /* SDLCharacterSet.h */,
+                               597C037E17DEFF4F003E6E1A /* SDLCharacterSet.m */,
+                               597C037F17DEFF4F003E6E1A /* SDLChoice.h */,
+                               597C038017DEFF4F003E6E1A /* SDLChoice.m */,
+                               597C038117DEFF4F003E6E1A /* SDLCompassDirection.h */,
+                               597C038217DEFF4F003E6E1A /* SDLCompassDirection.m */,
+                               597C038317DEFF4F003E6E1A /* SDLComponentVolumeStatus.h */,
+                               597C038417DEFF4F003E6E1A /* SDLComponentVolumeStatus.m */,
+                               597C038517DEFF4F003E6E1A /* SDLConsoleController.h */,
+                               597C038617DEFF4F003E6E1A /* SDLConsoleController.m */,
+                               597C038717DEFF4F003E6E1A /* SDLCreateInteractionChoiceSet.h */,
+                               597C038817DEFF4F003E6E1A /* SDLCreateInteractionChoiceSet.m */,
+                               597C038917DEFF4F003E6E1A /* SDLCreateInteractionChoiceSetResponse.h */,
+                               597C038A17DEFF4F003E6E1A /* SDLCreateInteractionChoiceSetResponse.m */,
+                               597C038B17DEFF4F003E6E1A /* SDLDebugTool.h */,
+                               597C038C17DEFF4F003E6E1A /* SDLDebugTool.m */,
+                               597C038D17DEFF4F003E6E1A /* SDLDecoder.h */,
+                               597C038E17DEFF4F003E6E1A /* SDLDeleteCommand.h */,
+                               597C038F17DEFF4F003E6E1A /* SDLDeleteCommand.m */,
+                               597C039017DEFF4F003E6E1A /* SDLDeleteCommandResponse.h */,
+                               597C039117DEFF4F003E6E1A /* SDLDeleteCommandResponse.m */,
+                               597C039217DEFF4F003E6E1A /* SDLDeleteFile.h */,
+                               597C039317DEFF4F003E6E1A /* SDLDeleteFile.m */,
+                               597C039417DEFF4F003E6E1A /* SDLDeleteFileResponse.h */,
+                               597C039517DEFF4F003E6E1A /* SDLDeleteFileResponse.m */,
+                               597C039617DEFF4F003E6E1A /* SDLDeleteInteractionChoiceSet.h */,
+                               597C039717DEFF4F003E6E1A /* SDLDeleteInteractionChoiceSet.m */,
+                               597C039817DEFF4F003E6E1A /* SDLDeleteInteractionChoiceSetResponse.h */,
+                               597C039917DEFF4F003E6E1A /* SDLDeleteInteractionChoiceSetResponse.m */,
+                               597C039A17DEFF4F003E6E1A /* SDLDeleteSubMenu.h */,
+                               597C039B17DEFF4F003E6E1A /* SDLDeleteSubMenu.m */,
+                               597C039C17DEFF4F003E6E1A /* SDLDeleteSubMenuResponse.h */,
+                               597C039D17DEFF4F003E6E1A /* SDLDeleteSubMenuResponse.m */,
+                               597C039E17DEFF4F003E6E1A /* SDLDeviceLevelStatus.h */,
+                               597C039F17DEFF4F003E6E1A /* SDLDeviceLevelStatus.m */,
+                               597C03A017DEFF4F003E6E1A /* SDLDeviceStatus.h */,
+                               597C03A117DEFF4F003E6E1A /* SDLDeviceStatus.m */,
+                               597C03A217DEFF4F003E6E1A /* SDLDIDResult.h */,
+                               597C03A317DEFF4F003E6E1A /* SDLDIDResult.m */,
+                               597C03A417DEFF4F003E6E1A /* SDLDimension.h */,
+                               597C03A517DEFF4F003E6E1A /* SDLDimension.m */,
+                               597C03A617DEFF4F003E6E1A /* SDLDisplayCapabilities.h */,
+                               597C03A717DEFF4F003E6E1A /* SDLDisplayCapabilities.m */,
+                               597C03A817DEFF4F003E6E1A /* SDLDisplayType.h */,
+                               597C03A917DEFF4F003E6E1A /* SDLDisplayType.m */,
+                               597C03AA17DEFF4F003E6E1A /* SDLDriverDistractionState.h */,
+                               597C03AB17DEFF4F003E6E1A /* SDLDriverDistractionState.m */,
+                               597C03AC17DEFF4F003E6E1A /* SDLEncodedSyncPData.h */,
+                               597C03AD17DEFF4F003E6E1A /* SDLEncodedSyncPData.m */,
+                               597C03AE17DEFF4F003E6E1A /* SDLEncodedSyncPDataResponse.h */,
+                               597C03AF17DEFF4F003E6E1A /* SDLEncodedSyncPDataResponse.m */,
+                               597C03B017DEFF4F003E6E1A /* SDLEncoder.h */,
+                               597C03B117DEFF4F003E6E1A /* SDLEndAudioPassThru.h */,
+                               597C03B217DEFF4F003E6E1A /* SDLEndAudioPassThru.m */,
+                               597C03B317DEFF4F003E6E1A /* SDLEndAudioPassThruResponse.h */,
+                               597C03B417DEFF4F003E6E1A /* SDLEndAudioPassThruResponse.m */,
+                               597C03B517DEFF4F003E6E1A /* SDLEngineInfo.h */,
+                               597C03B617DEFF4F003E6E1A /* SDLEngineInfo.m */,
+                               597C03B717DEFF4F003E6E1A /* SDLEnum.h */,
+                               597C03B817DEFF4F003E6E1A /* SDLEnum.m */,
+                               FBAC28E0181FEAF4003210A2 /* SDLExternalLibrary.h */,
+                               597C03B917DEFF4F003E6E1A /* SDLFileType.h */,
+                               597C03BA17DEFF4F003E6E1A /* SDLFileType.m */,
+                               597C03BB17DEFF4F003E6E1A /* SDLFunctionID.h */,
+                               597C03BC17DEFF4F003E6E1A /* SDLFunctionID.m */,
+                               597C03BD17DEFF4F003E6E1A /* SDLGenericResponse.h */,
+                               597C03BE17DEFF4F003E6E1A /* SDLGenericResponse.m */,
+                               597C03BF17DEFF4F003E6E1A /* SDLGetDTCs.h */,
+                               597C03C017DEFF4F003E6E1A /* SDLGetDTCs.m */,
+                               597C03C117DEFF4F003E6E1A /* SDLGetDTCsResponse.h */,
+                               597C03C217DEFF4F003E6E1A /* SDLGetDTCsResponse.m */,
+                               597C03C317DEFF4F003E6E1A /* SDLGetVehicleData.h */,
+                               597C03C417DEFF4F003E6E1A /* SDLGetVehicleData.m */,
+                               597C03C517DEFF4F003E6E1A /* SDLGetVehicleDataResponse.h */,
+                               597C03C617DEFF4F003E6E1A /* SDLGetVehicleDataResponse.m */,
+                               597C03C717DEFF4F003E6E1A /* SDLGlobalProperty.h */,
+                               597C03C817DEFF4F003E6E1A /* SDLGlobalProperty.m */,
+                               597C03C917DEFF4F003E6E1A /* SDLGPSData.h */,
+                               597C03CA17DEFF4F003E6E1A /* SDLGPSData.m */,
+                               597C03CB17DEFF4F003E6E1A /* SDLHeadLampStatus.h */,
+                               597C03CC17DEFF4F003E6E1A /* SDLHeadLampStatus.m */,
+                               597C03CD17DEFF4F003E6E1A /* SDLHMILevel.h */,
+                               597C03CE17DEFF4F003E6E1A /* SDLHMILevel.m */,
+                               597C03CF17DEFF4F003E6E1A /* SDLHMIPermissions.h */,
+                               597C03D017DEFF4F003E6E1A /* SDLHMIPermissions.m */,
+                               597C03D117DEFF4F003E6E1A /* SDLHMIZoneCapabilities.h */,
+                               597C03D217DEFF4F003E6E1A /* SDLHMIZoneCapabilities.m */,
+                               597C03D317DEFF4F003E6E1A /* SDLIgnitionStableStatus.h */,
+                               597C03D417DEFF4F003E6E1A /* SDLIgnitionStableStatus.m */,
+                               597C03D517DEFF4F003E6E1A /* SDLIgnitionStatus.h */,
+                               597C03D617DEFF4F003E6E1A /* SDLIgnitionStatus.m */,
+                               597C03D717DEFF4F003E6E1A /* SDLImage.h */,
+                               597C03D817DEFF4F003E6E1A /* SDLImage.m */,
+                               597C03D917DEFF4F003E6E1A /* SDLImageType.h */,
+                               597C03DA17DEFF4F003E6E1A /* SDLImageType.m */,
+                               597C03DB17DEFF4F003E6E1A /* SDLInteractionMode.h */,
+                               597C03DC17DEFF4F003E6E1A /* SDLInteractionMode.m */,
+                               597C03DD17DEFF4F003E6E1A /* SDLIProxy.h */,
+                               597C03DE17DEFF4F003E6E1A /* SDLJingle.h */,
+                               597C03DF17DEFF4F003E6E1A /* SDLJingle.m */,
+                               597C03E017DEFF4F003E6E1A /* SDLJsonDecoder.h */,
+                               597C03E117DEFF4F003E6E1A /* SDLJsonDecoder.m */,
+                               597C03E217DEFF4F003E6E1A /* SDLJsonEncoder.h */,
+                               597C03E317DEFF4F003E6E1A /* SDLJsonEncoder.m */,
+                               597C03E417DEFF4F003E6E1A /* SDLLanguage.h */,
+                               597C03E517DEFF4F003E6E1A /* SDLLanguage.m */,
+                               597C03E617DEFF4F003E6E1A /* SDLListFiles.h */,
+                               597C03E717DEFF4F003E6E1A /* SDLListFiles.m */,
+                               597C03E817DEFF4F003E6E1A /* SDLListFilesResponse.h */,
+                               597C03E917DEFF4F003E6E1A /* SDLListFilesResponse.m */,
+                               597C03EA17DEFF4F003E6E1A /* SDLMaintenanceModeStatus.h */,
+                               597C03EB17DEFF4F003E6E1A /* SDLMaintenanceModeStatus.m */,
+                               597C03EC17DEFF4F003E6E1A /* SDLMediaClockFormat.h */,
+                               597C03ED17DEFF4F003E6E1A /* SDLMediaClockFormat.m */,
+                               597C03EE17DEFF4F003E6E1A /* SDLMenuParams.h */,
+                               597C03EF17DEFF4F003E6E1A /* SDLMenuParams.m */,
+                               597C03F017DEFF4F003E6E1A /* SDLNames.h */,
+                               597C03F117DEFF4F003E6E1A /* SDLOnAppInterfaceUnregistered.h */,
+                               597C03F217DEFF4F003E6E1A /* SDLOnAppInterfaceUnregistered.m */,
+                               597C03F317DEFF4F003E6E1A /* SDLOnAudioPassThru.h */,
+                               597C03F417DEFF4F003E6E1A /* SDLOnAudioPassThru.m */,
+                               597C03F517DEFF4F003E6E1A /* SDLOnButtonEvent.h */,
+                               597C03F617DEFF4F003E6E1A /* SDLOnButtonEvent.m */,
+                               597C03F717DEFF4F003E6E1A /* SDLOnButtonPress.h */,
+                               597C03F817DEFF4F003E6E1A /* SDLOnButtonPress.m */,
+                               597C03F917DEFF4F003E6E1A /* SDLOnCommand.h */,
+                               597C03FA17DEFF4F003E6E1A /* SDLOnCommand.m */,
+                               597C03FB17DEFF4F003E6E1A /* SDLOnDriverDistraction.h */,
+                               597C03FC17DEFF4F003E6E1A /* SDLOnDriverDistraction.m */,
+                               597C03FD17DEFF4F003E6E1A /* SDLOnEncodedSyncPData.h */,
+                               597C03FE17DEFF4F003E6E1A /* SDLOnEncodedSyncPData.m */,
+                               597C03FF17DEFF4F003E6E1A /* SDLOnHMIStatus.h */,
+                               597C040017DEFF4F003E6E1A /* SDLOnHMIStatus.m */,
+                               597C040117DEFF4F003E6E1A /* SDLOnLanguageChange.h */,
+                               597C040217DEFF4F003E6E1A /* SDLOnLanguageChange.m */,
+                               597C040317DEFF4F003E6E1A /* SDLOnPermissionsChange.h */,
+                               597C040417DEFF4F003E6E1A /* SDLOnPermissionsChange.m */,
+                               597C040517DEFF4F003E6E1A /* SDLOnSyncPData.h */,
+                               597C040617DEFF4F003E6E1A /* SDLOnSyncPData.m */,
+                               597C040717DEFF4F003E6E1A /* SDLOnTBTClientState.h */,
+                               597C040817DEFF4F003E6E1A /* SDLOnTBTClientState.m */,
+                               597C040917DEFF4F003E6E1A /* SDLOnVehicleData.h */,
+                               597C040A17DEFF4F003E6E1A /* SDLOnVehicleData.m */,
+                               597C040B17DEFF4F003E6E1A /* SDLParameterPermissions.h */,
+                               597C040C17DEFF4F003E6E1A /* SDLParameterPermissions.m */,
+                               597C040D17DEFF4F003E6E1A /* SDLPerformAudioPassThru.h */,
+                               597C040E17DEFF4F003E6E1A /* SDLPerformAudioPassThru.m */,
+                               597C040F17DEFF4F003E6E1A /* SDLPerformAudioPassThruResponse.h */,
+                               597C041017DEFF4F003E6E1A /* SDLPerformAudioPassThruResponse.m */,
+                               597C041117DEFF4F003E6E1A /* SDLPerformInteraction.h */,
+                               597C041217DEFF4F003E6E1A /* SDLPerformInteraction.m */,
+                               597C041317DEFF4F003E6E1A /* SDLPerformInteractionResponse.h */,
+                               597C041417DEFF4F003E6E1A /* SDLPerformInteractionResponse.m */,
+                               597C041517DEFF4F003E6E1A /* SDLPermissionItem.h */,
+                               597C041617DEFF4F003E6E1A /* SDLPermissionItem.m */,
+                               597C041717DEFF4F003E6E1A /* SDLPermissionStatus.h */,
+                               597C041817DEFF4F003E6E1A /* SDLPermissionStatus.m */,
+                               597C041917DEFF4F003E6E1A /* SDLPresetBankCapabilities.h */,
+                               597C041A17DEFF4F003E6E1A /* SDLPresetBankCapabilities.m */,
+                               597C041B17DEFF4F003E6E1A /* SDLPrimaryAudioSource.h */,
+                               597C041C17DEFF4F003E6E1A /* SDLPrimaryAudioSource.m */,
+                               597C041D17DEFF4F003E6E1A /* SDLPRNDL.h */,
+                               597C041E17DEFF4F003E6E1A /* SDLPRNDL.m */,
+                               597C041F17DEFF4F003E6E1A /* SDLIProtocol.h */,
+                               597C042017DEFF4F003E6E1A /* SDLProtocolFrameHeader.h */,
+                               597C042117DEFF4F003E6E1A /* SDLProtocolFrameHeader.m */,
+                               597C042217DEFF4F003E6E1A /* SDLProtocolFrameHeaderFactory.h */,
+                               597C042317DEFF4F003E6E1A /* SDLProtocolFrameHeaderFactory.m */,
+                               597C042417DEFF4F003E6E1A /* SDLProtocolListener.h */,
+                               597C042517DEFF4F003E6E1A /* SDLProtocolMessage.h */,
+                               597C042617DEFF4F003E6E1A /* SDLProtocolMessage.m */,
+                               597C042717DEFF4F003E6E1A /* SDLProxyListener.h */,
+                               597C042817DEFF4F003E6E1A /* SDLPutFile.h */,
+                               597C042917DEFF4F003E6E1A /* SDLPutFile.m */,
+                               597C042A17DEFF4F003E6E1A /* SDLPutFileResponse.h */,
+                               597C042B17DEFF4F003E6E1A /* SDLPutFileResponse.m */,
+                               597C042C17DEFF4F003E6E1A /* SDLReadDID.h */,
+                               597C042D17DEFF4F003E6E1A /* SDLReadDID.m */,
+                               597C042E17DEFF4F003E6E1A /* SDLReadDIDResponse.h */,
+                               597C042F17DEFF4F003E6E1A /* SDLReadDIDResponse.m */,
+                               597C043017DEFF4F003E6E1A /* SDLRegisterAppInterface.h */,
+                               597C043117DEFF4F003E6E1A /* SDLRegisterAppInterface.m */,
+                               597C043217DEFF4F003E6E1A /* SDLRegisterAppInterfaceResponse.h */,
+                               597C043317DEFF4F003E6E1A /* SDLRegisterAppInterfaceResponse.m */,
+                               597C043417DEFF4F003E6E1A /* SDLResetGlobalProperties.h */,
+                               597C043517DEFF4F003E6E1A /* SDLResetGlobalProperties.m */,
+                               597C043617DEFF4F003E6E1A /* SDLResetGlobalPropertiesResponse.h */,
+                               597C043717DEFF4F003E6E1A /* SDLResetGlobalPropertiesResponse.m */,
+                               597C043817DEFF4F003E6E1A /* SDLResult.h */,
+                               597C043917DEFF4F003E6E1A /* SDLResult.m */,
+                               597C043A17DEFF4F003E6E1A /* SDLRPCMessage.h */,
+                               597C043B17DEFF4F003E6E1A /* SDLRPCMessage.m */,
+                               597C043C17DEFF4F003E6E1A /* SDLRPCMessageType.h */,
+                               597C043D17DEFF4F003E6E1A /* SDLRPCMessageType.m */,
+                               597C043E17DEFF4F003E6E1A /* SDLRPCNotification.h */,
+                               597C043F17DEFF4F003E6E1A /* SDLRPCNotification.m */,
+                               597C044017DEFF4F003E6E1A /* SDLRPCRequest.h */,
+                               597C044117DEFF4F003E6E1A /* SDLRPCRequest.m */,
+                               597C044217DEFF4F003E6E1A /* SDLRPCRequestFactory.h */,
+                               597C044317DEFF4F003E6E1A /* SDLRPCRequestFactory.m */,
+                               597C044417DEFF4F003E6E1A /* SDLRPCResponse.h */,
+                               597C044517DEFF4F003E6E1A /* SDLRPCResponse.m */,
+                               597C044617DEFF4F003E6E1A /* SDLSamplingRate.h */,
+                               597C044717DEFF4F003E6E1A /* SDLSamplingRate.m */,
+                               597C044817DEFF4F003E6E1A /* SDLScrollableMessage.h */,
+                               597C044917DEFF4F003E6E1A /* SDLScrollableMessage.m */,
+                               597C044A17DEFF4F003E6E1A /* SDLScrollableMessageResponse.h */,
+                               597C044B17DEFF4F003E6E1A /* SDLScrollableMessageResponse.m */,
+                               597C044C17DEFF4F003E6E1A /* SDLSetAppIcon.h */,
+                               597C044D17DEFF4F003E6E1A /* SDLSetAppIcon.m */,
+                               597C044E17DEFF4F003E6E1A /* SDLSetAppIconResponse.h */,
+                               597C044F17DEFF4F003E6E1A /* SDLSetAppIconResponse.m */,
+                               597C045017DEFF4F003E6E1A /* SDLSetDisplayLayout.h */,
+                               597C045117DEFF4F003E6E1A /* SDLSetDisplayLayout.m */,
+                               597C045217DEFF4F003E6E1A /* SDLSetDisplayLayoutResponse.h */,
+                               597C045317DEFF4F003E6E1A /* SDLSetDisplayLayoutResponse.m */,
+                               597C045417DEFF4F003E6E1A /* SDLSetGlobalProperties.h */,
+                               597C045517DEFF4F003E6E1A /* SDLSetGlobalProperties.m */,
+                               597C045617DEFF4F003E6E1A /* SDLSetGlobalPropertiesResponse.h */,
+                               597C045717DEFF4F003E6E1A /* SDLSetGlobalPropertiesResponse.m */,
+                               597C045817DEFF4F003E6E1A /* SDLSetMediaClockTimer.h */,
+                               597C045917DEFF4F003E6E1A /* SDLSetMediaClockTimer.m */,
+                               597C045A17DEFF4F003E6E1A /* SDLSetMediaClockTimerResponse.h */,
+                               597C045B17DEFF4F003E6E1A /* SDLSetMediaClockTimerResponse.m */,
+                               597C045C17DEFF4F003E6E1A /* SDLShow.h */,
+                               597C045D17DEFF4F003E6E1A /* SDLShow.m */,
+                               597C045E17DEFF4F003E6E1A /* SDLShowConstantTBT.h */,
+                               597C045F17DEFF4F003E6E1A /* SDLShowConstantTBT.m */,
+                               597C046017DEFF4F003E6E1A /* SDLShowConstantTBTResponse.h */,
+                               597C046117DEFF4F003E6E1A /* SDLShowConstantTBTResponse.m */,
+                               597C046217DEFF4F003E6E1A /* SDLShowResponse.h */,
+                               597C046317DEFF4F003E6E1A /* SDLShowResponse.m */,
+                               597C046417DEFF4F003E6E1A /* SDLSingleTireStatus.h */,
+                               597C046517DEFF4F003E6E1A /* SDLSingleTireStatus.m */,
+                               597C046617DEFF4F003E6E1A /* SDLSiphonServer.h */,
+                               597C046717DEFF4F003E6E1A /* SDLSiphonServer.m */,
+                               597C046817DEFF4F003E6E1A /* SDLSlider.h */,
+                               597C046917DEFF4F003E6E1A /* SDLSlider.m */,
+                               597C046A17DEFF4F003E6E1A /* SDLSliderResponse.h */,
+                               597C046B17DEFF4F003E6E1A /* SDLSliderResponse.m */,
+                               597C046C17DEFF4F003E6E1A /* SDLSoftButton.h */,
+                               597C046D17DEFF4F003E6E1A /* SDLSoftButton.m */,
+                               597C046E17DEFF4F003E6E1A /* SDLSoftButtonCapabilities.h */,
+                               597C046F17DEFF4F003E6E1A /* SDLSoftButtonCapabilities.m */,
+                               597C047017DEFF4F003E6E1A /* SDLSoftButtonType.h */,
+                               597C047117DEFF4F003E6E1A /* SDLSoftButtonType.m */,
+                               597C047217DEFF4F003E6E1A /* SDLSpeak.h */,
+                               597C047317DEFF4F003E6E1A /* SDLSpeak.m */,
+                               597C047417DEFF4F003E6E1A /* SDLSpeakResponse.h */,
+                               597C047517DEFF4F003E6E1A /* SDLSpeakResponse.m */,
+                               597C047617DEFF4F003E6E1A /* SDLSpeechCapabilities.h */,
+                               597C047717DEFF4F003E6E1A /* SDLSpeechCapabilities.m */,
+                               597C047817DEFF4F003E6E1A /* SDLStartTime.h */,
+                               597C047917DEFF4F003E6E1A /* SDLStartTime.m */,
+                               597C047A17DEFF4F003E6E1A /* SDLSubscribeButton.h */,
+                               597C047B17DEFF4F003E6E1A /* SDLSubscribeButton.m */,
+                               597C047C17DEFF4F003E6E1A /* SDLSubscribeButtonResponse.h */,
+                               597C047D17DEFF4F003E6E1A /* SDLSubscribeButtonResponse.m */,
+                               597C047E17DEFF4F003E6E1A /* SDLSubscribeVehicleData.h */,
+                               597C047F17DEFF4F003E6E1A /* SDLSubscribeVehicleData.m */,
+                               597C048017DEFF4F003E6E1A /* SDLSubscribeVehicleDataResponse.h */,
+                               597C048117DEFF4F003E6E1A /* SDLSubscribeVehicleDataResponse.m */,
+                               597C048217DEFF4F003E6E1A /* SDLIAPTransport.h */,
+                               597C048317DEFF4F003E6E1A /* SDLIAPTransport.m */,
+                               597C048417DEFF4F003E6E1A /* SDLSyncMsgVersion.h */,
+                               597C048517DEFF4F003E6E1A /* SDLSyncMsgVersion.m */,
+                               597C048617DEFF4F003E6E1A /* SDLSyncPData.h */,
+                               597C048717DEFF4F003E6E1A /* SDLSyncPData.m */,
+                               597C048817DEFF4F003E6E1A /* SDLSyncPDataResponse.h */,
+                               597C048917DEFF4F003E6E1A /* SDLSyncPDataResponse.m */,
+                               597C048A17DEFF4F003E6E1A /* SDLProxy.h */,
+                               597C048B17DEFF4F003E6E1A /* SDLProxy.m */,
+                               597C048C17DEFF4F003E6E1A /* SDLProxyFactory.h */,
+                               597C048D17DEFF4F003E6E1A /* SDLProxyFactory.m */,
+                               597C048E17DEFF4F003E6E1A /* SDLTCPTransport.h */,
+                               597C048F17DEFF4F003E6E1A /* SDLTCPTransport.m */,
+                               597C049017DEFF4F003E6E1A /* SDLITransport.h */,
+                               597C049117DEFF4F003E6E1A /* SDLSystemAction.h */,
+                               597C049217DEFF4F003E6E1A /* SDLSystemAction.m */,
+                               597C049317DEFF4F003E6E1A /* SDLSystemContext.h */,
+                               597C049417DEFF4F003E6E1A /* SDLSystemContext.m */,
+                               597C049517DEFF4F003E6E1A /* SDLTBTState.h */,
+                               597C049617DEFF4F003E6E1A /* SDLTBTState.m */,
+                               597C049717DEFF4F003E6E1A /* SDLTextAlignment.h */,
+                               597C049817DEFF4F003E6E1A /* SDLTextAlignment.m */,
+                               597C049917DEFF50003E6E1A /* SDLTextField.h */,
+                               597C049A17DEFF50003E6E1A /* SDLTextField.m */,
+                               597C049B17DEFF50003E6E1A /* SDLTextFieldName.h */,
+                               597C049C17DEFF50003E6E1A /* SDLTextFieldName.m */,
+                               597C049D17DEFF50003E6E1A /* SDLTireStatus.h */,
+                               597C049E17DEFF50003E6E1A /* SDLTireStatus.m */,
+                               597C049F17DEFF50003E6E1A /* SDLTransportListener.h */,
+                               597C04A017DEFF50003E6E1A /* SDLTriggerSource.h */,
+                               597C04A117DEFF50003E6E1A /* SDLTriggerSource.m */,
+                               597C04A217DEFF50003E6E1A /* SDLTTSChunk.h */,
+                               597C04A317DEFF50003E6E1A /* SDLTTSChunk.m */,
+                               597C04A417DEFF50003E6E1A /* SDLTTSChunkFactory.h */,
+                               597C04A517DEFF50003E6E1A /* SDLTTSChunkFactory.m */,
+                               597C04A617DEFF50003E6E1A /* SDLTurn.h */,
+                               597C04A717DEFF50003E6E1A /* SDLTurn.m */,
+                               597C04A817DEFF50003E6E1A /* SDLUnregisterAppInterface.h */,
+                               597C04A917DEFF50003E6E1A /* SDLUnregisterAppInterface.m */,
+                               597C04AA17DEFF50003E6E1A /* SDLUnregisterAppInterfaceResponse.h */,
+                               597C04AB17DEFF50003E6E1A /* SDLUnregisterAppInterfaceResponse.m */,
+                               597C04AC17DEFF50003E6E1A /* SDLUnsubscribeButton.h */,
+                               597C04AD17DEFF50003E6E1A /* SDLUnsubscribeButton.m */,
+                               597C04AE17DEFF50003E6E1A /* SDLUnsubscribeButtonResponse.h */,
+                               597C04AF17DEFF50003E6E1A /* SDLUnsubscribeButtonResponse.m */,
+                               597C04B017DEFF50003E6E1A /* SDLUnsubscribeVehicleData.h */,
+                               597C04B117DEFF50003E6E1A /* SDLUnsubscribeVehicleData.m */,
+                               597C04B217DEFF50003E6E1A /* SDLUnsubscribeVehicleDataResponse.h */,
+                               597C04B317DEFF50003E6E1A /* SDLUnsubscribeVehicleDataResponse.m */,
+                               597C04B417DEFF50003E6E1A /* SDLUpdateMode.h */,
+                               597C04B517DEFF50003E6E1A /* SDLUpdateMode.m */,
+                               597C04B617DEFF50003E6E1A /* SDLUpdateTurnList.h */,
+                               597C04B717DEFF50003E6E1A /* SDLUpdateTurnList.m */,
+                               597C04B817DEFF50003E6E1A /* SDLUpdateTurnListResponse.h */,
+                               597C04B917DEFF50003E6E1A /* SDLUpdateTurnListResponse.m */,
+                               597C04BA17DEFF50003E6E1A /* SDLVehicleDataActiveStatus.h */,
+                               597C04BB17DEFF50003E6E1A /* SDLVehicleDataActiveStatus.m */,
+                               597C04BC17DEFF50003E6E1A /* SDLVehicleDataEventStatus.h */,
+                               597C04BD17DEFF50003E6E1A /* SDLVehicleDataEventStatus.m */,
+                               597C04BE17DEFF50003E6E1A /* SDLVehicleDataNotificationStatus.h */,
+                               597C04BF17DEFF50003E6E1A /* SDLVehicleDataNotificationStatus.m */,
+                               597C04C017DEFF50003E6E1A /* SDLVehicleDataResult.h */,
+                               597C04C117DEFF50003E6E1A /* SDLVehicleDataResult.m */,
+                               597C04C217DEFF50003E6E1A /* SDLVehicleDataResultCode.h */,
+                               597C04C317DEFF50003E6E1A /* SDLVehicleDataResultCode.m */,
+                               597C04C417DEFF50003E6E1A /* SDLVehicleDataStatus.h */,
+                               597C04C517DEFF50003E6E1A /* SDLVehicleDataStatus.m */,
+                               597C04C617DEFF50003E6E1A /* SDLVehicleDataType.h */,
+                               597C04C717DEFF50003E6E1A /* SDLVehicleDataType.m */,
+                               597C04C817DEFF50003E6E1A /* SDLVehicleType.h */,
+                               597C04C917DEFF50003E6E1A /* SDLVehicleType.m */,
+                               597C04CA17DEFF50003E6E1A /* SDLVrCapabilities.h */,
+                               597C04CB17DEFF50003E6E1A /* SDLVrCapabilities.m */,
+                               597C04CC17DEFF50003E6E1A /* SDLVrHelpItem.h */,
+                               597C04CD17DEFF50003E6E1A /* SDLVrHelpItem.m */,
+                               597C04CE17DEFF50003E6E1A /* SDLWarningLightStatus.h */,
+                               597C04CF17DEFF50003E6E1A /* SDLWarningLightStatus.m */,
+                               597C04D017DEFF50003E6E1A /* SDLWiperStatus.h */,
+                               597C04D117DEFF50003E6E1A /* SDLWiperStatus.m */,
+                               597C04D217DEFF50003E6E1A /* SDLProtocol.h */,
+                               597C04D317DEFF50003E6E1A /* SDLProtocol.m */,
+                               5913386117DEFC5E00CF214C /* Supporting Files */,
+                       );
+                       path = SmartDeviceLink;
+                       sourceTree = "<group>";
+               };
+               5913386117DEFC5E00CF214C /* Supporting Files */ = {
+                       isa = PBXGroup;
+                       children = (
+                               5913386217DEFC5E00CF214C /* SmartDeviceLink-Info.plist */,
+                               5913386317DEFC5E00CF214C /* InfoPlist.strings */,
+                       );
+                       name = "Supporting Files";
+                       sourceTree = "<group>";
+               };
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+               59B95E2417DEFE1A00B32744 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               597C04E217DEFF50003E6E1A /* SDLAbstractProtocol.h in Headers */,
+                               597C04E417DEFF50003E6E1A /* SDLAbstractTransport.h in Headers */,
+                               597C04E617DEFF50003E6E1A /* SDLAddCommand.h in Headers */,
+                               597C04E817DEFF50003E6E1A /* SDLAddCommandResponse.h in Headers */,
+                               597C04EA17DEFF50003E6E1A /* SDLAddSubMenu.h in Headers */,
+                               597C04EC17DEFF50003E6E1A /* SDLAddSubMenuResponse.h in Headers */,
+                               597C04EE17DEFF50003E6E1A /* SDLAlert.h in Headers */,
+                               597C04F017DEFF50003E6E1A /* SDLAlertManeuver.h in Headers */,
+                               597C04F217DEFF50003E6E1A /* SDLAlertManeuverResponse.h in Headers */,
+                               597C04F417DEFF50003E6E1A /* SDLAlertResponse.h in Headers */,
+                               597C04F617DEFF50003E6E1A /* SDLAppHMIType.h in Headers */,
+                               597C04F817DEFF50003E6E1A /* SDLAppInterfaceUnregisteredReason.h in Headers */,
+                               597C04FA17DEFF50003E6E1A /* SDLAudioPassThruCapabilities.h in Headers */,
+                               597C04FC17DEFF50003E6E1A /* SDLAudioStreamingState.h in Headers */,
+                               597C04FE17DEFF50003E6E1A /* SDLAudioType.h in Headers */,
+                               597C050017DEFF50003E6E1A /* SDLBeltStatus.h in Headers */,
+                               597C050217DEFF50003E6E1A /* SDLBinaryFrameHeader.h in Headers */,
+                               597C050617DEFF50003E6E1A /* SDLBitsPerSample.h in Headers */,
+                               597C050817DEFF50003E6E1A /* SDLBodyInformation.h in Headers */,
+                               597C050A17DEFF50003E6E1A /* SDLButtonCapabilities.h in Headers */,
+                               597C050C17DEFF50003E6E1A /* SDLButtonEventMode.h in Headers */,
+                               597C050E17DEFF50003E6E1A /* SDLButtonName.h in Headers */,
+                               597C051017DEFF50003E6E1A /* SDLButtonPressMode.h in Headers */,
+                               597C051217DEFF50003E6E1A /* SDLChangeRegistration.h in Headers */,
+                               597C051417DEFF50003E6E1A /* SDLChangeRegistrationResponse.h in Headers */,
+                               597C051617DEFF50003E6E1A /* SDLCharacterSet.h in Headers */,
+                               597C051817DEFF50003E6E1A /* SDLChoice.h in Headers */,
+                               597C051A17DEFF50003E6E1A /* SDLCompassDirection.h in Headers */,
+                               597C051C17DEFF50003E6E1A /* SDLComponentVolumeStatus.h in Headers */,
+                               597C051E17DEFF50003E6E1A /* SDLConsoleController.h in Headers */,
+                               597C052017DEFF50003E6E1A /* SDLCreateInteractionChoiceSet.h in Headers */,
+                               597C052217DEFF50003E6E1A /* SDLCreateInteractionChoiceSetResponse.h in Headers */,
+                               597C052417DEFF50003E6E1A /* SDLDebugTool.h in Headers */,
+                               597C052617DEFF50003E6E1A /* SDLDecoder.h in Headers */,
+                               597C052717DEFF50003E6E1A /* SDLDeleteCommand.h in Headers */,
+                               597C052917DEFF50003E6E1A /* SDLDeleteCommandResponse.h in Headers */,
+                               597C052B17DEFF50003E6E1A /* SDLDeleteFile.h in Headers */,
+                               597C052D17DEFF50003E6E1A /* SDLDeleteFileResponse.h in Headers */,
+                               597C052F17DEFF50003E6E1A /* SDLDeleteInteractionChoiceSet.h in Headers */,
+                               597C053117DEFF50003E6E1A /* SDLDeleteInteractionChoiceSetResponse.h in Headers */,
+                               597C053317DEFF50003E6E1A /* SDLDeleteSubMenu.h in Headers */,
+                               597C053517DEFF50003E6E1A /* SDLDeleteSubMenuResponse.h in Headers */,
+                               597C053717DEFF50003E6E1A /* SDLDeviceLevelStatus.h in Headers */,
+                               597C053917DEFF50003E6E1A /* SDLDeviceStatus.h in Headers */,
+                               597C053B17DEFF50003E6E1A /* SDLDIDResult.h in Headers */,
+                               597C053D17DEFF50003E6E1A /* SDLDimension.h in Headers */,
+                               597C053F17DEFF50003E6E1A /* SDLDisplayCapabilities.h in Headers */,
+                               597C054117DEFF50003E6E1A /* SDLDisplayType.h in Headers */,
+                               597C054317DEFF50003E6E1A /* SDLDriverDistractionState.h in Headers */,
+                               597C054917DEFF50003E6E1A /* SDLEncoder.h in Headers */,
+                               597C054A17DEFF50003E6E1A /* SDLEndAudioPassThru.h in Headers */,
+                               597C054C17DEFF50003E6E1A /* SDLEndAudioPassThruResponse.h in Headers */,
+                               597C054E17DEFF50003E6E1A /* SDLEngineInfo.h in Headers */,
+                               597C055017DEFF50003E6E1A /* SDLEnum.h in Headers */,
+                               597C055217DEFF50003E6E1A /* SDLFileType.h in Headers */,
+                               597C055417DEFF50003E6E1A /* SDLFunctionID.h in Headers */,
+                               597C055617DEFF50003E6E1A /* SDLGenericResponse.h in Headers */,
+                               597C055817DEFF50003E6E1A /* SDLGetDTCs.h in Headers */,
+                               597C055A17DEFF50003E6E1A /* SDLGetDTCsResponse.h in Headers */,
+                               597C055C17DEFF50003E6E1A /* SDLGetVehicleData.h in Headers */,
+                               597C055E17DEFF50003E6E1A /* SDLGetVehicleDataResponse.h in Headers */,
+                               597C056017DEFF50003E6E1A /* SDLGlobalProperty.h in Headers */,
+                               597C056217DEFF50003E6E1A /* SDLGPSData.h in Headers */,
+                               597C056417DEFF50003E6E1A /* SDLHeadLampStatus.h in Headers */,
+                               597C056617DEFF50003E6E1A /* SDLHMILevel.h in Headers */,
+                               597C056817DEFF50003E6E1A /* SDLHMIPermissions.h in Headers */,
+                               597C056A17DEFF50003E6E1A /* SDLHMIZoneCapabilities.h in Headers */,
+                               597C056C17DEFF50003E6E1A /* SDLIgnitionStableStatus.h in Headers */,
+                               597C056E17DEFF50003E6E1A /* SDLIgnitionStatus.h in Headers */,
+                               597C057017DEFF50003E6E1A /* SDLImage.h in Headers */,
+                               597C057217DEFF50003E6E1A /* SDLImageType.h in Headers */,
+                               597C057417DEFF50003E6E1A /* SDLInteractionMode.h in Headers */,
+                               597C057617DEFF50003E6E1A /* SDLIProxy.h in Headers */,
+                               597C057717DEFF50003E6E1A /* SDLJingle.h in Headers */,
+                               597C057917DEFF50003E6E1A /* SDLJsonDecoder.h in Headers */,
+                               597C057B17DEFF50003E6E1A /* SDLJsonEncoder.h in Headers */,
+                               597C057D17DEFF50003E6E1A /* SDLLanguage.h in Headers */,
+                               597C057F17DEFF50003E6E1A /* SDLListFiles.h in Headers */,
+                               597C058117DEFF50003E6E1A /* SDLListFilesResponse.h in Headers */,
+                               597C058317DEFF50003E6E1A /* SDLMaintenanceModeStatus.h in Headers */,
+                               597C058517DEFF50003E6E1A /* SDLMediaClockFormat.h in Headers */,
+                               597C058717DEFF50003E6E1A /* SDLMenuParams.h in Headers */,
+                               597C058A17DEFF50003E6E1A /* SDLOnAppInterfaceUnregistered.h in Headers */,
+                               597C058C17DEFF50003E6E1A /* SDLOnAudioPassThru.h in Headers */,
+                               597C058E17DEFF50003E6E1A /* SDLOnButtonEvent.h in Headers */,
+                               597C059017DEFF50003E6E1A /* SDLOnButtonPress.h in Headers */,
+                               597C059217DEFF50003E6E1A /* SDLOnCommand.h in Headers */,
+                               597C059417DEFF50003E6E1A /* SDLOnDriverDistraction.h in Headers */,
+                               597C059617DEFF50003E6E1A /* SDLOnEncodedSyncPData.h in Headers */,
+                               597C059817DEFF50003E6E1A /* SDLOnHMIStatus.h in Headers */,
+                               597C059A17DEFF50003E6E1A /* SDLOnLanguageChange.h in Headers */,
+                               597C059C17DEFF50003E6E1A /* SDLOnPermissionsChange.h in Headers */,
+                               597C059E17DEFF50003E6E1A /* SDLOnSyncPData.h in Headers */,
+                               597C05A017DEFF50003E6E1A /* SDLOnTBTClientState.h in Headers */,
+                               597C05A217DEFF50003E6E1A /* SDLOnVehicleData.h in Headers */,
+                               597C05A417DEFF50003E6E1A /* SDLParameterPermissions.h in Headers */,
+                               597C05A617DEFF50003E6E1A /* SDLPerformAudioPassThru.h in Headers */,
+                               597C05A817DEFF50003E6E1A /* SDLPerformAudioPassThruResponse.h in Headers */,
+                               597C05AA17DEFF50003E6E1A /* SDLPerformInteraction.h in Headers */,
+                               597C05AC17DEFF50003E6E1A /* SDLPerformInteractionResponse.h in Headers */,
+                               597C05AE17DEFF50003E6E1A /* SDLPermissionItem.h in Headers */,
+                               597C05B017DEFF50003E6E1A /* SDLPermissionStatus.h in Headers */,
+                               597C05B217DEFF50003E6E1A /* SDLPresetBankCapabilities.h in Headers */,
+                               597C05B417DEFF50003E6E1A /* SDLPrimaryAudioSource.h in Headers */,
+                               597C05B617DEFF50003E6E1A /* SDLPRNDL.h in Headers */,
+                               597C05B817DEFF50003E6E1A /* SDLIProtocol.h in Headers */,
+                               597C05B917DEFF50003E6E1A /* SDLProtocolFrameHeader.h in Headers */,
+                               597C05BB17DEFF50003E6E1A /* SDLProtocolFrameHeaderFactory.h in Headers */,
+                               597C05BD17DEFF50003E6E1A /* SDLProtocolListener.h in Headers */,
+                               597C05BE17DEFF50003E6E1A /* SDLProtocolMessage.h in Headers */,
+                               597C05C017DEFF50003E6E1A /* SDLProxyListener.h in Headers */,
+                               597C05C117DEFF50003E6E1A /* SDLPutFile.h in Headers */,
+                               597C05C317DEFF50003E6E1A /* SDLPutFileResponse.h in Headers */,
+                               597C05C517DEFF50003E6E1A /* SDLReadDID.h in Headers */,
+                               597C05C717DEFF50003E6E1A /* SDLReadDIDResponse.h in Headers */,
+                               597C05C917DEFF50003E6E1A /* SDLRegisterAppInterface.h in Headers */,
+                               597C05CB17DEFF50003E6E1A /* SDLRegisterAppInterfaceResponse.h in Headers */,
+                               597C05CD17DEFF50003E6E1A /* SDLResetGlobalProperties.h in Headers */,
+                               597C05CF17DEFF50003E6E1A /* SDLResetGlobalPropertiesResponse.h in Headers */,
+                               597C05D117DEFF50003E6E1A /* SDLResult.h in Headers */,
+                               597C05D317DEFF50003E6E1A /* SDLRPCMessage.h in Headers */,
+                               597C05D517DEFF50003E6E1A /* SDLRPCMessageType.h in Headers */,
+                               597C05D717DEFF50003E6E1A /* SDLRPCNotification.h in Headers */,
+                               597C05D917DEFF50003E6E1A /* SDLRPCRequest.h in Headers */,
+                               597C05DB17DEFF50003E6E1A /* SDLRPCRequestFactory.h in Headers */,
+                               597C05DD17DEFF50003E6E1A /* SDLRPCResponse.h in Headers */,
+                               597C05DF17DEFF50003E6E1A /* SDLSamplingRate.h in Headers */,
+                               597C05E117DEFF50003E6E1A /* SDLScrollableMessage.h in Headers */,
+                               597C05E317DEFF50003E6E1A /* SDLScrollableMessageResponse.h in Headers */,
+                               597C05E517DEFF50003E6E1A /* SDLSetAppIcon.h in Headers */,
+                               597C05E717DEFF50003E6E1A /* SDLSetAppIconResponse.h in Headers */,
+                               597C05E917DEFF50003E6E1A /* SDLSetDisplayLayout.h in Headers */,
+                               597C05EB17DEFF50003E6E1A /* SDLSetDisplayLayoutResponse.h in Headers */,
+                               597C05ED17DEFF50003E6E1A /* SDLSetGlobalProperties.h in Headers */,
+                               597C05EF17DEFF50003E6E1A /* SDLSetGlobalPropertiesResponse.h in Headers */,
+                               597C05F117DEFF50003E6E1A /* SDLSetMediaClockTimer.h in Headers */,
+                               597C05F317DEFF50003E6E1A /* SDLSetMediaClockTimerResponse.h in Headers */,
+                               597C05F517DEFF50003E6E1A /* SDLShow.h in Headers */,
+                               597C05F717DEFF50003E6E1A /* SDLShowConstantTBT.h in Headers */,
+                               597C05F917DEFF50003E6E1A /* SDLShowConstantTBTResponse.h in Headers */,
+                               597C05FB17DEFF50003E6E1A /* SDLShowResponse.h in Headers */,
+                               597C05FD17DEFF50003E6E1A /* SDLSingleTireStatus.h in Headers */,
+                               597C05FF17DEFF50003E6E1A /* SDLSiphonServer.h in Headers */,
+                               597C060117DEFF50003E6E1A /* SDLSlider.h in Headers */,
+                               597C060317DEFF50003E6E1A /* SDLSliderResponse.h in Headers */,
+                               597C060517DEFF50003E6E1A /* SDLSoftButton.h in Headers */,
+                               597C060717DEFF50003E6E1A /* SDLSoftButtonCapabilities.h in Headers */,
+                               597C060917DEFF50003E6E1A /* SDLSoftButtonType.h in Headers */,
+                               597C060B17DEFF50003E6E1A /* SDLSpeak.h in Headers */,
+                               597C060D17DEFF50003E6E1A /* SDLSpeakResponse.h in Headers */,
+                               597C060F17DEFF50003E6E1A /* SDLSpeechCapabilities.h in Headers */,
+                               597C061117DEFF50003E6E1A /* SDLStartTime.h in Headers */,
+                               597C061317DEFF50003E6E1A /* SDLSubscribeButton.h in Headers */,
+                               597C061517DEFF50003E6E1A /* SDLSubscribeButtonResponse.h in Headers */,
+                               597C061717DEFF50003E6E1A /* SDLSubscribeVehicleData.h in Headers */,
+                               597C061917DEFF50003E6E1A /* SDLSubscribeVehicleDataResponse.h in Headers */,
+                               597C061B17DEFF50003E6E1A /* SDLIAPTransport.h in Headers */,
+                               597C061D17DEFF50003E6E1A /* SDLSyncMsgVersion.h in Headers */,
+                               597C062317DEFF50003E6E1A /* SDLProxy.h in Headers */,
+                               597C062517DEFF50003E6E1A /* SDLProxyFactory.h in Headers */,
+                               597C062717DEFF50003E6E1A /* SDLTCPTransport.h in Headers */,
+                               597C062917DEFF50003E6E1A /* SDLITransport.h in Headers */,
+                               597C062A17DEFF50003E6E1A /* SDLSystemAction.h in Headers */,
+                               597C062C17DEFF50003E6E1A /* SDLSystemContext.h in Headers */,
+                               597C062E17DEFF50003E6E1A /* SDLTBTState.h in Headers */,
+                               597C063017DEFF50003E6E1A /* SDLTextAlignment.h in Headers */,
+                               597C063217DEFF50003E6E1A /* SDLTextField.h in Headers */,
+                               597C063417DEFF50003E6E1A /* SDLTextFieldName.h in Headers */,
+                               597C063617DEFF50003E6E1A /* SDLTireStatus.h in Headers */,
+                               597C063817DEFF50003E6E1A /* SDLTransportListener.h in Headers */,
+                               597C063917DEFF50003E6E1A /* SDLTriggerSource.h in Headers */,
+                               597C063B17DEFF50003E6E1A /* SDLTTSChunk.h in Headers */,
+                               597C063D17DEFF50003E6E1A /* SDLTTSChunkFactory.h in Headers */,
+                               597C063F17DEFF50003E6E1A /* SDLTurn.h in Headers */,
+                               597C064117DEFF50003E6E1A /* SDLUnregisterAppInterface.h in Headers */,
+                               597C064317DEFF50003E6E1A /* SDLUnregisterAppInterfaceResponse.h in Headers */,
+                               597C064517DEFF50003E6E1A /* SDLUnsubscribeButton.h in Headers */,
+                               597C064717DEFF50003E6E1A /* SDLUnsubscribeButtonResponse.h in Headers */,
+                               597C064917DEFF50003E6E1A /* SDLUnsubscribeVehicleData.h in Headers */,
+                               597C064B17DEFF50003E6E1A /* SDLUnsubscribeVehicleDataResponse.h in Headers */,
+                               597C064D17DEFF50003E6E1A /* SDLUpdateMode.h in Headers */,
+                               597C064F17DEFF50003E6E1A /* SDLUpdateTurnList.h in Headers */,
+                               597C065117DEFF50003E6E1A /* SDLUpdateTurnListResponse.h in Headers */,
+                               597C065317DEFF50003E6E1A /* SDLVehicleDataActiveStatus.h in Headers */,
+                               597C065517DEFF50003E6E1A /* SDLVehicleDataEventStatus.h in Headers */,
+                               597C065717DEFF50003E6E1A /* SDLVehicleDataNotificationStatus.h in Headers */,
+                               597C065917DEFF50003E6E1A /* SDLVehicleDataResult.h in Headers */,
+                               597C065B17DEFF50003E6E1A /* SDLVehicleDataResultCode.h in Headers */,
+                               597C065D17DEFF50003E6E1A /* SDLVehicleDataStatus.h in Headers */,
+                               597C065F17DEFF50003E6E1A /* SDLVehicleDataType.h in Headers */,
+                               597C066117DEFF50003E6E1A /* SDLVehicleType.h in Headers */,
+                               597C066317DEFF50003E6E1A /* SDLVrCapabilities.h in Headers */,
+                               597C066517DEFF50003E6E1A /* SDLVrHelpItem.h in Headers */,
+                               597C066717DEFF50003E6E1A /* SDLWarningLightStatus.h in Headers */,
+                               597C066917DEFF50003E6E1A /* SDLWiperStatus.h in Headers */,
+                               597C066B17DEFF51003E6E1A /* SDLProtocol.h in Headers */,
+                               5931469617E03CFD005C49C5 /* SDLBitConverter.h in Headers */,
+                               594910291840B22E0050AEE5 /* SmartDeviceLink.h in Headers */,
+                               597C058917DEFF50003E6E1A /* SDLNames.h in Headers */,
+                               FBAC28E1181FEAF4003210A2 /* SDLExternalLibrary.h in Headers */,
+                               597C054517DEFF50003E6E1A /* SDLEncodedSyncPData.h in Headers */,
+                               597C054717DEFF50003E6E1A /* SDLEncodedSyncPDataResponse.h in Headers */,
+                               597C061F17DEFF50003E6E1A /* SDLSyncPData.h in Headers */,
+                               597C062117DEFF50003E6E1A /* SDLSyncPDataResponse.h in Headers */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+               5913387A17DEFCB300CF214C /* SmartDeviceLink */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 5913388517DEFCB300CF214C /* Build configuration list for PBXNativeTarget "SmartDeviceLink" */;
+                       buildPhases = (
+                               5913387717DEFCB300CF214C /* Sources */,
+                               5913387817DEFCB300CF214C /* Frameworks */,
+                               5913387917DEFCB300CF214C /* Resources */,
+                               59B95E2417DEFE1A00B32744 /* Headers */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = SmartDeviceLink;
+                       productName = AppLink;
+                       productReference = 5913387B17DEFCB300CF214C /* SmartDeviceLink.framework */;
+                       productType = "com.apple.product-type.bundle";
+               };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+               5913384F17DEFC5E00CF214C /* Project object */ = {
+                       isa = PBXProject;
+                       attributes = {
+                               LastUpgradeCheck = 0500;
+                       };
+                       buildConfigurationList = 5913385217DEFC5E00CF214C /* Build configuration list for PBXProject "SmartDeviceLink" */;
+                       compatibilityVersion = "Xcode 3.2";
+                       developmentRegion = English;
+                       hasScannedForEncodings = 0;
+                       knownRegions = (
+                               en,
+                       );
+                       mainGroup = 5913384E17DEFC5E00CF214C;
+                       productRefGroup = 5913385817DEFC5E00CF214C /* Products */;
+                       projectDirPath = "";
+                       projectRoot = "";
+                       targets = (
+                               5913387A17DEFCB300CF214C /* SmartDeviceLink */,
+                       );
+               };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+               5913387917DEFCB300CF214C /* Resources */ = {
+                       isa = PBXResourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+               5913387717DEFCB300CF214C /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               597C04E317DEFF50003E6E1A /* SDLAbstractProtocol.m in Sources */,
+                               597C04E717DEFF50003E6E1A /* SDLAddCommand.m in Sources */,
+                               597C04E917DEFF50003E6E1A /* SDLAddCommandResponse.m in Sources */,
+                               597C04EB17DEFF50003E6E1A /* SDLAddSubMenu.m in Sources */,
+                               597C04ED17DEFF50003E6E1A /* SDLAddSubMenuResponse.m in Sources */,
+                               597C04EF17DEFF50003E6E1A /* SDLAlert.m in Sources */,
+                               597C04F117DEFF50003E6E1A /* SDLAlertManeuver.m in Sources */,
+                               597C04F317DEFF50003E6E1A /* SDLAlertManeuverResponse.m in Sources */,
+                               597C04F517DEFF50003E6E1A /* SDLAlertResponse.m in Sources */,
+                               597C04F717DEFF50003E6E1A /* SDLAppHMIType.m in Sources */,
+                               597C04F917DEFF50003E6E1A /* SDLAppInterfaceUnregisteredReason.m in Sources */,
+                               597C04FB17DEFF50003E6E1A /* SDLAudioPassThruCapabilities.m in Sources */,
+                               597C04FD17DEFF50003E6E1A /* SDLAudioStreamingState.m in Sources */,
+                               597C04FF17DEFF50003E6E1A /* SDLAudioType.m in Sources */,
+                               597C050117DEFF50003E6E1A /* SDLBeltStatus.m in Sources */,
+                               597C050317DEFF50003E6E1A /* SDLBinaryFrameHeader.m in Sources */,
+                               597C050517DEFF50003E6E1A /* SDLBitConverter.m in Sources */,
+                               597C050717DEFF50003E6E1A /* SDLBitsPerSample.m in Sources */,
+                               597C050917DEFF50003E6E1A /* SDLBodyInformation.m in Sources */,
+                               597C050B17DEFF50003E6E1A /* SDLButtonCapabilities.m in Sources */,
+                               597C050D17DEFF50003E6E1A /* SDLButtonEventMode.m in Sources */,
+                               597C050F17DEFF50003E6E1A /* SDLButtonName.m in Sources */,
+                               597C051117DEFF50003E6E1A /* SDLButtonPressMode.m in Sources */,
+                               597C051317DEFF50003E6E1A /* SDLChangeRegistration.m in Sources */,
+                               597C051517DEFF50003E6E1A /* SDLChangeRegistrationResponse.m in Sources */,
+                               597C051717DEFF50003E6E1A /* SDLCharacterSet.m in Sources */,
+                               597C051917DEFF50003E6E1A /* SDLChoice.m in Sources */,
+                               597C051B17DEFF50003E6E1A /* SDLCompassDirection.m in Sources */,
+                               597C051D17DEFF50003E6E1A /* SDLComponentVolumeStatus.m in Sources */,
+                               597C051F17DEFF50003E6E1A /* SDLConsoleController.m in Sources */,
+                               597C052117DEFF50003E6E1A /* SDLCreateInteractionChoiceSet.m in Sources */,
+                               597C052317DEFF50003E6E1A /* SDLCreateInteractionChoiceSetResponse.m in Sources */,
+                               597C052517DEFF50003E6E1A /* SDLDebugTool.m in Sources */,
+                               597C052817DEFF50003E6E1A /* SDLDeleteCommand.m in Sources */,
+                               597C052A17DEFF50003E6E1A /* SDLDeleteCommandResponse.m in Sources */,
+                               597C052C17DEFF50003E6E1A /* SDLDeleteFile.m in Sources */,
+                               597C052E17DEFF50003E6E1A /* SDLDeleteFileResponse.m in Sources */,
+                               5986A386183FD62A0003BAC6 /* SDLAbstractTransport.m in Sources */,
+                               597C053017DEFF50003E6E1A /* SDLDeleteInteractionChoiceSet.m in Sources */,
+                               597C053217DEFF50003E6E1A /* SDLDeleteInteractionChoiceSetResponse.m in Sources */,
+                               597C053417DEFF50003E6E1A /* SDLDeleteSubMenu.m in Sources */,
+                               597C053617DEFF50003E6E1A /* SDLDeleteSubMenuResponse.m in Sources */,
+                               597C053817DEFF50003E6E1A /* SDLDeviceLevelStatus.m in Sources */,
+                               597C053A17DEFF50003E6E1A /* SDLDeviceStatus.m in Sources */,
+                               597C053C17DEFF50003E6E1A /* SDLDIDResult.m in Sources */,
+                               597C053E17DEFF50003E6E1A /* SDLDimension.m in Sources */,
+                               597C054017DEFF50003E6E1A /* SDLDisplayCapabilities.m in Sources */,
+                               597C054217DEFF50003E6E1A /* SDLDisplayType.m in Sources */,
+                               597C054417DEFF50003E6E1A /* SDLDriverDistractionState.m in Sources */,
+                               597C054617DEFF50003E6E1A /* SDLEncodedSyncPData.m in Sources */,
+                               597C054817DEFF50003E6E1A /* SDLEncodedSyncPDataResponse.m in Sources */,
+                               597C054B17DEFF50003E6E1A /* SDLEndAudioPassThru.m in Sources */,
+                               597C054D17DEFF50003E6E1A /* SDLEndAudioPassThruResponse.m in Sources */,
+                               597C054F17DEFF50003E6E1A /* SDLEngineInfo.m in Sources */,
+                               597C055117DEFF50003E6E1A /* SDLEnum.m in Sources */,
+                               597C055317DEFF50003E6E1A /* SDLFileType.m in Sources */,
+                               597C055517DEFF50003E6E1A /* SDLFunctionID.m in Sources */,
+                               597C055717DEFF50003E6E1A /* SDLGenericResponse.m in Sources */,
+                               597C055917DEFF50003E6E1A /* SDLGetDTCs.m in Sources */,
+                               597C055B17DEFF50003E6E1A /* SDLGetDTCsResponse.m in Sources */,
+                               597C055D17DEFF50003E6E1A /* SDLGetVehicleData.m in Sources */,
+                               597C055F17DEFF50003E6E1A /* SDLGetVehicleDataResponse.m in Sources */,
+                               597C056117DEFF50003E6E1A /* SDLGlobalProperty.m in Sources */,
+                               597C056317DEFF50003E6E1A /* SDLGPSData.m in Sources */,
+                               597C056517DEFF50003E6E1A /* SDLHeadLampStatus.m in Sources */,
+                               597C056717DEFF50003E6E1A /* SDLHMILevel.m in Sources */,
+                               597C056917DEFF50003E6E1A /* SDLHMIPermissions.m in Sources */,
+                               597C056B17DEFF50003E6E1A /* SDLHMIZoneCapabilities.m in Sources */,
+                               597C056D17DEFF50003E6E1A /* SDLIgnitionStableStatus.m in Sources */,
+                               597C056F17DEFF50003E6E1A /* SDLIgnitionStatus.m in Sources */,
+                               597C057117DEFF50003E6E1A /* SDLImage.m in Sources */,
+                               597C057317DEFF50003E6E1A /* SDLImageType.m in Sources */,
+                               597C057517DEFF50003E6E1A /* SDLInteractionMode.m in Sources */,
+                               597C057817DEFF50003E6E1A /* SDLJingle.m in Sources */,
+                               597C057A17DEFF50003E6E1A /* SDLJsonDecoder.m in Sources */,
+                               597C057C17DEFF50003E6E1A /* SDLJsonEncoder.m in Sources */,
+                               597C057E17DEFF50003E6E1A /* SDLLanguage.m in Sources */,
+                               597C058017DEFF50003E6E1A /* SDLListFiles.m in Sources */,
+                               597C058217DEFF50003E6E1A /* SDLListFilesResponse.m in Sources */,
+                               597C058417DEFF50003E6E1A /* SDLMaintenanceModeStatus.m in Sources */,
+                               597C058617DEFF50003E6E1A /* SDLMediaClockFormat.m in Sources */,
+                               597C058817DEFF50003E6E1A /* SDLMenuParams.m in Sources */,
+                               597C058B17DEFF50003E6E1A /* SDLOnAppInterfaceUnregistered.m in Sources */,
+                               597C058D17DEFF50003E6E1A /* SDLOnAudioPassThru.m in Sources */,
+                               597C058F17DEFF50003E6E1A /* SDLOnButtonEvent.m in Sources */,
+                               597C059117DEFF50003E6E1A /* SDLOnButtonPress.m in Sources */,
+                               597C059317DEFF50003E6E1A /* SDLOnCommand.m in Sources */,
+                               597C059517DEFF50003E6E1A /* SDLOnDriverDistraction.m in Sources */,
+                               597C059717DEFF50003E6E1A /* SDLOnEncodedSyncPData.m in Sources */,
+                               597C059917DEFF50003E6E1A /* SDLOnHMIStatus.m in Sources */,
+                               597C059B17DEFF50003E6E1A /* SDLOnLanguageChange.m in Sources */,
+                               597C059D17DEFF50003E6E1A /* SDLOnPermissionsChange.m in Sources */,
+                               597C059F17DEFF50003E6E1A /* SDLOnSyncPData.m in Sources */,
+                               597C05A117DEFF50003E6E1A /* SDLOnTBTClientState.m in Sources */,
+                               597C05A317DEFF50003E6E1A /* SDLOnVehicleData.m in Sources */,
+                               597C05A517DEFF50003E6E1A /* SDLParameterPermissions.m in Sources */,
+                               597C05A717DEFF50003E6E1A /* SDLPerformAudioPassThru.m in Sources */,
+                               597C05A917DEFF50003E6E1A /* SDLPerformAudioPassThruResponse.m in Sources */,
+                               597C05AB17DEFF50003E6E1A /* SDLPerformInteraction.m in Sources */,
+                               597C05AD17DEFF50003E6E1A /* SDLPerformInteractionResponse.m in Sources */,
+                               597C05AF17DEFF50003E6E1A /* SDLPermissionItem.m in Sources */,
+                               597C05B117DEFF50003E6E1A /* SDLPermissionStatus.m in Sources */,
+                               597C05B317DEFF50003E6E1A /* SDLPresetBankCapabilities.m in Sources */,
+                               597C05B517DEFF50003E6E1A /* SDLPrimaryAudioSource.m in Sources */,
+                               597C05B717DEFF50003E6E1A /* SDLPRNDL.m in Sources */,
+                               597C05BA17DEFF50003E6E1A /* SDLProtocolFrameHeader.m in Sources */,
+                               597C05BC17DEFF50003E6E1A /* SDLProtocolFrameHeaderFactory.m in Sources */,
+                               597C05BF17DEFF50003E6E1A /* SDLProtocolMessage.m in Sources */,
+                               597C05C217DEFF50003E6E1A /* SDLPutFile.m in Sources */,
+                               597C05C417DEFF50003E6E1A /* SDLPutFileResponse.m in Sources */,
+                               597C05C617DEFF50003E6E1A /* SDLReadDID.m in Sources */,
+                               597C05C817DEFF50003E6E1A /* SDLReadDIDResponse.m in Sources */,
+                               597C05CA17DEFF50003E6E1A /* SDLRegisterAppInterface.m in Sources */,
+                               597C05CC17DEFF50003E6E1A /* SDLRegisterAppInterfaceResponse.m in Sources */,
+                               597C05CE17DEFF50003E6E1A /* SDLResetGlobalProperties.m in Sources */,
+                               597C05D017DEFF50003E6E1A /* SDLResetGlobalPropertiesResponse.m in Sources */,
+                               597C05D217DEFF50003E6E1A /* SDLResult.m in Sources */,
+                               597C05D417DEFF50003E6E1A /* SDLRPCMessage.m in Sources */,
+                               597C05D617DEFF50003E6E1A /* SDLRPCMessageType.m in Sources */,
+                               597C05D817DEFF50003E6E1A /* SDLRPCNotification.m in Sources */,
+                               597C05DA17DEFF50003E6E1A /* SDLRPCRequest.m in Sources */,
+                               597C05DC17DEFF50003E6E1A /* SDLRPCRequestFactory.m in Sources */,
+                               597C05DE17DEFF50003E6E1A /* SDLRPCResponse.m in Sources */,
+                               597C05E017DEFF50003E6E1A /* SDLSamplingRate.m in Sources */,
+                               597C05E217DEFF50003E6E1A /* SDLScrollableMessage.m in Sources */,
+                               597C05E417DEFF50003E6E1A /* SDLScrollableMessageResponse.m in Sources */,
+                               597C05E617DEFF50003E6E1A /* SDLSetAppIcon.m in Sources */,
+                               597C05E817DEFF50003E6E1A /* SDLSetAppIconResponse.m in Sources */,
+                               597C05EA17DEFF50003E6E1A /* SDLSetDisplayLayout.m in Sources */,
+                               597C05EC17DEFF50003E6E1A /* SDLSetDisplayLayoutResponse.m in Sources */,
+                               597C05EE17DEFF50003E6E1A /* SDLSetGlobalProperties.m in Sources */,
+                               597C05F017DEFF50003E6E1A /* SDLSetGlobalPropertiesResponse.m in Sources */,
+                               597C05F217DEFF50003E6E1A /* SDLSetMediaClockTimer.m in Sources */,
+                               597C05F417DEFF50003E6E1A /* SDLSetMediaClockTimerResponse.m in Sources */,
+                               597C05F617DEFF50003E6E1A /* SDLShow.m in Sources */,
+                               597C05F817DEFF50003E6E1A /* SDLShowConstantTBT.m in Sources */,
+                               597C05FA17DEFF50003E6E1A /* SDLShowConstantTBTResponse.m in Sources */,
+                               597C05FC17DEFF50003E6E1A /* SDLShowResponse.m in Sources */,
+                               597C05FE17DEFF50003E6E1A /* SDLSingleTireStatus.m in Sources */,
+                               597C060017DEFF50003E6E1A /* SDLSiphonServer.m in Sources */,
+                               597C060217DEFF50003E6E1A /* SDLSlider.m in Sources */,
+                               597C060417DEFF50003E6E1A /* SDLSliderResponse.m in Sources */,
+                               597C060617DEFF50003E6E1A /* SDLSoftButton.m in Sources */,
+                               597C060817DEFF50003E6E1A /* SDLSoftButtonCapabilities.m in Sources */,
+                               597C060A17DEFF50003E6E1A /* SDLSoftButtonType.m in Sources */,
+                               597C060C17DEFF50003E6E1A /* SDLSpeak.m in Sources */,
+                               597C060E17DEFF50003E6E1A /* SDLSpeakResponse.m in Sources */,
+                               597C061017DEFF50003E6E1A /* SDLSpeechCapabilities.m in Sources */,
+                               597C061217DEFF50003E6E1A /* SDLStartTime.m in Sources */,
+                               597C061417DEFF50003E6E1A /* SDLSubscribeButton.m in Sources */,
+                               597C061617DEFF50003E6E1A /* SDLSubscribeButtonResponse.m in Sources */,
+                               597C061817DEFF50003E6E1A /* SDLSubscribeVehicleData.m in Sources */,
+                               597C061A17DEFF50003E6E1A /* SDLSubscribeVehicleDataResponse.m in Sources */,
+                               597C061C17DEFF50003E6E1A /* SDLIAPTransport.m in Sources */,
+                               597C061E17DEFF50003E6E1A /* SDLSyncMsgVersion.m in Sources */,
+                               597C062017DEFF50003E6E1A /* SDLSyncPData.m in Sources */,
+                               597C062217DEFF50003E6E1A /* SDLSyncPDataResponse.m in Sources */,
+                               597C062417DEFF50003E6E1A /* SDLProxy.m in Sources */,
+                               597C062617DEFF50003E6E1A /* SDLProxyFactory.m in Sources */,
+                               597C062817DEFF50003E6E1A /* SDLTCPTransport.m in Sources */,
+                               597C062B17DEFF50003E6E1A /* SDLSystemAction.m in Sources */,
+                               597C062D17DEFF50003E6E1A /* SDLSystemContext.m in Sources */,
+                               597C062F17DEFF50003E6E1A /* SDLTBTState.m in Sources */,
+                               597C063117DEFF50003E6E1A /* SDLTextAlignment.m in Sources */,
+                               597C063317DEFF50003E6E1A /* SDLTextField.m in Sources */,
+                               597C063517DEFF50003E6E1A /* SDLTextFieldName.m in Sources */,
+                               597C063717DEFF50003E6E1A /* SDLTireStatus.m in Sources */,
+                               597C063A17DEFF50003E6E1A /* SDLTriggerSource.m in Sources */,
+                               597C063C17DEFF50003E6E1A /* SDLTTSChunk.m in Sources */,
+                               597C063E17DEFF50003E6E1A /* SDLTTSChunkFactory.m in Sources */,
+                               597C064017DEFF50003E6E1A /* SDLTurn.m in Sources */,
+                               597C064217DEFF50003E6E1A /* SDLUnregisterAppInterface.m in Sources */,
+                               597C064417DEFF50003E6E1A /* SDLUnregisterAppInterfaceResponse.m in Sources */,
+                               597C064617DEFF50003E6E1A /* SDLUnsubscribeButton.m in Sources */,
+                               597C064817DEFF50003E6E1A /* SDLUnsubscribeButtonResponse.m in Sources */,
+                               597C064A17DEFF50003E6E1A /* SDLUnsubscribeVehicleData.m in Sources */,
+                               597C064C17DEFF50003E6E1A /* SDLUnsubscribeVehicleDataResponse.m in Sources */,
+                               597C064E17DEFF50003E6E1A /* SDLUpdateMode.m in Sources */,
+                               597C065017DEFF50003E6E1A /* SDLUpdateTurnList.m in Sources */,
+                               597C065217DEFF50003E6E1A /* SDLUpdateTurnListResponse.m in Sources */,
+                               597C065417DEFF50003E6E1A /* SDLVehicleDataActiveStatus.m in Sources */,
+                               597C065617DEFF50003E6E1A /* SDLVehicleDataEventStatus.m in Sources */,
+                               597C065817DEFF50003E6E1A /* SDLVehicleDataNotificationStatus.m in Sources */,
+                               597C065A17DEFF50003E6E1A /* SDLVehicleDataResult.m in Sources */,
+                               597C065C17DEFF50003E6E1A /* SDLVehicleDataResultCode.m in Sources */,
+                               597C065E17DEFF50003E6E1A /* SDLVehicleDataStatus.m in Sources */,
+                               597C066017DEFF50003E6E1A /* SDLVehicleDataType.m in Sources */,
+                               597C066217DEFF50003E6E1A /* SDLVehicleType.m in Sources */,
+                               597C066417DEFF50003E6E1A /* SDLVrCapabilities.m in Sources */,
+                               597C066617DEFF50003E6E1A /* SDLVrHelpItem.m in Sources */,
+                               597C066817DEFF50003E6E1A /* SDLWarningLightStatus.m in Sources */,
+                               597C066A17DEFF50003E6E1A /* SDLWiperStatus.m in Sources */,
+                               597C066C17DEFF51003E6E1A /* SDLProtocol.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+               5913386317DEFC5E00CF214C /* InfoPlist.strings */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               5913386417DEFC5E00CF214C /* en */,
+                       );
+                       name = InfoPlist.strings;
+                       sourceTree = "<group>";
+               };
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+               5913387217DEFC5E00CF214C /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_EMPTY_BODY = YES;
+                               CLANG_WARN_ENUM_CONVERSION = YES;
+                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+                               COPY_PHASE_STRIP = NO;
+                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "DEBUG=1",
+                                       "$(inherited)",
+                               );
+                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES;
+                               GCC_WARN_UNUSED_VARIABLE = YES;
+                               IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+                               ONLY_ACTIVE_ARCH = YES;
+                               SDKROOT = iphoneos;
+                       };
+                       name = Debug;
+               };
+               5913387317DEFC5E00CF214C /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_EMPTY_BODY = YES;
+                               CLANG_WARN_ENUM_CONVERSION = YES;
+                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+                               COPY_PHASE_STRIP = YES;
+                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES;
+                               GCC_WARN_UNUSED_VARIABLE = YES;
+                               IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+                               OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
+                               SDKROOT = iphoneos;
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;
+               };
+               5913388617DEFCB300CF214C /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               COMBINE_HIDPI_IMAGES = YES;
+                               DEAD_CODE_STRIPPING = NO;
+                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+                               GCC_PRECOMPILE_PREFIX_HEADER = NO;
+                               GCC_PREFIX_HEADER = "";
+                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+                               INFOPLIST_FILE = "SmartDeviceLink/SmartDeviceLink-Info.plist";
+                               INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
+                               LINK_WITH_STANDARD_LIBRARIES = NO;
+                               MACH_O_TYPE = mh_object;
+                               MACOSX_DEPLOYMENT_TARGET = 10.8;
+                               ONLY_ACTIVE_ARCH = NO;
+                               OTHER_LDFLAGS = "-ObjC";
+                               PRODUCT_NAME = SmartDeviceLink;
+                               SDKROOT = iphoneos;
+                               VALID_ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                               WRAPPER_EXTENSION = framework;
+                       };
+                       name = Debug;
+               };
+               5913388717DEFCB300CF214C /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               COMBINE_HIDPI_IMAGES = YES;
+                               DEAD_CODE_STRIPPING = NO;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+                               GCC_PRECOMPILE_PREFIX_HEADER = NO;
+                               GCC_PREFIX_HEADER = "";
+                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+                               INFOPLIST_FILE = "SmartDeviceLink/SmartDeviceLink-Info.plist";
+                               INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
+                               LINK_WITH_STANDARD_LIBRARIES = NO;
+                               MACH_O_TYPE = mh_object;
+                               MACOSX_DEPLOYMENT_TARGET = 10.8;
+                               ONLY_ACTIVE_ARCH = NO;
+                               OTHER_LDFLAGS = "-ObjC";
+                               PRODUCT_NAME = SmartDeviceLink;
+                               SDKROOT = iphoneos;
+                               VALID_ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                               WRAPPER_EXTENSION = framework;
+                       };
+                       name = Release;
+               };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+               5913385217DEFC5E00CF214C /* Build configuration list for PBXProject "SmartDeviceLink" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               5913387217DEFC5E00CF214C /* Debug */,
+                               5913387317DEFC5E00CF214C /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               5913388517DEFCB300CF214C /* Build configuration list for PBXNativeTarget "SmartDeviceLink" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               5913388617DEFCB300CF214C /* Debug */,
+                               5913388717DEFCB300CF214C /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+/* End XCConfigurationList section */
+       };
+       rootObject = 5913384F17DEFC5E00CF214C /* Project object */;
+}

diff --git a/SDL_iOS/SmartDeviceLinkProxy/SmartDeviceLinkProxy.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SDL_iOS/SmartDeviceLink/SmartDeviceLink.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 66%
rename from SDL_iOS/SmartDeviceLinkProxy/SmartDeviceLinkProxy.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 3688588..627bd8d 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/SmartDeviceLinkProxy.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:SmartDeviceLinkProxy.xcodeproj">
+      location = "self:SmartDeviceLink.xcodeproj">
    </FileRef>
 </Workspace>

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLAbstractProtocol.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAbstractProtocol.h
similarity index 50%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLAbstractProtocol.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAbstractProtocol.h
index 28e0a0c..809cc94 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLAbstractProtocol.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAbstractProtocol.h
@@ -1,10 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAbstractProtocol.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLITransport.h"
-#import "SDLIProtocol.h"
+#import <SmartDeviceLink/SDLIProtocol.h>
+
+#import <SmartDeviceLink/SDLITransport.h>
 
 @interface SDLAbstractProtocol : NSObject<SDLIProtocol> {
        NSObject<SDLITransport>* transport;

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLAbstractProtocol.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAbstractProtocol.m
similarity index 87%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLAbstractProtocol.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAbstractProtocol.m
index 1bd8d3d..3715bfa 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLAbstractProtocol.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAbstractProtocol.m
@@ -1,9 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAbstractProtocol.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLAbstractProtocol.h"
-#import "SDLDebugTool.h"
+#import <SmartDeviceLink/SDLAbstractProtocol.h>
 
 @implementation SDLAbstractProtocol
 
@@ -15,8 +14,8 @@
        [self doesNotRecognizeSelector:_cmd];
 }
 
--(void) sendData:(NSData*) data sessionType:(SDLSessionType)sessionType sessionID:(Byte)sessionID {
-       [self doesNotRecognizeSelector:_cmd];
+-(void) sendData:(SDLProtocolMessage*) protocolMsg {
+    [self doesNotRecognizeSelector:_cmd];
 }
 
 -(void) handleBytesFromTransport:(Byte *)receivedBytes length:(long)receivedBytesLength {

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLAbstractTransport.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAbstractTransport.h
similarity index 86%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLAbstractTransport.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAbstractTransport.h
index 83f10de..db42de0 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLAbstractTransport.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAbstractTransport.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAbstractTransport.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLITransport.h"
+#import <SmartDeviceLink/SDLITransport.h>
 
 @interface SDLAbstractTransport : NSObject <SDLITransport> {
        NSString* guid;

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLAbstractTransport.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAbstractTransport.m
similarity index 94%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLAbstractTransport.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAbstractTransport.m
index 482ae65..0cfbe1e 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLAbstractTransport.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAbstractTransport.m
@@ -1,10 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAbstractTransport.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLAbstractTransport.h"
-#import "SDLTransportListener.h"
-#import "SDLDebugTool.h"
+#import <SmartDeviceLink/SDLAbstractTransport.h>
+
+#import <SmartDeviceLink/SDLTransportListener.h>
 
 @interface SDLAbstractTransport ()
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddCommand.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddCommand.h
similarity index 53%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddCommand.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddCommand.h
index a3a8237..ff7add7 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddCommand.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddCommand.h
@@ -1,11 +1,12 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAddCommand.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
-#import "SDLMenuParams.h"
+#import <SmartDeviceLink/SDLImage.h>
+#import <SmartDeviceLink/SDLMenuParams.h>
 
 @interface SDLAddCommand : SDLRPCRequest {}
 
@@ -15,5 +16,6 @@
 @property(assign) NSNumber* cmdID;
 @property(assign) SDLMenuParams* menuParams;
 @property(assign) NSMutableArray* vrCommands;
+@property(assign) SDLImage* cmdIcon;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddCommand.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddCommand.m
similarity index 68%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddCommand.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddCommand.m
index 41c4d73..80c5ef4 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddCommand.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddCommand.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAddCommand.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLAddCommand.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLAddCommand.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLAddCommand
 
@@ -58,4 +59,21 @@
     return [parameters objectForKey:NAMES_vrCommands];
 }
 
+-(void) setCmdIcon:(SDLImage *) cmdIcon {
+    if (cmdIcon != nil) {
+        [parameters setObject:cmdIcon forKey:NAMES_cmdIcon];
+    } else {
+        [parameters removeObjectForKey:NAMES_cmdIcon];
+    }
+}
+
+-(SDLImage*) cmdIcon {
+    NSObject* obj = [parameters objectForKey:NAMES_cmdIcon];
+    if ([obj isKindOfClass:SDLImage.class]) {
+        return (SDLImage*)obj;
+    } else {
+        return [[[SDLImage alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddCommandResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddCommandResponse.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddCommandResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddCommandResponse.h
index 8c8247f..53364e9 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddCommandResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddCommandResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAddCommandResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLAddCommandResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddCommandResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddCommandResponse.m
similarity index 59%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddCommandResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddCommandResponse.m
index 7b22565..bf5e3c4 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddCommandResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddCommandResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAddCommandResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLAddCommandResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLAddCommandResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLAddCommandResponse
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddSubMenu.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddSubMenu.h
similarity index 68%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddSubMenu.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddSubMenu.h
index 4f2df07..4860aba 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddSubMenu.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddSubMenu.h
@@ -1,10 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAddSubMenu.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
-
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
 @interface SDLAddSubMenu : SDLRPCRequest {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddSubMenu.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddSubMenu.m
similarity index 87%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddSubMenu.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddSubMenu.m
index 9189032..aa4a434 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddSubMenu.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddSubMenu.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAddSubMenu.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLAddSubMenu.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLAddSubMenu.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLAddSubMenu
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddSubMenuResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddSubMenuResponse.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddSubMenuResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddSubMenuResponse.h
index d86d19f..25c77f5 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddSubMenuResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddSubMenuResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAddSubMenuResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLAddSubMenuResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddSubMenuResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddSubMenuResponse.m
similarity index 59%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddSubMenuResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddSubMenuResponse.m
index ac10e73..47de27e 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAddSubMenuResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAddSubMenuResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAddSubMenuResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLAddSubMenuResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLAddSubMenuResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLAddSubMenuResponse
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAlert.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlert.h
similarity index 62%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAlert.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlert.h
index 3c2313b..b1e7871 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAlert.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlert.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAlert.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
-
-#import "SDLTTSChunk.h"
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
 @interface SDLAlert : SDLRPCRequest {}
 
@@ -14,8 +12,10 @@
 
 @property(assign) NSString* alertText1;
 @property(assign) NSString* alertText2;
+@property(assign) NSString* alertText3;
 @property(assign) NSMutableArray* ttsChunks;
 @property(assign) NSNumber* duration;
 @property(assign) NSNumber* playTone;
+@property(assign) NSMutableArray* softButtons;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAlert.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlert.m
similarity index 62%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAlert.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlert.m
index 13a8a40..d940bbb 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAlert.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlert.m
@@ -1,9 +1,12 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAlert.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLAlert.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLAlert.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+#import <SmartDeviceLink/SDLSoftButton.h>
+#import <SmartDeviceLink/SDLTTSChunk.h>
 
 @implementation SDLAlert
 
@@ -41,6 +44,18 @@
     return [parameters objectForKey:NAMES_alertText2];
 }
 
+-(void) setAlertText3:(NSString*) alertText3 {
+    if (alertText3 != nil) {
+        [parameters setObject:alertText3 forKey:NAMES_alertText3];
+    } else {
+        [parameters removeObjectForKey:NAMES_alertText3];
+    }
+}
+
+-(NSString*) alertText3 {
+    return [parameters objectForKey:NAMES_alertText3];
+}
+
 -(void) setTtsChunks:(NSMutableArray*) ttsChunks {
     if (ttsChunks != nil) {
         [parameters setObject:ttsChunks forKey:NAMES_ttsChunks];
@@ -86,4 +101,25 @@
     return [parameters objectForKey:NAMES_playTone];
 }
 
+-(void) setSoftButtons:(NSMutableArray *) softButtons {
+    if (softButtons != nil) {
+        [parameters setObject:softButtons forKey:NAMES_softButtons];
+    } else {
+        [parameters removeObjectForKey:NAMES_softButtons];
+    }
+}
+
+-(NSMutableArray*) softButtons {
+    NSMutableArray* array = [parameters objectForKey:NAMES_softButtons];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertManeuver.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertManeuver.h
new file mode 100644 (file)
index 0000000..cf95a5d
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertManeuver.h
@@ -0,0 +1,16 @@
+//  SDLAlertManeuver.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+@interface SDLAlertManeuver : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSMutableArray* ttsChunks;
+@property(assign) NSMutableArray* softButtons;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertManeuver.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertManeuver.m
new file mode 100644 (file)
index 0000000..b7a6cc6
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertManeuver.m
@@ -0,0 +1,65 @@
+//  SDLAlertManeuver.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLAlertManeuver.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+#import <SmartDeviceLink/SDLSoftButton.h>
+#import <SmartDeviceLink/SDLTTSChunk.h>
+
+@implementation SDLAlertManeuver
+
+-(id) init {
+    if (self = [super initWithName:NAMES_AlertManeuver]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setTtsChunks:(NSMutableArray *) ttsChunks {
+    if (ttsChunks != nil) {
+        [parameters setObject:ttsChunks forKey:NAMES_ttsChunks];
+    } else {
+        [parameters removeObjectForKey:NAMES_ttsChunks];
+    }
+}
+
+-(NSMutableArray*) ttsChunks {
+    NSMutableArray* array = [parameters objectForKey:NAMES_ttsChunks];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
+-(void) setSoftButtons:(NSMutableArray *) softButtons {
+    if (softButtons != nil) {
+        [parameters setObject:softButtons forKey:NAMES_softButtons];
+    } else {
+        [parameters removeObjectForKey:NAMES_softButtons];
+    }
+}
+
+-(NSMutableArray*) softButtons {
+    NSMutableArray* array = [parameters objectForKey:NAMES_softButtons];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertManeuverResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertManeuverResponse.h
new file mode 100644 (file)
index 0000000..ccfdbb3
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertManeuverResponse.h
@@ -0,0 +1,13 @@
+//  SDLAlertManeuverResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLAlertManeuverResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertManeuverResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertManeuverResponse.m
new file mode 100644 (file)
index 0000000..1341c25
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertManeuverResponse.m
@@ -0,0 +1,21 @@
+//  SDLAlertManeuverResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLAlertManeuverResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLAlertManeuverResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_AlertManeuver]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAlertResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertResponse.h
similarity index 55%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAlertResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertResponse.h
index 3cd96fb..4075e12 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAlertResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAlertResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLAlertResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAlertResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertResponse.m
similarity index 60%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAlertResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertResponse.m
index 86c2b5f..b1913a0 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAlertResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAlertResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAlertResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLAlertResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLAlertResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLAlertResponse
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAppHMIType.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAppHMIType.h
new file mode 100644 (file)
index 0000000..6da5150
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAppHMIType.h
@@ -0,0 +1,24 @@
+//  SDLAppHMIType.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLAppHMIType : SDLEnum {}
+
++(SDLAppHMIType*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLAppHMIType*) DEFAULT;
++(SDLAppHMIType*) COMMUNICATION;
++(SDLAppHMIType*) MEDIA;
++(SDLAppHMIType*) MESSAGING;
++(SDLAppHMIType*) NAVIGATION;
++(SDLAppHMIType*) INFORMATION;
++(SDLAppHMIType*) SOCIAL;
++(SDLAppHMIType*) BACKGROUND_PROCESS;
++(SDLAppHMIType*) TESTING;
++(SDLAppHMIType*) SYSTEM;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAppHMIType.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAppHMIType.m
new file mode 100644 (file)
index 0000000..12e0342
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAppHMIType.m
@@ -0,0 +1,120 @@
+//  SDLAppHMIType.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLAppHMIType.h>
+
+SDLAppHMIType* SDLAppHMIType_DEFAULT = nil;
+SDLAppHMIType* SDLAppHMIType_COMMUNICATION = nil;
+SDLAppHMIType* SDLAppHMIType_MEDIA = nil;
+SDLAppHMIType* SDLAppHMIType_MESSAGING = nil;
+SDLAppHMIType* SDLAppHMIType_NAVIGATION = nil;
+SDLAppHMIType* SDLAppHMIType_INFORMATION = nil;
+SDLAppHMIType* SDLAppHMIType_SOCIAL = nil;
+SDLAppHMIType* SDLAppHMIType_BACKGROUND_PROCESS = nil;
+SDLAppHMIType* SDLAppHMIType_TESTING = nil;
+SDLAppHMIType* SDLAppHMIType_SYSTEM = nil;
+
+NSMutableArray* SDLAppHMIType_values = nil;
+@implementation SDLAppHMIType
+
++(SDLAppHMIType*) valueOf:(NSString*) value {
+    for (SDLAppHMIType* item in SDLAppHMIType.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLAppHMIType_values == nil) {
+        SDLAppHMIType_values = [[NSMutableArray alloc] initWithObjects:
+                SDLAppHMIType_DEFAULT,
+                SDLAppHMIType_COMMUNICATION,
+                SDLAppHMIType_MEDIA,
+                SDLAppHMIType_MESSAGING,
+                SDLAppHMIType_NAVIGATION,
+                SDLAppHMIType_INFORMATION,
+                SDLAppHMIType_SOCIAL,
+                SDLAppHMIType_BACKGROUND_PROCESS,
+                SDLAppHMIType_TESTING,
+                SDLAppHMIType_SYSTEM,
+                nil];
+    }
+    return SDLAppHMIType_values;
+}
+
++(SDLAppHMIType*) DEFAULT {
+    if (SDLAppHMIType_DEFAULT == nil) {
+        SDLAppHMIType_DEFAULT = [[SDLAppHMIType alloc] initWithValue:@"DEFAULT"];
+    }
+    return SDLAppHMIType_DEFAULT;
+}
+
++(SDLAppHMIType*) COMMUNICATION {
+    if (SDLAppHMIType_COMMUNICATION == nil) {
+        SDLAppHMIType_COMMUNICATION = [[SDLAppHMIType alloc] initWithValue:@"COMMUNICATION"];
+    }
+    return SDLAppHMIType_COMMUNICATION;
+}
+
++(SDLAppHMIType*) MEDIA {
+    if (SDLAppHMIType_MEDIA == nil) {
+        SDLAppHMIType_MEDIA = [[SDLAppHMIType alloc] initWithValue:@"MEDIA"];
+    }
+    return SDLAppHMIType_MEDIA;
+}
+
++(SDLAppHMIType*) MESSAGING {
+    if (SDLAppHMIType_MESSAGING == nil) {
+        SDLAppHMIType_MESSAGING = [[SDLAppHMIType alloc] initWithValue:@"MESSAGING"];
+    }
+    return SDLAppHMIType_MESSAGING;
+}
+
++(SDLAppHMIType*) NAVIGATION {
+    if (SDLAppHMIType_NAVIGATION == nil) {
+        SDLAppHMIType_NAVIGATION = [[SDLAppHMIType alloc] initWithValue:@"NAVIGATION"];
+    }
+    return SDLAppHMIType_NAVIGATION;
+}
+
+
++(SDLAppHMIType*) INFORMATION {
+    if (SDLAppHMIType_INFORMATION == nil) {
+        SDLAppHMIType_INFORMATION = [[SDLAppHMIType alloc] initWithValue:@"INFORMATION"];
+    }
+    return SDLAppHMIType_INFORMATION;
+}
+
++(SDLAppHMIType*) SOCIAL {
+    if (SDLAppHMIType_SOCIAL == nil) {
+        SDLAppHMIType_SOCIAL = [[SDLAppHMIType alloc] initWithValue:@"SOCIAL"];
+    }
+    return SDLAppHMIType_SOCIAL;
+}
+
++(SDLAppHMIType*) BACKGROUND_PROCESS {
+    if (SDLAppHMIType_BACKGROUND_PROCESS == nil) {
+        SDLAppHMIType_BACKGROUND_PROCESS = [[SDLAppHMIType alloc] initWithValue:@"BACKGROUND_PROCESS"];
+    }
+    return SDLAppHMIType_BACKGROUND_PROCESS;
+}
+
++(SDLAppHMIType*) TESTING {
+    if (SDLAppHMIType_TESTING == nil) {
+        SDLAppHMIType_TESTING = [[SDLAppHMIType alloc] initWithValue:@"TESTING"];
+    }
+    return SDLAppHMIType_TESTING;
+}
+
+
++(SDLAppHMIType*) SYSTEM {
+    if (SDLAppHMIType_SYSTEM == nil) {
+        SDLAppHMIType_SYSTEM = [[SDLAppHMIType alloc] initWithValue:@"SYSTEM"];
+    }
+    return SDLAppHMIType_SYSTEM;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAppInterfaceUnregisteredReason.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h
similarity index 78%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAppInterfaceUnregisteredReason.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h
index 851188d..dc2a84e 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAppInterfaceUnregisteredReason.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAppInterfaceUnregisteredReason.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLAppInterfaceUnregisteredReason : SDLEnum {}
 
@@ -17,8 +17,8 @@
 +(SDLAppInterfaceUnregisteredReason*) REQUEST_WHILE_IN_NONE_HMI_LEVEL;
 +(SDLAppInterfaceUnregisteredReason*) TOO_MANY_REQUESTS;
 +(SDLAppInterfaceUnregisteredReason*) DRIVER_DISTRACTION_VIOLATION;
-+(SDLAppInterfaceUnregisteredReason*) LANGUAGE_CHANGE;
 +(SDLAppInterfaceUnregisteredReason*) MASTER_RESET;
 +(SDLAppInterfaceUnregisteredReason*) FACTORY_DEFAULTS;
++(SDLAppInterfaceUnregisteredReason*) APP_UNAUTHORIZED;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAppInterfaceUnregisteredReason.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.m
similarity index 90%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAppInterfaceUnregisteredReason.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.m
index 1e71380..b7b6237 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAppInterfaceUnregisteredReason.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAppInterfaceUnregisteredReason.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLAppInterfaceUnregisteredReason.h"
+#import <SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h>
 
 SDLAppInterfaceUnregisteredReason* SDLAppInterfaceUnregisteredReason_USER_EXIT = nil;
 SDLAppInterfaceUnregisteredReason* SDLAppInterfaceUnregisteredReason_IGNITION_OFF = nil;
@@ -11,9 +11,9 @@ SDLAppInterfaceUnregisteredReason* SDLAppInterfaceUnregisteredReason_USB_DISCONN
 SDLAppInterfaceUnregisteredReason* SDLAppInterfaceUnregisteredReason_REQUEST_WHILE_IN_NONE_HMI_LEVEL = nil;
 SDLAppInterfaceUnregisteredReason* SDLAppInterfaceUnregisteredReason_TOO_MANY_REQUESTS = nil;
 SDLAppInterfaceUnregisteredReason* SDLAppInterfaceUnregisteredReason_DRIVER_DISTRACTION_VIOLATION = nil;
-SDLAppInterfaceUnregisteredReason* SDLAppInterfaceUnregisteredReason_LANGUAGE_CHANGE = nil;
 SDLAppInterfaceUnregisteredReason* SDLAppInterfaceUnregisteredReason_MASTER_RESET = nil;
 SDLAppInterfaceUnregisteredReason* SDLAppInterfaceUnregisteredReason_FACTORY_DEFAULTS = nil;
+SDLAppInterfaceUnregisteredReason* SDLAppInterfaceUnregisteredReason_APP_UNAUTHORIZED = nil;
 
 NSMutableArray* SDLAppInterfaceUnregisteredReason_values = nil;
 @implementation SDLAppInterfaceUnregisteredReason
@@ -37,9 +37,9 @@ NSMutableArray* SDLAppInterfaceUnregisteredReason_values = nil;
                 SDLAppInterfaceUnregisteredReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL,
                 SDLAppInterfaceUnregisteredReason.TOO_MANY_REQUESTS,
                 SDLAppInterfaceUnregisteredReason.DRIVER_DISTRACTION_VIOLATION,
-                SDLAppInterfaceUnregisteredReason.LANGUAGE_CHANGE,
                 SDLAppInterfaceUnregisteredReason.MASTER_RESET,
                 SDLAppInterfaceUnregisteredReason.FACTORY_DEFAULTS,
+                SDLAppInterfaceUnregisteredReason.APP_UNAUTHORIZED,
                 nil];
     }
     return SDLAppInterfaceUnregisteredReason_values;
@@ -94,13 +94,6 @@ NSMutableArray* SDLAppInterfaceUnregisteredReason_values = nil;
        return SDLAppInterfaceUnregisteredReason_DRIVER_DISTRACTION_VIOLATION;
 }
 
-+(SDLAppInterfaceUnregisteredReason*) LANGUAGE_CHANGE {
-       if (SDLAppInterfaceUnregisteredReason_LANGUAGE_CHANGE == nil) {
-                       SDLAppInterfaceUnregisteredReason_LANGUAGE_CHANGE = [[SDLAppInterfaceUnregisteredReason alloc] initWithValue:@"LANGUAGE_CHANGE"];
-       }
-       return SDLAppInterfaceUnregisteredReason_LANGUAGE_CHANGE;
-}
-
 +(SDLAppInterfaceUnregisteredReason*) MASTER_RESET {
        if (SDLAppInterfaceUnregisteredReason_MASTER_RESET == nil) {
                        SDLAppInterfaceUnregisteredReason_MASTER_RESET = [[SDLAppInterfaceUnregisteredReason alloc] initWithValue:@"MASTER_RESET"];
@@ -115,4 +108,11 @@ NSMutableArray* SDLAppInterfaceUnregisteredReason_values = nil;
        return SDLAppInterfaceUnregisteredReason_FACTORY_DEFAULTS;
 }
 
++(SDLAppInterfaceUnregisteredReason*) APP_UNAUTHORIZED {
+    if (SDLAppInterfaceUnregisteredReason_APP_UNAUTHORIZED == nil) {
+        SDLAppInterfaceUnregisteredReason_APP_UNAUTHORIZED = [[SDLAppInterfaceUnregisteredReason alloc] initWithValue:@"APP_UNAUTHORIZED"];
+    }
+    return SDLAppInterfaceUnregisteredReason_APP_UNAUTHORIZED;
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioPassThruCapabilities.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioPassThruCapabilities.h
new file mode 100644 (file)
index 0000000..8baf211
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioPassThruCapabilities.h
@@ -0,0 +1,21 @@
+//  SDLAudioPassThruCapabilities.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLAudioType.h>
+#import <SmartDeviceLink/SDLBitsPerSample.h>
+#import <SmartDeviceLink/SDLSamplingRate.h>
+
+@interface SDLAudioPassThruCapabilities : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLSamplingRate* samplingRate;
+@property(assign) SDLBitsPerSample* bitsPerSample;
+@property(assign) SDLAudioType* audioType;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioPassThruCapabilities.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioPassThruCapabilities.m
new file mode 100644 (file)
index 0000000..a05afee
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioPassThruCapabilities.m
@@ -0,0 +1,72 @@
+//  SDLAudioPassThruCapabilities.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLAudioPassThruCapabilities.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLAudioPassThruCapabilities
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setSamplingRate:(SDLSamplingRate *) samplingRate {
+    if (samplingRate != nil) {
+        [store setObject:samplingRate forKey:NAMES_samplingRate];
+    } else {
+        [store removeObjectForKey:NAMES_samplingRate];
+    }
+}
+
+-(SDLSamplingRate*) samplingRate {
+    NSObject* obj = [store objectForKey:NAMES_samplingRate];
+    if ([obj isKindOfClass:SDLSamplingRate.class]) {
+        return (SDLSamplingRate*)obj;
+    } else { 
+        return [SDLSamplingRate valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setBitsPerSample:(SDLBitsPerSample *) bitsPerSample {
+    if (bitsPerSample != nil) {
+        [store setObject:bitsPerSample forKey:NAMES_bitsPerSample];
+    } else {
+        [store removeObjectForKey:NAMES_bitsPerSample];
+    }
+}
+
+-(SDLBitsPerSample*) bitsPerSample {
+    NSObject* obj = [store objectForKey:NAMES_bitsPerSample];
+    if ([obj isKindOfClass:SDLBitsPerSample.class]) {
+        return (SDLBitsPerSample*)obj;
+    } else {
+        return [SDLBitsPerSample valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setAudioType:(SDLAudioType *) audioType {
+    if (audioType != nil) {
+        [store setObject:audioType forKey:NAMES_audioType];
+    } else {
+        [store removeObjectForKey:NAMES_audioType];
+    }
+}
+
+-(SDLAudioType*) audioType {
+    NSObject* obj = [store objectForKey:NAMES_audioType];
+    if ([obj isKindOfClass:SDLAudioType.class]) {
+        return (SDLAudioType*)obj;
+    } else {
+        return [SDLAudioType valueOf:(NSString*)obj];
+    }
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAudioStreamingState.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioStreamingState.h
similarity index 59%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAudioStreamingState.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioStreamingState.h
index af4bf53..071dfd5 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAudioStreamingState.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioStreamingState.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAudioStreamingState.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLAudioStreamingState : SDLEnum {}
 
@@ -11,6 +11,7 @@
 +(NSMutableArray*) values;
 
 +(SDLAudioStreamingState*) AUDIBLE;
++(SDLAudioStreamingState*) ATTENUATED;
 +(SDLAudioStreamingState*) NOT_AUDIBLE;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAudioStreamingState.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioStreamingState.m
similarity index 73%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAudioStreamingState.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioStreamingState.m
index fee5a4b..2a742de 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLAudioStreamingState.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioStreamingState.m
@@ -1,10 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLAudioStreamingState.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLAudioStreamingState.h"
+#import <SmartDeviceLink/SDLAudioStreamingState.h>
 
 SDLAudioStreamingState* SDLAudioStreamingState_AUDIBLE = nil;
+SDLAudioStreamingState* SDLAudioStreamingState_ATTENUATED = nil;
 SDLAudioStreamingState* SDLAudioStreamingState_NOT_AUDIBLE = nil;
 
 NSMutableArray* SDLAudioStreamingState_values = nil;
@@ -36,6 +37,13 @@ NSMutableArray* SDLAudioStreamingState_values = nil;
        return SDLAudioStreamingState_AUDIBLE;
 }
 
++(SDLAudioStreamingState*) ATTENUATED {
+    if (SDLAudioStreamingState_ATTENUATED == nil) {
+        SDLAudioStreamingState_ATTENUATED = [[SDLAudioStreamingState alloc] initWithValue:@"ATTENUATED"];
+    }
+    return SDLAudioStreamingState_ATTENUATED;
+}
+
 +(SDLAudioStreamingState*) NOT_AUDIBLE {
        if (SDLAudioStreamingState_NOT_AUDIBLE == nil) {
                        SDLAudioStreamingState_NOT_AUDIBLE = [[SDLAudioStreamingState alloc] initWithValue:@"NOT_AUDIBLE"];

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioType.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioType.h
new file mode 100644 (file)
index 0000000..4c31d52
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioType.h
@@ -0,0 +1,15 @@
+//  SDLAudioType.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLAudioType : SDLEnum {}
+
++(SDLAudioType*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLAudioType*) PCM;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioType.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioType.m
new file mode 100644 (file)
index 0000000..3dc0667
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLAudioType.m
@@ -0,0 +1,37 @@
+//  SDLAudioType.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLAudioType.h>
+
+SDLAudioType* SDLAudioType_PCM = nil;
+
+NSMutableArray* SDLAudioType_values = nil;
+@implementation SDLAudioType
+
++(SDLAudioType*) valueOf:(NSString*) value {
+    for (SDLAudioType* item in SDLAudioType.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLAudioType_values == nil) {
+        SDLAudioType_values = [[NSMutableArray alloc] initWithObjects:
+                SDLAudioType.PCM,
+                nil];
+    }
+    return SDLAudioType_values;
+}
+
++(SDLAudioType*) PCM {
+       if (SDLAudioType_PCM == nil) {
+                       SDLAudioType_PCM = [[SDLAudioType alloc] initWithValue:@"PCM"];
+       }
+       return SDLAudioType_PCM;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBeltStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBeltStatus.h
new file mode 100644 (file)
index 0000000..aa1b0af
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBeltStatus.h
@@ -0,0 +1,31 @@
+//  SDLBeltStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLVehicleDataEventStatus.h>
+
+@interface SDLBeltStatus : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLVehicleDataEventStatus* driverBeltDeployed;
+@property(assign) SDLVehicleDataEventStatus* passengerBeltDeployed;
+@property(assign) SDLVehicleDataEventStatus* passengerBuckleBelted;
+@property(assign) SDLVehicleDataEventStatus* driverBuckleBelted;
+@property(assign) SDLVehicleDataEventStatus* leftRow2BuckleBelted;
+@property(assign) SDLVehicleDataEventStatus* passengerChildDetected;
+@property(assign) SDLVehicleDataEventStatus* rightRow2BuckleBelted;
+@property(assign) SDLVehicleDataEventStatus* middleRow2BuckleBelted;
+@property(assign) SDLVehicleDataEventStatus* middleRow3BuckleBelted;
+@property(assign) SDLVehicleDataEventStatus* leftRow3BuckledBelted;
+@property(assign) SDLVehicleDataEventStatus* rightRow3BuckleBelted;
+@property(assign) SDLVehicleDataEventStatus* leftRearInflatableBelted;
+@property(assign) SDLVehicleDataEventStatus* rightRearInflatableBelted;
+@property(assign) SDLVehicleDataEventStatus* middleRow1BeltDeployed;
+@property(assign) SDLVehicleDataEventStatus* middleRow1BuckleBelted;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBeltStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBeltStatus.m
new file mode 100644 (file)
index 0000000..e94c02b
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBeltStatus.m
@@ -0,0 +1,201 @@
+//  SDLBeltStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLBeltStatus.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLBeltStatus
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setDriverBeltDeployed:(SDLBeltStatus*) driverBeltDeployed {
+    if (driverBeltDeployed != nil) {
+        [store setObject:driverBeltDeployed forKey:NAMES_driverBeltDeployed];
+    } else {
+        [store removeObjectForKey:NAMES_driverBeltDeployed];
+    }
+}
+
+-(NSNumber*) driverBeltDeployed {
+    return [store objectForKey:NAMES_driverBeltDeployed];
+}
+
+-(void) setPassengerBeltDeployed:(SDLBeltStatus*) passengerBeltDeployed {
+    if (passengerBeltDeployed != nil) {
+        [store setObject:passengerBeltDeployed forKey:NAMES_passengerBeltDeployed];
+    } else {
+        [store removeObjectForKey:NAMES_passengerBeltDeployed];
+    }
+}
+
+-(NSNumber*) passengerBeltDeployed {
+    return [store objectForKey:NAMES_passengerBeltDeployed];
+}
+
+-(void) setPassengerBuckleBelted:(SDLBeltStatus*) passengerBuckleBelted {
+    if (passengerBuckleBelted != nil) {
+        [store setObject:passengerBuckleBelted forKey:NAMES_passengerBuckleBelted];
+    } else {
+        [store removeObjectForKey:NAMES_passengerBuckleBelted];
+    }
+}
+
+-(NSNumber*) passengerBuckleBelted {
+    return [store objectForKey:NAMES_passengerBuckleBelted];
+}
+
+-(void) setDriverBuckleBelted:(SDLBeltStatus*) driverBuckleBelted {
+    if (driverBuckleBelted != nil) {
+        [store setObject:driverBuckleBelted forKey:NAMES_driverBuckleBelted];
+    } else {
+        [store removeObjectForKey:NAMES_driverBuckleBelted];
+    }
+}
+
+-(NSNumber*) driverBuckleBelted {
+    return [store objectForKey:NAMES_driverBuckleBelted];
+}
+
+-(void) setLeftRow2BuckleBelted:(SDLBeltStatus*) leftRow2BuckleBelted {
+    if (leftRow2BuckleBelted != nil) {
+        [store setObject:leftRow2BuckleBelted forKey:NAMES_leftRow2BuckleBelted];
+    } else {
+        [store removeObjectForKey:NAMES_leftRow2BuckleBelted];
+    }
+}
+
+-(NSNumber*) leftRow2BuckleBelted {
+    return [store objectForKey:NAMES_leftRow2BuckleBelted];
+}
+
+-(void) setPassengerChildDetected:(SDLBeltStatus*) passengerChildDetected {
+    if (passengerChildDetected != nil) {
+        [store setObject:passengerChildDetected forKey:NAMES_passengerChildDetected];
+    } else {
+        [store removeObjectForKey:NAMES_passengerChildDetected];
+    }
+}
+
+-(NSNumber*) passengerChildDetected {
+    return [store objectForKey:NAMES_passengerChildDetected];
+}
+
+-(void) setRightRow2BuckleBelted:(SDLBeltStatus*) rightRow2BuckleBelted {
+    if (rightRow2BuckleBelted != nil) {
+        [store setObject:rightRow2BuckleBelted forKey:NAMES_rightRow2BuckleBelted];
+    } else {
+        [store removeObjectForKey:NAMES_rightRow2BuckleBelted];
+    }
+}
+
+-(NSNumber*) rightRow2BuckleBelted {
+    return [store objectForKey:NAMES_rightRow2BuckleBelted];
+}
+
+-(void) setMiddleRow2BuckleBelted:(SDLBeltStatus*) middleRow2BuckleBelted {
+    if (middleRow2BuckleBelted != nil) {
+        [store setObject:middleRow2BuckleBelted forKey:NAMES_middleRow2BuckleBelted];
+    } else {
+        [store removeObjectForKey:NAMES_middleRow2BuckleBelted];
+    }
+}
+
+-(NSNumber*) middleRow2BuckleBelted {
+    return [store objectForKey:NAMES_middleRow2BuckleBelted];
+}
+
+-(void) setMiddleRow3BuckleBelted:(SDLBeltStatus*) middleRow3BuckleBelted {
+    if (middleRow3BuckleBelted != nil) {
+        [store setObject:middleRow3BuckleBelted forKey:NAMES_middleRow3BuckleBelted];
+    } else {
+        [store removeObjectForKey:NAMES_middleRow3BuckleBelted];
+    }
+}
+
+-(NSNumber*) middleRow3BuckleBelted {
+    return [store objectForKey:NAMES_middleRow3BuckleBelted];
+}
+
+-(void) setLeftRow3BuckledBelted:(SDLBeltStatus*) leftRow3BuckledBelted {
+    if (leftRow3BuckledBelted != nil) {
+        [store setObject:leftRow3BuckledBelted forKey:NAMES_leftRow3BuckledBelted];
+    } else {
+        [store removeObjectForKey:NAMES_leftRow3BuckledBelted];
+    }
+}
+
+-(NSNumber*) leftRow3BuckledBelted {
+    return [store objectForKey:NAMES_leftRow3BuckledBelted];
+}
+
+-(void) setRightRow3BuckleBelted:(SDLBeltStatus*) rightRow3BuckleBelted {
+    if (rightRow3BuckleBelted != nil) {
+        [store setObject:rightRow3BuckleBelted forKey:NAMES_rightRow3BuckleBelted];
+    } else {
+        [store removeObjectForKey:NAMES_rightRow3BuckleBelted];
+    }
+}
+
+-(NSNumber*) rightRow3BuckleBelted {
+    return [store objectForKey:NAMES_rightRow3BuckleBelted];
+}
+
+-(void) setLeftRearInflatableBelted:(SDLBeltStatus*) leftRearInflatableBelted {
+    if (leftRearInflatableBelted != nil) {
+        [store setObject:leftRearInflatableBelted forKey:NAMES_leftRearInflatableBelted];
+    } else {
+        [store removeObjectForKey:NAMES_leftRearInflatableBelted];
+    }
+}
+
+-(NSNumber*) leftRearInflatableBelted {
+    return [store objectForKey:NAMES_leftRearInflatableBelted];
+}
+
+-(void) setRightRearInflatableBelted:(SDLBeltStatus*) rightRearInflatableBelted {
+    if (rightRearInflatableBelted != nil) {
+        [store setObject:rightRearInflatableBelted forKey:NAMES_rightRearInflatableBelted];
+    } else {
+        [store removeObjectForKey:NAMES_rightRearInflatableBelted];
+    }
+}
+
+-(NSNumber*) rightRearInflatableBelted {
+    return [store objectForKey:NAMES_rightRearInflatableBelted];
+}
+
+-(void) setMiddleRow1BeltDeployed:(SDLBeltStatus*) middleRow1BeltDeployed {
+    if (middleRow1BeltDeployed != nil) {
+        [store setObject:middleRow1BeltDeployed forKey:NAMES_middleRow1BeltDeployed];
+    } else {
+        [store removeObjectForKey:NAMES_middleRow1BeltDeployed];
+    }
+}
+
+-(NSNumber*) middleRow1BeltDeployed {
+    return [store objectForKey:NAMES_middleRow1BeltDeployed];
+}
+
+-(void) setMiddleRow1BuckleBelted:(SDLBeltStatus*) middleRow1BuckleBelted {
+    if (middleRow1BuckleBelted != nil) {
+        [store setObject:middleRow1BuckleBelted forKey:NAMES_middleRow1BuckleBelted];
+    } else {
+        [store removeObjectForKey:NAMES_middleRow1BuckleBelted];
+    }
+}
+
+-(NSNumber*) middleRow1BuckleBelted {
+    return [store objectForKey:NAMES_middleRow1BuckleBelted];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBinaryFrameHeader.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBinaryFrameHeader.h
new file mode 100644 (file)
index 0000000..7a41f00
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBinaryFrameHeader.h
@@ -0,0 +1,27 @@
+//  SDLBinaryFrameHeader.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+
+@interface SDLBinaryFrameHeader : NSObject {
+       Byte _rpcType;
+       UInt32 _functionID;
+       UInt32 _correlationID;
+       UInt32 _jsonSize;
+       NSData*  _jsonData;
+       NSData*  _bulkData;
+}
+
+@property(assign) Byte _rpcType;
+@property(assign) UInt32 _functionID;
+@property(assign) UInt32 _correlationID;
+@property(assign) UInt32 _jsonSize;
+
+@property(retain) NSData* _jsonData;
+@property(retain) NSData* _bulkData;
+
++(SDLBinaryFrameHeader*) parseBinaryHeader:(NSData*) binHeader;
+-(NSData*) assembleHeaderBytes;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBinaryFrameHeader.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBinaryFrameHeader.m
new file mode 100644 (file)
index 0000000..3fc3e23
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBinaryFrameHeader.m
@@ -0,0 +1,97 @@
+//  SDLBinaryFrameHeader.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLBinaryFrameHeader.h>
+
+#import <SmartDeviceLink/SDLBitConverter.h>
+#import <SmartDeviceLink/SDLDebugTool.h>
+
+@implementation SDLBinaryFrameHeader
+
+@synthesize _rpcType;
+@synthesize _functionID;
+@synthesize _correlationID;
+@synthesize _jsonSize;
+@synthesize _jsonData;
+@synthesize _bulkData;
+
+-(id) init {
+       if (self = [super init]) {
+        _rpcType = 0;
+        _functionID = 0;
+        _correlationID = 0;
+        _jsonSize = 0;
+        _jsonData = nil;
+        _bulkData = nil;
+       }
+       return self;
+}
+
++(SDLBinaryFrameHeader*) parseBinaryHeader:(NSData*) binHeader {
+       SDLBinaryFrameHeader* msg = [[SDLBinaryFrameHeader alloc] init];
+
+       Byte rpcType = (Byte)(((Byte*)binHeader.bytes)[0] >> 4);
+    msg._rpcType = rpcType;
+    
+       UInt32 functionID = [SDLBitConverter intFromByteArray:((Byte*)binHeader.bytes) offset:0] & 0x0FFFFFFF;
+    msg._functionID = functionID;
+    
+       UInt32 correlationID = [SDLBitConverter intFromByteArray:((Byte*)binHeader.bytes) offset:4];
+    msg._correlationID = correlationID;
+    
+       UInt32 jsonSize = [SDLBitConverter intFromByteArray:((Byte*)binHeader.bytes) offset:8];
+    msg._jsonSize = jsonSize;
+    
+    if (msg._jsonSize > 0) {
+        NSData* jsonData;
+        Byte* mallocPtr = malloc(msg._jsonSize);
+        if (mallocPtr == nil) {
+            @throw [NSException exceptionWithName:@"OutOfMemoryException" reason:@"malloc failed" userInfo:nil];
+        }
+        jsonData = [[NSData alloc] initWithBytesNoCopy:mallocPtr length:msg._jsonSize];
+        
+        memcpy((void*)jsonData.bytes, binHeader.bytes + 12, msg._jsonSize);
+        msg._jsonData = jsonData;
+    }
+    
+    if (binHeader.length - msg._jsonSize - 12 > 0) {
+        NSData* bulkData;
+        Byte* mallocPtr = malloc(binHeader.length - msg._jsonSize - 12);
+        if (mallocPtr == nil) {
+            @throw [NSException exceptionWithName:@"OutOfMemoryException" reason:@"malloc failed" userInfo:nil];
+        }
+        bulkData = [[NSData alloc] initWithBytesNoCopy:mallocPtr length:(binHeader.length - msg._jsonSize - 12)];
+        memcpy((void*)bulkData.bytes, binHeader.bytes + 12 + msg._jsonSize, (binHeader.length - msg._jsonSize - 12));
+        msg._bulkData = bulkData;
+    }
+       
+       return msg;
+}
+
+-(NSData*) assembleHeaderBytes {
+       UInt32 binHeader = 0;
+    binHeader |= _rpcType;
+       binHeader <<= 28;
+       binHeader |= _functionID;
+       
+       Byte* mallocPtr = malloc(12);
+       if (mallocPtr == nil) {
+               @throw [NSException exceptionWithName:@"OutOfMemoryException" reason:@"malloc failed" userInfo:nil];
+       }
+       NSData* ret = [[NSData alloc] initWithBytesNoCopy:mallocPtr length:12];
+    
+       memcpy((void*)ret.bytes, [SDLBitConverter intToByteArray:binHeader].bytes, 4);
+       memcpy((void*)ret.bytes + 4, [SDLBitConverter intToByteArray:_correlationID].bytes, 4);
+       memcpy((void*)ret.bytes + 8, [SDLBitConverter intToByteArray:_jsonSize].bytes, 4);
+    
+       return [ret autorelease];
+}
+
+-(void) dealloc {
+    [_jsonData release];
+    [_bulkData release];
+    [super dealloc];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLBitConverter.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBitConverter.h
similarity index 55%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLBitConverter.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBitConverter.h
index c47d430..f3cb3f8 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLBitConverter.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBitConverter.h
@@ -1,10 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLBitConverter.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
 
-@interface SDLBitConverter : NSObject {}
+@interface SDLBitConverter : NSObject{}
 
 +(NSData*) intToByteArray:(UInt32) value;
 +(UInt32) intFromByteArray:(Byte*) sizeBuf offset:(UInt32) offset;

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLBitConverter.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBitConverter.m
similarity index 81%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLBitConverter.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBitConverter.m
index f3bf052..838697c 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLBitConverter.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBitConverter.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLBitConverter.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLBitConverter.h"
+#import <SmartDeviceLink/SDLBitConverter.h>
 
 @implementation SDLBitConverter
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBitsPerSample.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBitsPerSample.h
new file mode 100644 (file)
index 0000000..cac6f4a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBitsPerSample.h
@@ -0,0 +1,16 @@
+//  SDLBitsPerSample.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLBitsPerSample : SDLEnum {}
+
++(SDLBitsPerSample*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLBitsPerSample*) _8_BIT;
++(SDLBitsPerSample*) _16_BIT;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBitsPerSample.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBitsPerSample.m
new file mode 100644 (file)
index 0000000..628cac6
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBitsPerSample.m
@@ -0,0 +1,46 @@
+//  SDLBitsPerSample.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLBitsPerSample.h>
+
+SDLBitsPerSample* SDLBitsPerSample_8_BIT = nil;
+SDLBitsPerSample* SDLBitsPerSample_16_BIT = nil;
+
+NSMutableArray* SDLBitsPerSample_values = nil;
+@implementation SDLBitsPerSample
+
++(SDLBitsPerSample*) valueOf:(NSString*) value {
+    for (SDLBitsPerSample* item in SDLBitsPerSample.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLBitsPerSample_values == nil) {
+        SDLBitsPerSample_values = [[NSMutableArray alloc] initWithObjects:
+                SDLBitsPerSample._8_BIT,
+                SDLBitsPerSample._16_BIT,
+                nil];
+    }
+    return SDLBitsPerSample_values;
+}
+
++(SDLBitsPerSample*) _8_BIT {
+       if (SDLBitsPerSample_8_BIT == nil) {
+                       SDLBitsPerSample_8_BIT = [[SDLBitsPerSample alloc] initWithValue:@"8_BIT"];
+       }
+       return SDLBitsPerSample_8_BIT;
+}
+
++(SDLBitsPerSample*) _16_BIT {
+       if (SDLBitsPerSample_16_BIT == nil) {
+                       SDLBitsPerSample_16_BIT = [[SDLBitsPerSample alloc] initWithValue:@"16_BIT"];
+       }
+       return SDLBitsPerSample_16_BIT;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBodyInformation.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBodyInformation.h
new file mode 100644 (file)
index 0000000..e6d6279
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBodyInformation.h
@@ -0,0 +1,24 @@
+//  SDLBodyInformation.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLIgnitionStableStatus.h>
+#import <SmartDeviceLink/SDLIgnitionStatus.h>
+
+@interface SDLBodyInformation : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* parkBrakeActive;
+@property(assign) SDLIgnitionStableStatus* ignitionStableStatus;
+@property(assign) SDLIgnitionStatus* ignitionStatus;
+@property(assign) NSNumber* driverDoorAjar;
+@property(assign) NSNumber* passengerDoorAjar;
+@property(assign) NSNumber* rearLeftDoorAjar;
+@property(assign) NSNumber* rearRightDoorAjar;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBodyInformation.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBodyInformation.m
new file mode 100644 (file)
index 0000000..8dbb5ca
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLBodyInformation.m
@@ -0,0 +1,109 @@
+//  SDLBodyInformation.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLBodyInformation.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLBodyInformation
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setParkBrakeActive:(NSNumber *) parkBrakeActive {
+    if (parkBrakeActive != nil) {
+        [store setObject:parkBrakeActive forKey:NAMES_parkBrakeActive];
+    } else {
+        [store removeObjectForKey:NAMES_parkBrakeActive];
+    }
+}
+
+-(NSNumber*) parkBrakeActive {
+    return [store objectForKey:NAMES_parkBrakeActive];
+}
+
+
+-(void) setIgnitionStableStatus:(SDLIgnitionStableStatus*) ignitionStableStatus {
+    if (ignitionStableStatus != nil) {
+        [store setObject:ignitionStableStatus forKey:NAMES_ignitionStableStatus];
+    } else {
+        [store removeObjectForKey:NAMES_ignitionStableStatus];
+    }
+}
+
+-(NSNumber*) ignitionStableStatus {
+    return [store objectForKey:NAMES_ignitionStableStatus];
+}
+
+-(void) setIgnitionStatus:(SDLIgnitionStatus*) ignitionStatus {
+    if (ignitionStatus != nil) {
+        [store setObject:ignitionStatus forKey:NAMES_ignitionStatus];
+    } else {
+        [store removeObjectForKey:NAMES_ignitionStatus];
+    }
+}
+
+-(NSNumber*) ignitionStatus {
+    return [store objectForKey:NAMES_ignitionStatus];
+}
+
+-(void) setDriverDoorAjar:(NSNumber *) driverDoorAjar {
+    if (driverDoorAjar != nil) {
+        [store setObject:driverDoorAjar forKey:NAMES_driverDoorAjar];
+    } else {
+        [store removeObjectForKey:NAMES_driverDoorAjar];
+    }
+}
+
+-(NSNumber*) driverDoorAjar {
+    return [store objectForKey:NAMES_driverDoorAjar];
+}
+
+-(void) setPassengerDoorAjar:(NSNumber *) passengerDoorAjar {
+    if (passengerDoorAjar != nil) {
+        [store setObject:passengerDoorAjar forKey:NAMES_passengerDoorAjar];
+    } else {
+        [store removeObjectForKey:NAMES_passengerDoorAjar];
+    }
+}
+
+-(NSNumber*) passengerDoorAjar {
+    return [store objectForKey:NAMES_passengerDoorAjar];
+}
+
+-(void) setRearLeftDoorAjar:(NSNumber *) rearLeftDoorAjar {
+    if (rearLeftDoorAjar != nil) {
+        [store setObject:rearLeftDoorAjar forKey:NAMES_rearLeftDoorAjar];
+    } else {
+        [store removeObjectForKey:NAMES_rearLeftDoorAjar];
+    }
+}
+
+-(NSNumber*) rearLeftDoorAjar {
+    return [store objectForKey:NAMES_rearLeftDoorAjar];
+}
+
+-(void) setRearRightDoorAjar:(NSNumber *) rearRightDoorAjar {
+    if (rearRightDoorAjar != nil) {
+        [store setObject:rearRightDoorAjar forKey:NAMES_rearRightDoorAjar];
+    } else {
+        [store removeObjectForKey:NAMES_rearRightDoorAjar];
+    }
+}
+
+-(NSNumber*) rearRightDoorAjar {
+    return [store objectForKey:NAMES_rearRightDoorAjar];
+}
+
+
+
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonCapabilities.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonCapabilities.h
similarity index 66%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonCapabilities.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonCapabilities.h
index f78243b..1105711 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonCapabilities.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonCapabilities.h
@@ -1,11 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLButtonCapabilities.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCMessage.h"
+#import <SmartDeviceLink/SDLRPCMessage.h>
 
-#import "SDLButtonName.h"
+#import <SmartDeviceLink/SDLButtonName.h>
 
 @interface SDLButtonCapabilities : SDLRPCStruct {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonCapabilities.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonCapabilities.m
similarity index 90%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonCapabilities.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonCapabilities.m
index 76b236b..ab935f0 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonCapabilities.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonCapabilities.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLButtonCapabilities.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLButtonCapabilities.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLButtonCapabilities.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLButtonCapabilities
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonEventMode.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonEventMode.h
similarity index 65%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonEventMode.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonEventMode.h
index 8f001dd..2bf443d 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonEventMode.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonEventMode.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLButtonEventMode.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLButtonEventMode : SDLEnum {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonEventMode.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonEventMode.m
similarity index 90%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonEventMode.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonEventMode.m
index e1989f5..7bbd877 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonEventMode.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonEventMode.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLButtonEventMode.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLButtonEventMode.h"
+#import <SmartDeviceLink/SDLButtonEventMode.h>
 
 SDLButtonEventMode* SDLButtonEventMode_BUTTONUP = nil;
 SDLButtonEventMode* SDLButtonEventMode_BUTTONDOWN = nil;

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonName.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonName.h
similarity index 78%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonName.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonName.h
index 4556042..c1dc963 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonName.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonName.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLButtonName.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLButtonName : SDLEnum {}
 
@@ -25,5 +25,6 @@
 +(SDLButtonName*) PRESET_7;
 +(SDLButtonName*) PRESET_8;
 +(SDLButtonName*) PRESET_9;
++(SDLButtonName*) CUSTOM_BUTTON;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonName.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonName.m
similarity index 91%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonName.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonName.m
index 7e35b86..36da5d5 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonName.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonName.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLButtonName.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLButtonName.h"
+#import <SmartDeviceLink/SDLButtonName.h>
 
 SDLButtonName* SDLButtonName_OK = nil;
 SDLButtonName* SDLButtonName_SEEKLEFT = nil;
@@ -19,6 +19,7 @@ SDLButtonName* SDLButtonName_PRESET_6 = nil;
 SDLButtonName* SDLButtonName_PRESET_7 = nil;
 SDLButtonName* SDLButtonName_PRESET_8 = nil;
 SDLButtonName* SDLButtonName_PRESET_9 = nil;
+SDLButtonName* SDLButtonName_CUSTOM_BUTTON = nil;
 
 NSMutableArray* SDLButtonName_values = nil;
 @implementation SDLButtonName
@@ -50,6 +51,7 @@ NSMutableArray* SDLButtonName_values = nil;
                 SDLButtonName.PRESET_7,
                 SDLButtonName.PRESET_8,
                 SDLButtonName.PRESET_9,
+                SDLButtonName.CUSTOM_BUTTON,
                 nil];
     }
     return SDLButtonName_values;
@@ -160,4 +162,11 @@ NSMutableArray* SDLButtonName_values = nil;
        return SDLButtonName_PRESET_9;
 }
 
++(SDLButtonName*) CUSTOM_BUTTON {
+    if (SDLButtonName_CUSTOM_BUTTON == nil) {
+        SDLButtonName_CUSTOM_BUTTON = [[SDLButtonName alloc] initWithValue:@"CUSTOM_BUTTON"];
+    }
+    return SDLButtonName_CUSTOM_BUTTON;
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonPressMode.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonPressMode.h
similarity index 64%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonPressMode.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonPressMode.h
index 40891e0..c84c03c 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonPressMode.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonPressMode.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLButtonPressMode.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLButtonPressMode : SDLEnum {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonPressMode.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonPressMode.m
similarity index 89%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonPressMode.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonPressMode.m
index 7c0719c..c5eb59d 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLButtonPressMode.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLButtonPressMode.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLButtonPressMode.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLButtonPressMode.h"
+#import <SmartDeviceLink/SDLButtonPressMode.h>
 
 SDLButtonPressMode* SDLButtonPressMode_LONG = nil;
 SDLButtonPressMode* SDLButtonPressMode_SHORT = nil;

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChangeRegistration.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChangeRegistration.h
new file mode 100644 (file)
index 0000000..2b811a5
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChangeRegistration.h
@@ -0,0 +1,18 @@
+//  SDLChangeRegistration.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+#import <SmartDeviceLink/SDLLanguage.h>
+
+@interface SDLChangeRegistration : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLLanguage* language;
+@property(assign) SDLLanguage* hmiDisplayLanguage;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChangeRegistration.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChangeRegistration.m
new file mode 100644 (file)
index 0000000..4206374
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChangeRegistration.m
@@ -0,0 +1,54 @@
+//  SDLChangeRegistration.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLChangeRegistration.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLChangeRegistration
+
+-(id) init {
+    if (self = [super initWithName:NAMES_ChangeRegistration]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setLanguage:(SDLLanguage *) language {
+    if (language != nil) {
+        [parameters setObject:language forKey:NAMES_language];
+    } else {
+        [parameters removeObjectForKey:NAMES_language];
+    }
+}
+
+-(SDLLanguage*) language {
+    NSObject* obj = [parameters objectForKey:NAMES_language];
+    if ([obj isKindOfClass:SDLLanguage.class]) {
+        return (SDLLanguage*)obj;
+    } else {
+        return [SDLLanguage valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setHmiDisplayLanguage:(SDLLanguage *) hmiDisplayLanguage {
+    if (hmiDisplayLanguage != nil) {
+        [parameters setObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage];
+    } else {
+        [parameters removeObjectForKey:NAMES_language];
+    }
+}
+
+-(SDLLanguage*) hmiDisplayLanguage {
+    NSObject* obj = [parameters objectForKey:NAMES_hmiDisplayLanguage];
+    if ([obj isKindOfClass:SDLLanguage.class]) {
+        return (SDLLanguage*)obj;
+    } else {
+        return [SDLLanguage valueOf:(NSString*)obj];
+    }
+}
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChangeRegistrationResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChangeRegistrationResponse.h
new file mode 100644 (file)
index 0000000..990ab9a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChangeRegistrationResponse.h
@@ -0,0 +1,13 @@
+//  SDLChangeRegistrationResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLChangeRegistrationResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChangeRegistrationResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChangeRegistrationResponse.m
new file mode 100644 (file)
index 0000000..2727fff
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChangeRegistrationResponse.m
@@ -0,0 +1,21 @@
+//  SDLChangeRegistrationResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLChangeRegistrationResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLChangeRegistrationResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_ChangeRegistration]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCharacterSet.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCharacterSet.h
similarity index 69%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCharacterSet.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCharacterSet.h
index 048aaf0..37ebd9b 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCharacterSet.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCharacterSet.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLCharacterSet.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLCharacterSet : SDLEnum {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCharacterSet.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCharacterSet.m
similarity index 93%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCharacterSet.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCharacterSet.m
index 03ff2d4..9164417 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCharacterSet.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCharacterSet.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLCharacterSet.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLCharacterSet.h"
+#import <SmartDeviceLink/SDLCharacterSet.h>
 
 SDLCharacterSet* SDLCharacterSet_TYPE2SET = nil;
 SDLCharacterSet* SDLCharacterSet_TYPE5SET = nil;

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLChoice.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChoice.h
similarity index 58%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLChoice.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChoice.h
index 85cdb22..67d6461 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLChoice.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChoice.h
@@ -1,10 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLChoice.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCMessage.h"
+#import <SmartDeviceLink/SDLRPCMessage.h>
 
+#import <SmartDeviceLink/SDLImage.h>
 
 @interface SDLChoice : SDLRPCStruct {}
 
@@ -14,5 +15,6 @@
 @property(assign) NSNumber* choiceID;
 @property(assign) NSString* menuName;
 @property(assign) NSMutableArray* vrCommands;
+@property(assign) SDLImage* image;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLChoice.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChoice.m
similarity index 64%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLChoice.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChoice.m
index 20d5b17..1fe91d8 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLChoice.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLChoice.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLChoice.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLChoice.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLChoice.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLChoice
 
@@ -53,4 +54,21 @@
     return [store objectForKey:NAMES_vrCommands];
 }
 
+-(void) setImage:(SDLImage*) image {
+    if (image != nil) {
+        [store setObject:image forKey:NAMES_image];
+    } else {
+        [store removeObjectForKey:NAMES_image];
+    }
+}
+
+-(SDLImage*) image {
+    NSObject* obj = [store objectForKey:NAMES_image];
+    if ([obj isKindOfClass:SDLImage.class]) {
+        return (SDLImage*)obj;
+    } else {
+        return [[[SDLImage alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCompassDirection.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCompassDirection.h
new file mode 100644 (file)
index 0000000..7c30c17
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCompassDirection.h
@@ -0,0 +1,22 @@
+//  SDLCompassDirection.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLCompassDirection : SDLEnum {}
+
++(SDLCompassDirection*) valueOf:(NSString*) value;
++(NSMutableArray*) values;                                 
+
++(SDLCompassDirection*) NORTH;
++(SDLCompassDirection*) NORTHWEST;
++(SDLCompassDirection*) WEST;
++(SDLCompassDirection*) SOUTHWEST;
++(SDLCompassDirection*) SOUTH;
++(SDLCompassDirection*) SOUTHEAST;
++(SDLCompassDirection*) EAST;
++(SDLCompassDirection*) NORTHEAST;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCompassDirection.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCompassDirection.m
new file mode 100644 (file)
index 0000000..9118854
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCompassDirection.m
@@ -0,0 +1,101 @@
+//  SDLCompassDirection.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLCompassDirection.h>   
+
+SDLCompassDirection* SDLCompassDirection_NORTH = nil;
+SDLCompassDirection* SDLCompassDirection_NORTHWEST = nil;
+SDLCompassDirection* SDLCompassDirection_WEST = nil;
+SDLCompassDirection* SDLCompassDirection_SOUTHWEST = nil;
+SDLCompassDirection* SDLCompassDirection_SOUTH = nil;
+SDLCompassDirection* SDLCompassDirection_SOUTHEAST = nil;
+SDLCompassDirection* SDLCompassDirection_EAST = nil;
+SDLCompassDirection* SDLCompassDirection_NORTHEAST = nil;
+
+NSMutableArray* SDLCompassDirection_values = nil; 
+
+@implementation SDLCompassDirection
+
++(SDLCompassDirection*) valueOf:(NSString*) value {                       
+       for (SDLCompassDirection* item in SDLCompassDirection.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLCompassDirection_values == nil) {                               
+               SDLCompassDirection_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLCompassDirection.NORTH,
+                                    SDLCompassDirection.NORTHWEST,
+                                    SDLCompassDirection.WEST,
+                                    SDLCompassDirection.SOUTHWEST,
+                                    SDLCompassDirection.SOUTH,
+                                    SDLCompassDirection.SOUTHEAST,
+                                    SDLCompassDirection.EAST,
+                                    SDLCompassDirection.NORTHEAST,
+                                                                       nil];                        
+       } 
+       return SDLCompassDirection_values; 
+}
+
++(SDLCompassDirection*) NORTH {                                                                                
+       if (SDLCompassDirection_NORTH == nil) {
+               SDLCompassDirection_NORTH = [[SDLCompassDirection alloc] initWithValue:@"NORTH"];
+       } 
+       return SDLCompassDirection_NORTH;  
+}
+
++(SDLCompassDirection*) NORTHWEST {
+       if (SDLCompassDirection_NORTHWEST == nil) {
+               SDLCompassDirection_NORTHWEST = [[SDLCompassDirection alloc] initWithValue:@"NORTHWEST"];
+       }
+       return SDLCompassDirection_NORTHWEST;
+}
+
++(SDLCompassDirection*) WEST {
+       if (SDLCompassDirection_WEST == nil) {
+               SDLCompassDirection_WEST = [[SDLCompassDirection alloc] initWithValue:@"WEST"];
+       }
+       return SDLCompassDirection_WEST;
+}
+
++(SDLCompassDirection*) SOUTHWEST {
+       if (SDLCompassDirection_SOUTHWEST == nil) {
+               SDLCompassDirection_SOUTHWEST = [[SDLCompassDirection alloc] initWithValue:@"SOUTHWEST"];
+       }
+       return SDLCompassDirection_SOUTHWEST;
+}
+
++(SDLCompassDirection*) SOUTH {
+       if (SDLCompassDirection_SOUTH == nil) {
+               SDLCompassDirection_SOUTH = [[SDLCompassDirection alloc] initWithValue:@"SOUTH"];
+       }
+       return SDLCompassDirection_SOUTH;
+}
+
++(SDLCompassDirection*) SOUTHEAST {
+       if (SDLCompassDirection_SOUTHEAST == nil) {
+               SDLCompassDirection_SOUTHEAST = [[SDLCompassDirection alloc] initWithValue:@"SOUTHEAST"];
+       }
+       return SDLCompassDirection_SOUTHEAST;
+}
+
++(SDLCompassDirection*) EAST {
+       if (SDLCompassDirection_EAST == nil) {
+               SDLCompassDirection_EAST = [[SDLCompassDirection alloc] initWithValue:@"EAST"];
+       }
+       return SDLCompassDirection_EAST;
+}
+
++(SDLCompassDirection*) NORTHEAST {
+       if (SDLCompassDirection_NORTHEAST == nil) {
+               SDLCompassDirection_NORTHEAST = [[SDLCompassDirection alloc] initWithValue:@"NORTHEAST"];
+       }
+       return SDLCompassDirection_NORTHEAST;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLComponentVolumeStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLComponentVolumeStatus.h
new file mode 100644 (file)
index 0000000..aa46ede
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLComponentVolumeStatus.h
@@ -0,0 +1,20 @@
+//  SDLComponentVolumeStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLComponentVolumeStatus : SDLEnum {}
+
++(SDLComponentVolumeStatus*) valueOf:(NSString*) value;
++(NSMutableArray*) values;                                 
+
++(SDLComponentVolumeStatus*) UNKNOWN;
++(SDLComponentVolumeStatus*) NORMAL;
++(SDLComponentVolumeStatus*) LOW;
++(SDLComponentVolumeStatus*) FAULT;
++(SDLComponentVolumeStatus*) ALERT;
++(SDLComponentVolumeStatus*) NOT_SUPPORTED;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLComponentVolumeStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLComponentVolumeStatus.m
new file mode 100644 (file)
index 0000000..1d50f9d
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLComponentVolumeStatus.m
@@ -0,0 +1,83 @@
+//  SDLComponentVolumeStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLComponentVolumeStatus.h>
+
+SDLComponentVolumeStatus* SDLComponentVolumeStatus_UNKNOWN = nil;
+SDLComponentVolumeStatus* SDLComponentVolumeStatus_NORMAL = nil;
+SDLComponentVolumeStatus* SDLComponentVolumeStatus_LOW = nil;
+SDLComponentVolumeStatus* SDLComponentVolumeStatus_FAULT = nil;
+SDLComponentVolumeStatus* SDLComponentVolumeStatus_ALERT = nil;
+SDLComponentVolumeStatus* SDLComponentVolumeStatus_NOT_SUPPORTED = nil;
+
+NSMutableArray* SDLComponentVolumeStatus_values = nil; 
+
+@implementation SDLComponentVolumeStatus
+
++(SDLComponentVolumeStatus*) valueOf:(NSString*) value {                       
+       for (SDLComponentVolumeStatus* item in SDLComponentVolumeStatus.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLComponentVolumeStatus_values == nil) {                               
+               SDLComponentVolumeStatus_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLComponentVolumeStatus.UNKNOWN,
+                                    SDLComponentVolumeStatus.NORMAL,
+                                    SDLComponentVolumeStatus.LOW,
+                                    SDLComponentVolumeStatus.FAULT,
+                                    SDLComponentVolumeStatus.ALERT,
+                                    SDLComponentVolumeStatus.NOT_SUPPORTED,
+                                                                       nil];
+       } 
+       return SDLComponentVolumeStatus_values; 
+}
+
++(SDLComponentVolumeStatus*) UNKNOWN {
+       if (SDLComponentVolumeStatus_UNKNOWN == nil) {
+               SDLComponentVolumeStatus_UNKNOWN = [[SDLComponentVolumeStatus alloc] initWithValue:@"UNKNOWN"];
+       } 
+       return SDLComponentVolumeStatus_UNKNOWN;  
+}
+
++(SDLComponentVolumeStatus*) NORMAL {
+       if (SDLComponentVolumeStatus_NORMAL == nil) {
+               SDLComponentVolumeStatus_NORMAL = [[SDLComponentVolumeStatus alloc] initWithValue:@"NORMAL"];
+       }
+       return SDLComponentVolumeStatus_NORMAL;
+}
+
++(SDLComponentVolumeStatus*) LOW {
+       if (SDLComponentVolumeStatus_LOW == nil) {
+               SDLComponentVolumeStatus_LOW = [[SDLComponentVolumeStatus alloc] initWithValue:@"LOW"];
+       }
+       return SDLComponentVolumeStatus_LOW;
+}
+
++(SDLComponentVolumeStatus*) FAULT {
+       if (SDLComponentVolumeStatus_FAULT == nil) {
+               SDLComponentVolumeStatus_FAULT = [[SDLComponentVolumeStatus alloc] initWithValue:@"FAULT"];
+       }
+       return SDLComponentVolumeStatus_FAULT;
+}
+
++(SDLComponentVolumeStatus*) ALERT {
+       if (SDLComponentVolumeStatus_ALERT == nil) {
+               SDLComponentVolumeStatus_ALERT = [[SDLComponentVolumeStatus alloc] initWithValue:@"ALERT"];
+       }
+       return SDLComponentVolumeStatus_ALERT;
+}
+
++(SDLComponentVolumeStatus*) NOT_SUPPORTED {
+       if (SDLComponentVolumeStatus_NOT_SUPPORTED == nil) {
+               SDLComponentVolumeStatus_NOT_SUPPORTED = [[SDLComponentVolumeStatus alloc] initWithValue:@"NOT_SUPPORTED"];
+       }
+       return SDLComponentVolumeStatus_NOT_SUPPORTED;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLConsoleController.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLConsoleController.h
similarity index 63%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLConsoleController.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLConsoleController.h
index 209a2cc..8399c84 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLConsoleController.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLConsoleController.h
@@ -1,14 +1,16 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLConsoleController.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLRPCMessage.h"
-#import "SDLDebugTool.h"
+#import <SmartDeviceLink/SDLDebugTool.h>
+
+#import <SmartDeviceLink/SDLRPCMessage.h>
 
 @interface SDLConsoleController : UITableViewController <SDLDebugToolConsole> {
        NSMutableArray* messageList;
     BOOL atBottom;
+    NSDateFormatter* dateFormatter;
 }
 
 @property (readonly) NSMutableArray *messageList;

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLConsoleController.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLConsoleController.m
similarity index 75%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLConsoleController.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLConsoleController.m
index a610807..d0ba929 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLConsoleController.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLConsoleController.m
@@ -1,11 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLConsoleController.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLConsoleController.h"
-#import "SDLJSONEncoder.h"
-#import "SDLDebugTool.h"
-#import "SDLRPCResponse.h"
+#import <SmartDeviceLink/SDLConsoleController.h>
+
+#import <SmartDeviceLink/SDLJSONEncoder.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @implementation SDLConsoleController
 
@@ -24,10 +24,15 @@
 
 -(void) append:(id) toAppend {
        //Insert the new data
-       [messageList addObject:toAppend];
+    NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+    
+    [dictionary setObject:toAppend forKey:@"object"];
+    [dictionary setObject:[NSDate date] forKey:@"date"];
+    
+       [messageList addObject:dictionary];
        NSIndexPath *newIndex = [NSIndexPath indexPathForRow:(messageList.count - 1) inSection:0];
        [self.tableView insertRowsAtIndexPaths:[NSArray arrayWithObject:newIndex] withRowAnimation:UITableViewRowAnimationBottom];
-       
+    
        //If we were at the bottom, scroll to the new bottom.
        if (atBottom) {
                [self.tableView scrollToRowAtIndexPath:newIndex atScrollPosition:UITableViewScrollPositionBottom animated:YES];
@@ -67,8 +72,8 @@
     atBottom = YES;
        
        messageList = [[NSMutableArray alloc] initWithCapacity:100];
-    // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
-    // self.navigationItem.rightBarButtonItem = self.editButtonItem;
+    dateFormatter = [[NSDateFormatter alloc] init];
+    dateFormatter.dateFormat = @"hh:mm:ss.SSS";
 }
 
 #pragma mark -
@@ -113,27 +118,31 @@
         cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:CellIdentifier] autorelease];
     }
     
-    // Configure the cell...
-       id msg = [messageList objectAtIndex:indexPath.row];
-       if ([msg isKindOfClass:SDLRPCMessage.class]) {
+    NSDictionary *currentDictionary = [messageList objectAtIndex:indexPath.row];
+    id msg = [currentDictionary objectForKey:@"object"];
+
+    NSString* tempdetail = [@"Time: " stringByAppendingString:[dateFormatter stringFromDate:[currentDictionary objectForKey:@"date"]]];
+    
+    if ([msg isKindOfClass:SDLRPCMessage.class]) {
                SDLRPCMessage *rpc = msg;
                
                NSString* title = [NSString stringWithFormat:@"%@ (%@)", rpc.name, rpc.messageType];
-               cell.textLabel.text = title;
-               
-               NSString* detail;
+        cell.textLabel.text = title;
+        
                if ([rpc.messageType isEqualToString:@"response"]) {
                        SDLRPCResponse* response = (SDLRPCResponse*) rpc;
-                       detail = [NSString stringWithFormat:@"%@: %@", [response resultCode], [response info]];
-               } else {
-                       detail = @"";
+            NSString* detail = [NSString stringWithFormat:@"%@ - %@", tempdetail, [response resultCode]];
+            cell.detailTextLabel.text = detail;
+               }
+        else {
+                       cell.detailTextLabel.text = tempdetail;
                }
                
-               cell.detailTextLabel.text = detail;
        } else {
                cell.textLabel.text = msg;
-               cell.detailTextLabel.text = @"";
+        cell.detailTextLabel.text = tempdetail;
        }
+    
     return cell;
 }
 
@@ -141,32 +150,28 @@
 #pragma mark Table view delegate
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-       id obj = [messageList objectAtIndex:indexPath.row];
+    
+    NSDictionary *currentDictionary = [messageList objectAtIndex:indexPath.row];
+    id obj = [currentDictionary objectForKey:@"object"];
+
        NSString* alertText = nil;
        if ([obj isKindOfClass:SDLRPCMessage.class]) {
+        
                SDLRPCMessage *rpc = obj;
-               NSData *jsonData = [[SDLJsonEncoder instance] encodeDictionary:[rpc serializeAsDictionary]];
+        
+               NSData *jsonData = [[SDLJsonEncoder instance] encodeDictionary:[rpc serializeAsDictionary:2]];
                alertText = [[[NSString alloc] initWithBytes:jsonData.bytes length:jsonData.length encoding:NSUTF8StringEncoding] autorelease];
                                
        } else {
                alertText = [NSString stringWithFormat:@"%@",obj];
        }
        
-       
        UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"RPCMessage" message:alertText delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil];
        [alertView show];
        [alertView release];
     
        [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
        
-    // Navigation logic may go here. Create and push another view controller.
-       /*
-        <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil];
-     // ...
-     // Pass the selected object to the new view controller.
-        [self.navigationController pushViewController:detailViewController animated:YES];
-        [detailViewController release];
-        */
 }
 
 -(void) logInfo:(NSString*) info {
@@ -191,12 +196,12 @@
 - (void)viewDidUnload {
     // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand.
     // For example: self.myOutlet = nil;
+    [messageList release];
+    [dateFormatter release];
 }
 
 - (void)dealloc {
-       [messageList release];
     [super dealloc];
 }
 
 @end
-

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCreateInteractionChoiceSet.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCreateInteractionChoiceSet.h
similarity index 65%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCreateInteractionChoiceSet.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCreateInteractionChoiceSet.h
index b2d83cc..06a0561 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCreateInteractionChoiceSet.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCreateInteractionChoiceSet.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLCreateInteractionChoiceSet.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
-
-#import "SDLChoice.h"
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
 @interface SDLCreateInteractionChoiceSet : SDLRPCRequest {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCreateInteractionChoiceSet.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
similarity index 85%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCreateInteractionChoiceSet.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
index dadccb7..8f88909 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCreateInteractionChoiceSet.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
@@ -1,9 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLCreateInteractionChoiceSet.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLCreateInteractionChoiceSet.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLCreateInteractionChoiceSet.h>
+
+#import <SmartDeviceLink/SDLChoice.h>
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLCreateInteractionChoiceSet
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCreateInteractionChoiceSetResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCreateInteractionChoiceSetResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h
index b9c2bb2..f23da88 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCreateInteractionChoiceSetResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLCreateInteractionChoiceSetResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLCreateInteractionChoiceSetResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCreateInteractionChoiceSetResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
similarity index 58%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCreateInteractionChoiceSetResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
index dae54fb..552afd3 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLCreateInteractionChoiceSetResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLCreateInteractionChoiceSetResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLCreateInteractionChoiceSetResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLCreateInteractionChoiceSetResponse
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDIDResult.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDIDResult.h
new file mode 100644 (file)
index 0000000..72128c0
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDIDResult.h
@@ -0,0 +1,18 @@
+//  SDLDIDResult.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLVehicleDataResultCode.h>
+
+@interface SDLDIDResult : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLVehicleDataResultCode* resultCode;
+@property(assign) NSMutableArray* data;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDIDResult.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDIDResult.m
new file mode 100644 (file)
index 0000000..f808ea6
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDIDResult.m
@@ -0,0 +1,45 @@
+//  SDLDIDResult.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLDIDResult.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLDIDResult
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setResultCode:(SDLVehicleDataResultCode*) resultCode {
+    if (resultCode != nil) {
+        [store setObject:resultCode forKey:NAMES_resultCode];
+    } else {
+        [store removeObjectForKey:NAMES_resultCode];
+    }
+}
+
+-(SDLVehicleDataResultCode*) resultCode {
+    return [store objectForKey:NAMES_resultCode];
+}
+
+-(void) setData:(NSMutableArray*) data {
+    if (data != nil) {
+        [store setObject:data forKey:NAMES_data];
+    } else {
+        [store removeObjectForKey:NAMES_data];
+    }
+}
+
+-(NSMutableArray*) data {
+    return [store objectForKey:NAMES_data];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLDebugTool.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDebugTool.h
similarity index 61%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLDebugTool.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDebugTool.h
index 4200de8..aaa6800 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLDebugTool.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDebugTool.h
@@ -1,6 +1,6 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDebugTool.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
 
@@ -15,7 +15,7 @@
 
 +(void) addConsole:(NSObject<SDLDebugToolConsole>*) aConsole;
 +(void) removeConsole:(NSObject<SDLDebugToolConsole>*) aConsole;
-+(void) logInfo:(NSString*) sdlt, ... ; // NS_FORMAT_FUNCTION(1,2);
-+(void) logException:(NSException*) ex withMessage:(NSString*) sdlt, ... ; // NS_FORMAT_FUNCTION(2,3);
++(void) logInfo:(NSString*) fmt, ... ;
++(void) logException:(NSException*) ex withMessage:(NSString*) fmt, ... ;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLDebugTool.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDebugTool.m
similarity index 71%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLDebugTool.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDebugTool.m
index 17aeb90..2e0b320 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLDebugTool.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDebugTool.m
@@ -1,14 +1,15 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDebugTool.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLDebugTool.h"
-#import "SDLSiphonServer.h"
-#import "SDLVersion.h"
+#import <SmartDeviceLink/SDLDebugTool.h>
+
+#import <SmartDeviceLink/SDLSiphonServer.h>
 
 #define LOG_INFO_ENABLED
 #define LOG_ERROR_ENABLED
 
+
 static NSMutableArray* debugToolConsoleList = nil;
 
 @implementation SDLDebugTool
@@ -29,16 +30,15 @@ static NSMutableArray* debugToolConsoleList = nil;
        [[SDLDebugTool getConsoleList] removeObject:aConsole];
 }
 
-+(void) logInfo:(NSString*) sdlt, ... {
++(void) logInfo:(NSString*) fmt, ... {
        NSString* toOutRaw = nil;
        
     va_list args;
-    va_start(args, sdlt);
+    va_start(args, fmt);
         
-    toOutRaw = [[NSString alloc] initWithFormat:sdlt arguments:args];
-    
-    NSMutableString *toOut = [[NSMutableString alloc] initWithFormat:@"SDLDebugTool: "];
+    toOutRaw = [[NSString alloc] initWithFormat:fmt arguments:args];
     
+    NSMutableString *toOut = [[NSMutableString alloc] initWithString:@"SDLDebugTool: "];
     [toOut appendString:toOutRaw];
     
     [toOutRaw release];
@@ -62,15 +62,15 @@ static NSMutableArray* debugToolConsoleList = nil;
     [toOut release];
 }
 
-+(void) logException:(NSException*) ex withMessage:(NSString*) sdlt, ...  {
++(void) logException:(NSException*) ex withMessage:(NSString*) fmt, ...  {
        NSString* toOutRaw = nil;
        
        va_list args;
-       va_start(args, sdlt);
+       va_start(args, fmt);
 
-    toOutRaw = [[NSString alloc] initWithFormat:sdlt arguments:args];
+    toOutRaw = [[NSString alloc] initWithFormat:fmt arguments:args];
     
-    NSMutableString *toOut = [[NSMutableString alloc] initWithFormat:@"%@: ", VERSION_STRING];
+    NSMutableString *toOut = [[NSMutableString alloc] initWithString:@"SDLDebugTool: "];
     [toOut appendString:toOutRaw];
     
     [toOutRaw release];

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDecoder.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDecoder.h
new file mode 100644 (file)
index 0000000..169a064
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDecoder.h
@@ -0,0 +1,11 @@
+//  SDLDecoder.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+
+@protocol SDLDecoder
+
+-(NSDictionary*) decode:(NSData*) msgBytes;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteCommand.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteCommand.h
similarity index 60%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteCommand.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteCommand.h
index c9630c0..3f8d1da 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteCommand.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteCommand.h
@@ -1,10 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDeleteCommand.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
-
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
 @interface SDLDeleteCommand : SDLRPCRequest {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteCommand.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteCommand.m
similarity index 75%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteCommand.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteCommand.m
index 99225e4..9556d03 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteCommand.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteCommand.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDeleteCommand.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLDeleteCommand.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLDeleteCommand.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLDeleteCommand
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteCommandResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteCommandResponse.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteCommandResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteCommandResponse.h
index f9a38b0..b09b02d 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteCommandResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteCommandResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDeleteCommandResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLDeleteCommandResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteCommandResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteCommandResponse.m
similarity index 59%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteCommandResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteCommandResponse.m
index 61cfb44..9b7e406 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteCommandResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteCommandResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDeleteCommandResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLDeleteCommandResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLDeleteCommandResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLDeleteCommandResponse
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteFile.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteFile.h
new file mode 100644 (file)
index 0000000..352ce97
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteFile.h
@@ -0,0 +1,15 @@
+//  SDLDeleteFile.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+@interface SDLDeleteFile : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSString* syncFileName;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteFile.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteFile.m
new file mode 100644 (file)
index 0000000..dabb9dd
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteFile.m
@@ -0,0 +1,33 @@
+//  SDLDeleteFile.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLDeleteFile.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLDeleteFile
+
+-(id) init {
+    if (self = [super initWithName:NAMES_DeleteFile]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setSyncFileName:(NSString *) syncFileName {
+    if (syncFileName != nil) {
+        [parameters setObject:syncFileName forKey:NAMES_syncFileName];
+    } else {
+        [parameters removeObjectForKey:NAMES_syncFileName];
+    }
+}
+
+-(NSString*) syncFileName {
+    return [parameters objectForKey:NAMES_syncFileName];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteFileResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteFileResponse.h
new file mode 100644 (file)
index 0000000..033401e
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteFileResponse.h
@@ -0,0 +1,15 @@
+//  SDLDeleteFileResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLDeleteFileResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* spaceAvailable;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteFileResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteFileResponse.m
new file mode 100644 (file)
index 0000000..3621d43
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteFileResponse.m
@@ -0,0 +1,33 @@
+//  SDLDeleteFileResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLDeleteFileResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLDeleteFileResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_DeleteFile]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setSpaceAvailable:(NSNumber *) spaceAvailable {
+    if (spaceAvailable != nil) {
+        [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable];
+    } else {
+        [parameters removeObjectForKey:NAMES_spaceAvailable];
+    }
+}
+
+-(NSNumber*) spaceAvailable {
+    return [parameters objectForKey:NAMES_spaceAvailable];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteInteractionChoiceSet.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h
similarity index 61%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteInteractionChoiceSet.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h
index 34c7696..84ee813 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteInteractionChoiceSet.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h
@@ -1,10 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDeleteInteractionChoiceSet.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
-
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
 @interface SDLDeleteInteractionChoiceSet : SDLRPCRequest {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteInteractionChoiceSet.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
similarity index 78%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteInteractionChoiceSet.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
index ba8e03d..3f49496 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteInteractionChoiceSet.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDeleteInteractionChoiceSet.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLDeleteInteractionChoiceSet.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLDeleteInteractionChoiceSet.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLDeleteInteractionChoiceSet
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteInteractionChoiceSetResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteInteractionChoiceSetResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h
index c57c916..7bb9a8c 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteInteractionChoiceSetResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDeleteInteractionChoiceSetResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLDeleteInteractionChoiceSetResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteInteractionChoiceSetResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
similarity index 58%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteInteractionChoiceSetResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
index 133b20a..2b01c40 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteInteractionChoiceSetResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDeleteInteractionChoiceSetResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLDeleteInteractionChoiceSetResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLDeleteInteractionChoiceSetResponse
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteSubMenu.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteSubMenu.h
similarity index 60%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteSubMenu.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteSubMenu.h
index 4f47dc4..4d4eeec 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteSubMenu.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteSubMenu.h
@@ -1,10 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDeleteSubMenu.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
-
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
 @interface SDLDeleteSubMenu : SDLRPCRequest {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteSubMenu.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteSubMenu.m
similarity index 75%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteSubMenu.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteSubMenu.m
index ab6441e..e3da037 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteSubMenu.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteSubMenu.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDeleteSubMenu.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLDeleteSubMenu.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLDeleteSubMenu.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLDeleteSubMenu
 
@@ -29,4 +30,4 @@
     return [parameters objectForKey:NAMES_menuID];
 }
 
-@end
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteSubMenuResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteSubMenuResponse.h
similarity index 53%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteSubMenuResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteSubMenuResponse.h
index 5f3729e..4403b7c 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteSubMenuResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteSubMenuResponse.h
@@ -1,15 +1,13 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDeleteSubMenuResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLDeleteSubMenuResponse : SDLRPCResponse {}
 
 -(id) init;
 -(id) initWithDictionary:(NSMutableDictionary*) dict;
 
-@end
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteSubMenuResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteSubMenuResponse.m
similarity index 58%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteSubMenuResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteSubMenuResponse.m
index b16021d..6ae5d34 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDeleteSubMenuResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeleteSubMenuResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDeleteSubMenuResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLDeleteSubMenuResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLDeleteSubMenuResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLDeleteSubMenuResponse
 
@@ -17,4 +18,4 @@
     return self;
 }
 
-@end
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeviceLevelStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeviceLevelStatus.h
new file mode 100644 (file)
index 0000000..e483b3b
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeviceLevelStatus.h
@@ -0,0 +1,20 @@
+//  SDLDeviceLevelStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLDeviceLevelStatus : SDLEnum {}
+
++(SDLDeviceLevelStatus*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLDeviceLevelStatus*) ZERO_LEVEL_BARS;
++(SDLDeviceLevelStatus*) ONE_LEVEL_BARS;
++(SDLDeviceLevelStatus*) TWO_LEVEL_BARS;
++(SDLDeviceLevelStatus*) THREE_LEVEL_BARS;
++(SDLDeviceLevelStatus*) FOUR_LEVEL_BARS;
++(SDLDeviceLevelStatus*) NOT_PROVIDED;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeviceLevelStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeviceLevelStatus.m
new file mode 100644 (file)
index 0000000..9f4bcec
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeviceLevelStatus.m
@@ -0,0 +1,83 @@
+//  SDLDeviceLevelStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLDeviceLevelStatus.h>
+
+SDLDeviceLevelStatus* SDLDeviceLevelStatus_ZERO_LEVEL_BARS = nil;
+SDLDeviceLevelStatus* SDLDeviceLevelStatus_ONE_LEVEL_BARS = nil;
+SDLDeviceLevelStatus* SDLDeviceLevelStatus_TWO_LEVEL_BARS = nil;
+SDLDeviceLevelStatus* SDLDeviceLevelStatus_THREE_LEVEL_BARS = nil;
+SDLDeviceLevelStatus* SDLDeviceLevelStatus_FOUR_LEVEL_BARS = nil;
+SDLDeviceLevelStatus* SDLDeviceLevelStatus_NOT_PROVIDED = nil;
+
+NSMutableArray* SDLDeviceLevelStatus_values = nil; 
+
+@implementation SDLDeviceLevelStatus
+
++(SDLDeviceLevelStatus*) valueOf:(NSString*) value {                       
+       for (SDLDeviceLevelStatus* item in SDLDeviceLevelStatus.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLDeviceLevelStatus_values == nil) {                               
+               SDLDeviceLevelStatus_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLDeviceLevelStatus.ZERO_LEVEL_BARS,
+                                    SDLDeviceLevelStatus.ONE_LEVEL_BARS,
+                                    SDLDeviceLevelStatus.TWO_LEVEL_BARS,
+                                    SDLDeviceLevelStatus.THREE_LEVEL_BARS,
+                                    SDLDeviceLevelStatus.FOUR_LEVEL_BARS,
+                                    SDLDeviceLevelStatus.NOT_PROVIDED,
+                                                                       nil];
+       } 
+       return SDLDeviceLevelStatus_values; 
+}
+
++(SDLDeviceLevelStatus*) ZERO_LEVEL_BARS {
+       if (SDLDeviceLevelStatus_ZERO_LEVEL_BARS == nil) {
+               SDLDeviceLevelStatus_ZERO_LEVEL_BARS = [[SDLDeviceLevelStatus alloc] initWithValue:@"ZERO_LEVEL_BARS"];
+       } 
+       return SDLDeviceLevelStatus_ZERO_LEVEL_BARS;  
+}
+
++(SDLDeviceLevelStatus*) ONE_LEVEL_BARS {
+       if (SDLDeviceLevelStatus_ONE_LEVEL_BARS == nil) {
+               SDLDeviceLevelStatus_ONE_LEVEL_BARS = [[SDLDeviceLevelStatus alloc] initWithValue:@"ONE_LEVEL_BARS"];
+       }
+       return SDLDeviceLevelStatus_ONE_LEVEL_BARS;
+}
+
++(SDLDeviceLevelStatus*) TWO_LEVEL_BARS {
+       if (SDLDeviceLevelStatus_TWO_LEVEL_BARS == nil) {
+               SDLDeviceLevelStatus_TWO_LEVEL_BARS = [[SDLDeviceLevelStatus alloc] initWithValue:@"TWO_LEVEL_BARS"];
+       }
+       return SDLDeviceLevelStatus_TWO_LEVEL_BARS;
+}
+
++(SDLDeviceLevelStatus*) THREE_LEVEL_BARS {
+       if (SDLDeviceLevelStatus_THREE_LEVEL_BARS == nil) {
+               SDLDeviceLevelStatus_THREE_LEVEL_BARS = [[SDLDeviceLevelStatus alloc] initWithValue:@"THREE_LEVEL_BARS"];
+       }
+       return SDLDeviceLevelStatus_THREE_LEVEL_BARS;
+}
+
++(SDLDeviceLevelStatus*) FOUR_LEVEL_BARS {
+       if (SDLDeviceLevelStatus_FOUR_LEVEL_BARS == nil) {
+               SDLDeviceLevelStatus_FOUR_LEVEL_BARS = [[SDLDeviceLevelStatus alloc] initWithValue:@"FOUR_LEVEL_BARS"];
+       }
+       return SDLDeviceLevelStatus_FOUR_LEVEL_BARS;
+}
+
++(SDLDeviceLevelStatus*) NOT_PROVIDED {
+       if (SDLDeviceLevelStatus_NOT_PROVIDED == nil) {
+               SDLDeviceLevelStatus_NOT_PROVIDED = [[SDLDeviceLevelStatus alloc] initWithValue:@"NOT_PROVIDED"];
+       }
+       return SDLDeviceLevelStatus_NOT_PROVIDED;
+}
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeviceStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeviceStatus.h
new file mode 100644 (file)
index 0000000..821c354
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeviceStatus.h
@@ -0,0 +1,28 @@
+//  SDLDeviceStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLDeviceLevelStatus.h>
+#import <SmartDeviceLink/SDLPrimaryAudioSource.h>
+
+@interface SDLDeviceStatus : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* voiceRecOn;
+@property(assign) NSNumber* btIconOn;
+@property(assign) NSNumber* callActive;
+@property(assign) NSNumber* phoneRoaming;
+@property(assign) NSNumber* textMsgAvailable;
+@property(assign) SDLDeviceLevelStatus* battLevelStatus;
+@property(assign) NSNumber* stereoAudioOutputMuted;
+@property(assign) NSNumber* monoAudioOutputMuted;
+@property(assign) SDLDeviceLevelStatus* signalLevelStatus;
+@property(assign) SDLPrimaryAudioSource* primaryAudioSource;
+@property(assign) NSNumber* eCallEventActive;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeviceStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeviceStatus.m
new file mode 100644 (file)
index 0000000..e862c10
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDeviceStatus.m
@@ -0,0 +1,153 @@
+//  SDLDeviceStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLDeviceStatus.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLDeviceStatus
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setVoiceRecOn:(NSNumber *) voiceRecOn {
+    if (voiceRecOn != nil) {
+        [store setObject:voiceRecOn forKey:NAMES_voiceRecOn];
+    } else {
+        [store removeObjectForKey:NAMES_voiceRecOn];
+    }
+}
+
+-(NSNumber*) voiceRecOn {
+    return [store objectForKey:NAMES_voiceRecOn];
+}
+
+-(void) setBtIconOn:(NSNumber *) btIconOn {
+    if (btIconOn != nil) {
+        [store setObject:btIconOn forKey:NAMES_btIconOn];
+    } else {
+        [store removeObjectForKey:NAMES_btIconOn];
+    }
+}
+
+-(NSNumber*) btIconOn {
+    return [store objectForKey:NAMES_btIconOn];
+}
+
+-(void) setCallActive:(NSNumber *) callActive {
+    if (callActive != nil) {
+        [store setObject:callActive forKey:NAMES_callActive];
+    } else {
+        [store removeObjectForKey:NAMES_callActive];
+    }
+}
+
+-(NSNumber*) callActive {
+    return [store objectForKey:NAMES_callActive];
+}
+
+-(void) setPhoneRoaming:(NSNumber *) phoneRoaming {
+    if (phoneRoaming != nil) {
+        [store setObject:phoneRoaming forKey:NAMES_phoneRoaming];
+    } else {
+        [store removeObjectForKey:NAMES_phoneRoaming];
+    }
+}
+
+-(NSNumber*) phoneRoaming {
+    return [store objectForKey:NAMES_phoneRoaming];
+}
+
+-(void) setTextMsgAvailable:(NSNumber *) textMsgAvailable {
+    if (textMsgAvailable != nil) {
+        [store setObject:textMsgAvailable forKey:NAMES_textMsgAvailable];
+    } else {
+        [store removeObjectForKey:NAMES_textMsgAvailable];
+    }
+}
+
+-(NSNumber*) textMsgAvailable {
+    return [store objectForKey:NAMES_textMsgAvailable];
+}
+
+-(void) setBattLevelStatus:(SDLDeviceLevelStatus*) battLevelStatus {
+    if (battLevelStatus != nil) {
+        [store setObject:battLevelStatus forKey:NAMES_battLevelStatus];
+    } else {
+        [store removeObjectForKey:NAMES_battLevelStatus];
+    }
+}
+
+-(NSNumber*) battLevelStatus {
+    return [store objectForKey:NAMES_battLevelStatus];
+}
+
+-(void) setStereoAudioOutputMuted:(NSNumber *) stereoAudioOutputMuted {
+    if (stereoAudioOutputMuted != nil) {
+        [store setObject:stereoAudioOutputMuted forKey:NAMES_stereoAudioOutputMuted];
+    } else {
+        [store removeObjectForKey:NAMES_stereoAudioOutputMuted];
+    }
+}
+
+-(NSNumber*) stereoAudioOutputMuted {
+    return [store objectForKey:NAMES_stereoAudioOutputMuted];
+}
+
+-(void) setMonoAudioOutputMuted:(NSNumber *) monoAudioOutputMuted {
+    if (monoAudioOutputMuted != nil) {
+        [store setObject:monoAudioOutputMuted forKey:NAMES_monoAudioOutputMuted];
+    } else {
+        [store removeObjectForKey:NAMES_monoAudioOutputMuted];
+    }
+}
+
+-(NSNumber*) monoAudioOutputMuted {
+    return [store objectForKey:NAMES_monoAudioOutputMuted];
+}
+
+-(void) setSignalLevelStatus:(SDLDeviceLevelStatus*) signalLevelStatus {
+    if (signalLevelStatus != nil) {
+        [store setObject:signalLevelStatus forKey:NAMES_signalLevelStatus];
+    } else {
+        [store removeObjectForKey:NAMES_signalLevelStatus];
+    }
+}
+
+-(NSNumber*) signalLevelStatus {
+    return [store objectForKey:NAMES_signalLevelStatus];
+}
+
+-(void) setPrimaryAudioSource:(SDLPrimaryAudioSource*) primaryAudioSource {
+    if (primaryAudioSource != nil) {
+        [store setObject:primaryAudioSource forKey:NAMES_primaryAudioSource];
+    } else {
+        [store removeObjectForKey:NAMES_primaryAudioSource];
+    }
+}
+
+-(NSNumber*) primaryAudioSource {
+    return [store objectForKey:NAMES_primaryAudioSource];
+}
+
+-(void) setECallEventActive:(NSNumber *) eCallEventActive {
+    if (eCallEventActive != nil) {
+        [store setObject:eCallEventActive forKey:NAMES_eCallEventActive];
+    } else {
+        [store removeObjectForKey:NAMES_eCallEventActive];
+    }
+}
+
+-(NSNumber*) eCallEventActive {
+    return [store objectForKey:NAMES_eCallEventActive];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDimension.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDimension.h
new file mode 100644 (file)
index 0000000..b21cac9
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDimension.h
@@ -0,0 +1,19 @@
+//  SDLDimension.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLDimension : SDLEnum {}
+
++(SDLDimension*) valueOf:(NSString*) value;
++(NSMutableArray*) values;                                 
+
++(SDLDimension*) NO_FIX;
++(SDLDimension*) _2D;
++(SDLDimension*) _3D;
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDimension.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDimension.m
new file mode 100644 (file)
index 0000000..755ffd4
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDimension.m
@@ -0,0 +1,58 @@
+//  SDLDimension.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLDimension.h>   
+
+SDLDimension* SDLDimension_NO_FIX = nil;
+SDLDimension* SDLDimension_2D = nil;
+SDLDimension* SDLDimension_3D = nil;
+
+NSMutableArray* SDLDimension_values = nil; 
+
+@implementation SDLDimension
+
++(SDLDimension*) valueOf:(NSString*) value {                       
+       for (SDLDimension* item in SDLDimension.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLDimension_values == nil) {                               
+               SDLDimension_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLDimension.NO_FIX,
+                                    SDLDimension._2D,
+                                    SDLDimension._3D,
+                                                                       nil];                        
+       } 
+       return SDLDimension_values; 
+}
+
++(SDLDimension*) NO_FIX {
+       if (SDLDimension_NO_FIX == nil) {
+               SDLDimension_NO_FIX = [[SDLDimension alloc] initWithValue:@"NO_FIX"];
+       } 
+       return SDLDimension_NO_FIX;  
+}
+
++(SDLDimension*) _2D {
+       if (SDLDimension_2D == nil) {
+               SDLDimension_2D = [[SDLDimension alloc] initWithValue:@"2D"];
+       }
+       return SDLDimension_2D;
+}
+
++(SDLDimension*) _3D {
+       if (SDLDimension_3D == nil) {
+               SDLDimension_3D = [[SDLDimension alloc] initWithValue:@"3D"];
+       }
+       return SDLDimension_3D;
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDisplayCapabilities.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDisplayCapabilities.h
similarity index 58%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDisplayCapabilities.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDisplayCapabilities.h
index 9719040..1283387 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDisplayCapabilities.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDisplayCapabilities.h
@@ -1,13 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDisplayCapabilities.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCMessage.h"
+#import <SmartDeviceLink/SDLRPCMessage.h>
 
-#import "SDLDisplayType.h"
-#import "SDLTextField.h"
-#import "SDLMediaClockFormat.h"
+#import <SmartDeviceLink/SDLDisplayType.h>
 
 @interface SDLDisplayCapabilities : SDLRPCStruct {}
 
@@ -17,5 +15,6 @@
 @property(assign) SDLDisplayType* displayType;
 @property(assign) NSMutableArray* textFields;
 @property(assign) NSMutableArray* mediaClockFormats;
+@property(assign) NSNumber* graphicSupported;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDisplayCapabilities.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDisplayCapabilities.m
similarity index 78%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDisplayCapabilities.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDisplayCapabilities.m
index e65da0f..f555f53 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDisplayCapabilities.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDisplayCapabilities.m
@@ -1,9 +1,12 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDisplayCapabilities.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLDisplayCapabilities.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLDisplayCapabilities.h>
+
+#import <SmartDeviceLink/SDLMediaClockFormat.h>
+#import <SmartDeviceLink/SDLNames.h>
+#import <SmartDeviceLink/SDLTextField.h>
 
 @implementation SDLDisplayCapabilities
 
@@ -76,4 +79,16 @@
     }
 }
 
+-(void) setGraphicSupported:(NSNumber*) graphicSupported {
+    if (graphicSupported != nil) {
+        [store setObject:graphicSupported forKey:NAMES_graphicSupported];
+    } else {
+        [store removeObjectForKey:NAMES_graphicSupported];
+    }
+}
+
+-(NSNumber*) graphicSupported {
+    return [store objectForKey:NAMES_graphicSupported];
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDisplayType.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDisplayType.h
similarity index 64%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDisplayType.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDisplayType.h
index 0da0221..ff5ef70 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDisplayType.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDisplayType.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDisplayType.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLDisplayType : SDLEnum {}
 
@@ -17,5 +17,8 @@
 +(SDLDisplayType*) GEN2_4_DMA;
 +(SDLDisplayType*) GEN2_8_DMA;
 +(SDLDisplayType*) GEN2_4_HUD;
++(SDLDisplayType*) MFD3;
++(SDLDisplayType*) MFD4;
++(SDLDisplayType*) MFD5;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDisplayType.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDisplayType.m
similarity index 73%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDisplayType.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDisplayType.m
index 5684b15..41d764c 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDisplayType.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDisplayType.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDisplayType.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLDisplayType.h"
+#import <SmartDeviceLink/SDLDisplayType.h>
 
 SDLDisplayType* SDLDisplayType_CID = nil;
 SDLDisplayType* SDLDisplayType_TYPE2 = nil;
@@ -11,6 +11,10 @@ SDLDisplayType* SDLDisplayType_NGN = nil;
 SDLDisplayType* SDLDisplayType_GEN2_4_DMA = nil;
 SDLDisplayType* SDLDisplayType_GEN2_8_DMA = nil;
 SDLDisplayType* SDLDisplayType_GEN2_4_HUD = nil;
+SDLDisplayType* SDLDisplayType_MFD3 = nil;
+SDLDisplayType* SDLDisplayType_MFD4 = nil;
+SDLDisplayType* SDLDisplayType_MFD5 = nil;
+
 
 NSMutableArray* SDLDisplayType_values = nil;
 @implementation SDLDisplayType
@@ -34,6 +38,9 @@ NSMutableArray* SDLDisplayType_values = nil;
                 SDLDisplayType.GEN2_4_DMA,
                 SDLDisplayType.GEN2_8_DMA,
                 SDLDisplayType.GEN2_4_HUD,
+                SDLDisplayType.MFD3,
+                SDLDisplayType.MFD4,
+                SDLDisplayType.MFD5,
                 nil];
     }
     return SDLDisplayType_values;
@@ -88,4 +95,25 @@ NSMutableArray* SDLDisplayType_values = nil;
        return SDLDisplayType_GEN2_4_HUD;
 }
 
++(SDLDisplayType*) MFD3 {
+    if (SDLDisplayType_MFD3 == nil) {
+        SDLDisplayType_MFD3 = [[SDLDisplayType alloc] initWithValue:@"MFD3"];
+    }
+    return SDLDisplayType_MFD3;
+}
+
++(SDLDisplayType*) MFD4 {
+    if (SDLDisplayType_MFD4 == nil) {
+        SDLDisplayType_MFD4 = [[SDLDisplayType alloc] initWithValue:@"MFD4"];
+    }
+    return SDLDisplayType_MFD4;
+}
+
++(SDLDisplayType*) MFD5 {
+    if (SDLDisplayType_MFD5 == nil) {
+        SDLDisplayType_MFD5 = [[SDLDisplayType alloc] initWithValue:@"MFD5"];
+    }
+    return SDLDisplayType_MFD5;
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDriverDistractionState.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDriverDistractionState.h
similarity index 52%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDriverDistractionState.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDriverDistractionState.h
index 7423792..2e54623 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDriverDistractionState.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDriverDistractionState.h
@@ -1,14 +1,13 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDriverDistractionState.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h> 
-#import "SDLEnum.h"   
+#import <SmartDeviceLink/SDLEnum.h>   
 
-@interface SDLDriverDistractionState : SDLEnum{}
+@interface SDLDriverDistractionState : SDLEnum {}
 
 +(SDLDriverDistractionState*) valueOf:(NSString*) value;
-
 +(NSMutableArray*) values;
 
 +(SDLDriverDistractionState*) DD_ON; 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDriverDistractionState.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDriverDistractionState.m
similarity index 91%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDriverDistractionState.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDriverDistractionState.m
index e00a68d..461cb9f 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLDriverDistractionState.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLDriverDistractionState.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLDriverDistractionState.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLDriverDistractionState.h"
+#import <SmartDeviceLink/SDLDriverDistractionState.h>   
 
 SDLDriverDistractionState* SDLDriverDistractionState_DD_ON = nil;
 SDLDriverDistractionState* SDLDriverDistractionState_DD_OFF = nil;

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLEncodedSyncPData.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncodedSyncPData.h
similarity index 59%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLEncodedSyncPData.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncodedSyncPData.h
index ba7d4ac..6f3c3f2 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLEncodedSyncPData.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncodedSyncPData.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLEncodedSyncPData.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
 @interface SDLEncodedSyncPData: SDLRPCRequest {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLEncodedSyncPData.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncodedSyncPData.m
similarity index 76%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLEncodedSyncPData.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncodedSyncPData.m
index c665e47..e01cf34 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLEncodedSyncPData.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncodedSyncPData.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLEncodedSyncPData.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLEncodedSyncPData.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLEncodedSyncPData.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLEncodedSyncPData
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLEncodedSyncPDataResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncodedSyncPDataResponse.h
similarity index 53%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLEncodedSyncPDataResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncodedSyncPDataResponse.h
index b9225fc..f5f4dc3 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLEncodedSyncPDataResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncodedSyncPDataResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLEncodedSyncPDataResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLEncodedSyncPDataResponse: SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLEncodedSyncPDataResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
similarity index 59%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLEncodedSyncPDataResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
index cffeeaa..527d14f 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLEncodedSyncPDataResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLEncodedSyncPDataResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLEncodedSyncPDataResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLEncodedSyncPDataResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLEncodedSyncPDataResponse
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncoder.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncoder.h
new file mode 100644 (file)
index 0000000..054825a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEncoder.h
@@ -0,0 +1,11 @@
+//  SDLEncoder.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+
+@protocol SDLEncoder
+
+-(NSData*) encodeDictionary:(NSDictionary*) dict;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEndAudioPassThru.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEndAudioPassThru.h
new file mode 100644 (file)
index 0000000..23dcec4
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEndAudioPassThru.h
@@ -0,0 +1,13 @@
+//  SDLEndAudioPassThru.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+@interface SDLEndAudioPassThru : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEndAudioPassThru.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEndAudioPassThru.m
new file mode 100644 (file)
index 0000000..1b65138
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEndAudioPassThru.m
@@ -0,0 +1,21 @@
+//  SDLEndAudioPassThru.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLEndAudioPassThru.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLEndAudioPassThru
+
+-(id) init {
+    if (self = [super initWithName:NAMES_EndAudioPassThru]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEndAudioPassThruResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEndAudioPassThruResponse.h
new file mode 100644 (file)
index 0000000..24d0033
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEndAudioPassThruResponse.h
@@ -0,0 +1,13 @@
+//  SDLEndAudioPassThruResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLEndAudioPassThruResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEndAudioPassThruResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEndAudioPassThruResponse.m
new file mode 100644 (file)
index 0000000..6e739e4
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEndAudioPassThruResponse.m
@@ -0,0 +1,21 @@
+//  SDLEndAudioPassThruResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLEndAudioPassThruResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLEndAudioPassThruResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_EndAudioPassThru]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEngineInfo.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEngineInfo.h
new file mode 100644 (file)
index 0000000..0805ed0
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEngineInfo.h
@@ -0,0 +1,20 @@
+//  SDLEngineInfo.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLMaintenanceModeStatus.h>
+
+@interface SDLEngineInfo : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* electricFuelConsumption;
+@property(assign) NSNumber* stateOfCharge;
+@property(assign) SDLMaintenanceModeStatus* fuelMaintenanceMode;
+@property(assign) NSNumber* distanceToEmpty;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEngineInfo.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEngineInfo.m
new file mode 100644 (file)
index 0000000..93bdac9
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEngineInfo.m
@@ -0,0 +1,69 @@
+//  SDLEngineInfo.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLEngineInfo.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLEngineInfo
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setElectricFuelConsumption:(NSNumber *) electricFuelConsumption {
+    if (electricFuelConsumption != nil) {
+        [store setObject:electricFuelConsumption forKey:NAMES_electricFuelConsumption];
+    } else {
+        [store removeObjectForKey:NAMES_electricFuelConsumption];
+    }
+}
+
+-(NSNumber*) electricFuelConsumption {
+    return [store objectForKey:NAMES_electricFuelConsumption];
+}
+
+-(void) setStateOfCharge:(NSNumber *) stateOfCharge {
+    if (stateOfCharge != nil) {
+        [store setObject:stateOfCharge forKey:NAMES_stateOfCharge];
+    } else {
+        [store removeObjectForKey:NAMES_stateOfCharge];
+    }
+}
+
+-(NSNumber*) stateOfCharge {
+    return [store objectForKey:NAMES_stateOfCharge];
+}
+
+-(void) setFuelMaintenanceMode:(SDLMaintenanceModeStatus*) fuelMaintenanceMode {
+    if (fuelMaintenanceMode != nil) {
+        [store setObject:fuelMaintenanceMode forKey:NAMES_fuelMaintenanceMode];
+    } else {
+        [store removeObjectForKey:NAMES_fuelMaintenanceMode];
+    }
+}
+
+-(SDLMaintenanceModeStatus*) fuelMaintenanceMode {
+    return [store objectForKey:NAMES_fuelMaintenanceMode];
+}
+
+-(void) setDistanceToEmpty:(NSNumber *) distanceToEmpty {
+    if (distanceToEmpty != nil) {
+        [store setObject:distanceToEmpty forKey:NAMES_distanceToEmpty];
+    } else {
+        [store removeObjectForKey:NAMES_distanceToEmpty];
+    }
+}
+
+-(NSNumber*) distanceToEmpty {
+    return [store objectForKey:NAMES_distanceToEmpty];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLEnum.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEnum.h
similarity index 69%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLEnum.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEnum.h
index 708e43e..7197665 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLEnum.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEnum.h
@@ -1,6 +1,6 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLEnum.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLEnum.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEnum.m
similarity index 64%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLEnum.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEnum.m
index 40a3292..52b750c 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLEnum.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLEnum.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLEnum.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @implementation SDLEnum
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLExternalLibrary.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLExternalLibrary.h
new file mode 100644 (file)
index 0000000..015a7c2
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLExternalLibrary.h
@@ -0,0 +1,11 @@
+//  SDLExternalLibrary.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+@protocol SDLExternalLibrary <NSObject>
+
+@required
+- (NSString*)getLibraryName;
+- (NSString*)getVersion;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLFileType.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLFileType.h
new file mode 100644 (file)
index 0000000..a9bf6a0
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLFileType.h
@@ -0,0 +1,19 @@
+//  SDLFileType.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLFileType : SDLEnum {}
+
++(SDLFileType*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLFileType*) GRAPHIC_BMP;
++(SDLFileType*) GRAPHIC_JPEG;
++(SDLFileType*) GRAPHIC_PNG;
++(SDLFileType*) AUDIO_WAVE;
++(SDLFileType*) AUDIO_MP3;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLFileType.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLFileType.m
new file mode 100644 (file)
index 0000000..c06e780
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLFileType.m
@@ -0,0 +1,73 @@
+//  SDLFileType.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLFileType.h>
+
+SDLFileType* SDLFileType_GRAPHIC_BMP = nil;
+SDLFileType* SDLFileType_GRAPHIC_JPEG = nil;
+SDLFileType* SDLFileType_GRAPHIC_PNG = nil;
+SDLFileType* SDLFileType_AUDIO_WAVE = nil;
+SDLFileType* SDLFileType_AUDIO_MP3 = nil;
+
+NSMutableArray* SDLFileType_values = nil;
+@implementation SDLFileType
+
++(SDLFileType*) valueOf:(NSString*) value {
+    for (SDLFileType* item in SDLFileType.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLFileType_values == nil) {
+        SDLFileType_values = [[NSMutableArray alloc] initWithObjects:
+                             SDLFileType.GRAPHIC_BMP,
+                             SDLFileType.GRAPHIC_JPEG,
+                             SDLFileType.GRAPHIC_PNG,
+                             SDLFileType.AUDIO_WAVE,
+                             SDLFileType.AUDIO_MP3,
+                             nil];
+    }
+    return SDLFileType_values;
+}
+
++(SDLFileType*) GRAPHIC_BMP {
+    if (SDLFileType_GRAPHIC_BMP == nil) {
+        SDLFileType_GRAPHIC_BMP = [[SDLFileType alloc] initWithValue:@"GRAPHIC_BMP"];
+    }
+    return SDLFileType_GRAPHIC_BMP;
+}
+
++(SDLFileType*) GRAPHIC_JPEG {
+    if (SDLFileType_GRAPHIC_JPEG == nil) {
+        SDLFileType_GRAPHIC_JPEG = [[SDLFileType alloc] initWithValue:@"GRAPHIC_JPEG"];
+    }
+    return SDLFileType_GRAPHIC_JPEG;
+}
+
++(SDLFileType*) GRAPHIC_PNG {
+    if (SDLFileType_GRAPHIC_PNG == nil) {
+        SDLFileType_GRAPHIC_PNG = [[SDLFileType alloc] initWithValue:@"GRAPHIC_PNG"];
+    }
+    return SDLFileType_GRAPHIC_PNG;
+}
+
++(SDLFileType*) AUDIO_WAVE {
+    if (SDLFileType_AUDIO_WAVE == nil) {
+        SDLFileType_AUDIO_WAVE = [[SDLFileType alloc] initWithValue:@"AUDIO_WAVE"];
+    }
+    return SDLFileType_AUDIO_WAVE;
+}
+
++(SDLFileType*) AUDIO_MP3 {
+    if (SDLFileType_AUDIO_MP3 == nil) {
+        SDLFileType_AUDIO_MP3 = [[SDLFileType alloc] initWithValue:@"AUDIO_MP3"];
+    }
+    return SDLFileType_AUDIO_MP3;
+}
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLFunctionID.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLFunctionID.h
new file mode 100644 (file)
index 0000000..318de4b
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLFunctionID.h
@@ -0,0 +1,15 @@
+//  SDLFunctionID.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+
+@interface SDLFunctionID : NSObject {
+
+    NSDictionary* functionIDs;
+}
+
+-(NSString*) getFunctionName:(int) functionID;
+-(NSNumber*) getFunctionID:(NSString*) functionName;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLFunctionID.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLFunctionID.m
new file mode 100644 (file)
index 0000000..6339632
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLFunctionID.m
@@ -0,0 +1,88 @@
+//  SDLFunctionID.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLFunctionID.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLFunctionID
+
+-(id) init {
+    if (self = [super init]) {}
+    
+    functionIDs = [NSDictionary dictionaryWithObjectsAndKeys:
+                      NAMES_reserved, @"0",
+                      NAMES_RegisterAppInterface, @"1",
+                      NAMES_UnregisterAppInterface, @"2",
+                      NAMES_SetGlobalProperties, @"3",
+                      NAMES_ResetGlobalProperties, @"4",
+                      NAMES_AddCommand, @"5",
+                      NAMES_DeleteCommand, @"6",
+                      NAMES_AddSubMenu, @"7",
+                      NAMES_DeleteSubMenu, @"8",
+                      NAMES_CreateInteractionChoiceSet, @"9",
+                      NAMES_PerformInteraction, @"10",
+                      NAMES_DeleteInteractionChoiceSet, @"11",
+                      NAMES_Alert, @"12",
+                      NAMES_Show, @"13",
+                      NAMES_Speak, @"14",
+                      NAMES_SetMediaClockTimer, @"15",
+                      NAMES_PerformAudioPassThru, @"16",
+                      NAMES_EndAudioPassThru,  @"17",
+                      NAMES_SubscribeButton, @"18",
+                      NAMES_UnsubscribeButton, @"19",
+                      NAMES_SubscribeVehicleData, @"20",
+                      NAMES_UnsubscribeVehicleData, @"21",
+                      NAMES_GetVehicleData, @"22",
+                      NAMES_ReadDID, @"23",
+                      NAMES_GetDTCs, @"24",
+                      NAMES_ScrollableMessage, @"25",
+                      NAMES_Slider, @"26",
+                      NAMES_ShowConstantTBT, @"27",
+                      NAMES_AlertManeuver, @"28",
+                      NAMES_UpdateTurnList, @"29",
+                      NAMES_ChangeRegistration, @"30",
+                      NAMES_GenericResponse, @"31",
+                      NAMES_PutFile, @"32",
+                      NAMES_DeleteFile, @"33",
+                      NAMES_ListFiles, @"34",
+                      NAMES_SetAppIcon, @"35",
+                      NAMES_SetDisplayLayout, @"36",
+                      
+                      NAMES_OnHMIStatus, @"32768",
+                      NAMES_OnAppInterfaceUnregistered, @"32769",
+                      NAMES_OnButtonEvent, @"32770",
+                      NAMES_OnButtonPress, @"32771",
+                      NAMES_OnVehicleData, @"32772",
+                      NAMES_OnCommand, @"32773",
+                      NAMES_OnTBTClientState, @"32774",
+                      NAMES_OnDriverDistraction, @"32775",
+                      NAMES_OnPermissionsChange, @"32776",
+                      NAMES_OnAudioPassThru, @"32777",
+                      NAMES_OnLanguageChange, @"32778",
+                      
+                      NAMES_EncodedSyncPData, @"65536",
+                      NAMES_SyncPData, @"65537",
+                      
+                      NAMES_OnEncodedSyncPData, @"98304",
+                      NAMES_OnSyncPData, @"98405",
+                      nil];
+    
+    
+    return self;
+}
+
+-(NSString *)getFunctionName:(int) functionID{
+
+    return [functionIDs objectForKey:[NSString stringWithFormat:@"%d", functionID]];
+}
+
+
+-(NSNumber*) getFunctionID:(NSString*) functionName{
+
+    return [NSNumber numberWithInt:[[[functionIDs allKeysForObject:functionName] objectAtIndex:0] intValue]];
+}
+
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGPSData.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGPSData.h
new file mode 100644 (file)
index 0000000..40a16f0
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGPSData.h
@@ -0,0 +1,35 @@
+//  SDLGPSData.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLCompassDirection.h>
+#import <SmartDeviceLink/SDLDimension.h>
+
+@interface SDLGPSData : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* longitudeDegrees;
+@property(assign) NSNumber* latitudeDegrees;
+@property(assign) NSNumber* utcYear;
+@property(assign) NSNumber* utcMonth;
+@property(assign) NSNumber* utcDay;
+@property(assign) NSNumber* utcHours;
+@property(assign) NSNumber* utcMinutes;
+@property(assign) NSNumber* utcSeconds;
+@property(assign) SDLCompassDirection* compassDirection;
+@property(assign) NSNumber* pdop;
+@property(assign) NSNumber* hdop;
+@property(assign) NSNumber* vdop;
+@property(assign) NSNumber* actual;
+@property(assign) NSNumber* satellites;
+@property(assign) SDLDimension* dimension;
+@property(assign) NSNumber* altitude;
+@property(assign) NSNumber* heading;
+@property(assign) NSNumber* speed;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGPSData.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGPSData.m
new file mode 100644 (file)
index 0000000..397efea
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGPSData.m
@@ -0,0 +1,237 @@
+//  SDLGPSData.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLGPSData.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLGPSData
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setLongitudeDegrees:(NSNumber *) longitudeDegrees {
+    if (longitudeDegrees != nil) {
+        [store setObject:longitudeDegrees forKey:NAMES_longitudeDegrees];
+    } else {
+        [store removeObjectForKey:NAMES_longitudeDegrees];
+    }
+}
+
+-(NSNumber*) longitudeDegrees {
+    return [store objectForKey:NAMES_longitudeDegrees];
+}
+
+-(void) setLatitudeDegrees:(NSNumber *) latitudeDegrees {
+    if (latitudeDegrees != nil) {
+        [store setObject:latitudeDegrees forKey:NAMES_latitudeDegrees];
+    } else {
+        [store removeObjectForKey:NAMES_latitudeDegrees];
+    }
+}
+
+-(NSNumber*) latitudeDegrees {
+    return [store objectForKey:NAMES_latitudeDegrees];
+}
+
+-(void) setUtcYear:(NSNumber *) utcYear {
+    if (utcYear != nil) {
+        [store setObject:utcYear forKey:NAMES_utcYear];
+    } else {
+        [store removeObjectForKey:NAMES_utcYear];
+    }
+}
+
+-(NSNumber*) utcYear {
+    return [store objectForKey:NAMES_utcYear];
+}
+
+-(void) setUtcMonth:(NSNumber *) utcMonth {
+    if (utcMonth != nil) {
+        [store setObject:utcMonth forKey:NAMES_utcMonth];
+    } else {
+        [store removeObjectForKey:NAMES_utcMonth];
+    }
+}
+
+-(NSNumber*) utcMonth {
+    return [store objectForKey:NAMES_utcMonth];
+}
+
+-(void) setUtcDay:(NSNumber *) utcDay {
+    if (utcDay != nil) {
+        [store setObject:utcDay forKey:NAMES_utcDay];
+    } else {
+        [store removeObjectForKey:NAMES_utcDay];
+    }
+}
+
+-(NSNumber*) utcDay {
+    return [store objectForKey:NAMES_utcDay];
+}
+
+-(void) setUtcHours:(NSNumber *) utcHours {
+    if (utcHours != nil) {
+        [store setObject:utcHours forKey:NAMES_utcHours];
+    } else {
+        [store removeObjectForKey:NAMES_utcHours];
+    }
+}
+
+-(NSNumber*) utcHours {
+    return [store objectForKey:NAMES_utcHours];
+}
+
+-(void) setUtcMinutes:(NSNumber *) utcMinutes {
+    if (utcMinutes != nil) {
+        [store setObject:utcMinutes forKey:NAMES_utcMinutes];
+    } else {
+        [store removeObjectForKey:NAMES_utcMinutes];
+    }
+}
+
+-(NSNumber*) utcMinutes {
+    return [store objectForKey:NAMES_utcMinutes];
+}
+
+-(void) setUtcSeconds:(NSNumber *) utcSeconds {
+    if (utcSeconds != nil) {
+        [store setObject:utcSeconds forKey:NAMES_utcSeconds];
+    } else {
+        [store removeObjectForKey:NAMES_utcSeconds];
+    }
+}
+
+-(NSNumber*) utcSeconds {
+    return [store objectForKey:NAMES_utcSeconds];
+}
+
+-(void) setCompassDirection:(SDLCompassDirection *) compassDirection {
+    if (compassDirection != nil) {
+        [store setObject:compassDirection forKey:NAMES_compassDirection];
+    } else {
+        [store removeObjectForKey:NAMES_compassDirection];
+    }
+}
+
+-(SDLCompassDirection*) compassDirection {
+    return [store objectForKey:NAMES_compassDirection];
+}
+
+-(void) setPdop:(NSNumber *) pdop {
+    if (pdop != nil) {
+        [store setObject:pdop forKey:NAMES_pdop];
+    } else {
+        [store removeObjectForKey:NAMES_pdop];
+    }
+}
+
+-(NSNumber*) pdop {
+    return [store objectForKey:NAMES_pdop];
+}
+
+-(void) setHdop:(NSNumber *) hdop {
+    if (hdop != nil) {
+        [store setObject:hdop forKey:NAMES_hdop];
+    } else {
+        [store removeObjectForKey:NAMES_hdop];
+    }
+}
+
+-(NSNumber*) hdop {
+    return [store objectForKey:NAMES_hdop];
+}
+
+-(void) setVdop:(NSNumber *) vdop {
+    if (vdop != nil) {
+        [store setObject:vdop forKey:NAMES_vdop];
+    } else {
+        [store removeObjectForKey:NAMES_vdop];
+    }
+}
+
+-(NSNumber*) vdop {
+    return [store objectForKey:NAMES_vdop];
+}
+
+-(void) setActual:(NSNumber *) actual {
+    if (actual != nil) {
+        [store setObject:actual forKey:NAMES_actual];
+    } else {
+        [store removeObjectForKey:NAMES_actual];
+    }
+}
+
+-(NSNumber*) actual {
+    return [store objectForKey:NAMES_actual];
+}
+
+-(void) setSatellites:(NSNumber *) satellites {
+    if (satellites != nil) {
+        [store setObject:satellites forKey:NAMES_satellites];
+    } else {
+        [store removeObjectForKey:NAMES_satellites];
+    }
+}
+
+-(NSNumber*) satellites {
+    return [store objectForKey:NAMES_satellites];
+}
+
+-(void) setDimension:(SDLDimension *) dimension {
+    if (dimension != nil) {
+        [store setObject:dimension forKey:NAMES_dimension];
+    } else {
+        [store removeObjectForKey:NAMES_dimension];
+    }
+}
+
+-(SDLCompassDirection*) dimension {
+    return [store objectForKey:NAMES_dimension];
+}
+
+-(void) setAltitude:(NSNumber *) altitude {
+    if (altitude != nil) {
+        [store setObject:altitude forKey:NAMES_altitude];
+    } else {
+        [store removeObjectForKey:NAMES_altitude];
+    }
+}
+
+-(NSNumber*) altitude {
+    return [store objectForKey:NAMES_altitude];
+}
+
+-(void) setHeading:(NSNumber *) heading {
+    if (heading != nil) {
+        [store setObject:heading forKey:NAMES_heading];
+    } else {
+        [store removeObjectForKey:NAMES_heading];
+    }
+}
+
+-(NSNumber*) heading {
+    return [store objectForKey:NAMES_heading];
+}
+
+-(void) setSpeed:(NSNumber *) speed {
+    if (speed != nil) {
+        [store setObject:speed forKey:NAMES_speed];
+    } else {
+        [store removeObjectForKey:NAMES_speed];
+    }
+}
+
+-(NSNumber*) speed {
+    return [store objectForKey:NAMES_speed];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLGenericResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGenericResponse.h
similarity index 55%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLGenericResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGenericResponse.h
index de5be0f..2966855 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLGenericResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGenericResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLGenericResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLGenericResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLGenericResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGenericResponse.m
similarity index 60%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLGenericResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGenericResponse.m
index e062b2d..3ff53f0 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLGenericResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGenericResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLGenericResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLGenericResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLGenericResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLGenericResponse
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetDTCs.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetDTCs.h
new file mode 100644 (file)
index 0000000..5441cfb
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetDTCs.h
@@ -0,0 +1,16 @@
+//  SDLGetDTCs.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+@interface SDLGetDTCs : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* ecuName;
+@property(assign) NSNumber* dtcMask;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetDTCs.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetDTCs.m
new file mode 100644 (file)
index 0000000..9f9fdc5
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetDTCs.m
@@ -0,0 +1,45 @@
+//  SDLGetDTCs.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLGetDTCs.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLGetDTCs
+
+-(id) init {
+    if (self = [super initWithName:NAMES_GetDTCs]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setEcuName:(NSNumber *) ecuName {
+    if (ecuName != nil) {
+        [parameters setObject:ecuName forKey:NAMES_ecuName];
+    } else {
+        [parameters removeObjectForKey:NAMES_ecuName];
+    }
+}
+
+-(NSNumber*) ecuName {
+    return [parameters objectForKey:NAMES_ecuName];
+}
+
+-(void) setDtcMask:(NSNumber *) dtcMask {
+    if (dtcMask != nil) {
+        [parameters setObject:dtcMask forKey:NAMES_dtcMask];
+    } else {
+        [parameters removeObjectForKey:NAMES_dtcMask];
+    }
+}
+
+-(NSNumber*) dtcMask {
+    return [parameters objectForKey:NAMES_dtcMask];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetDTCsResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetDTCsResponse.h
new file mode 100644 (file)
index 0000000..6185ff9
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetDTCsResponse.h
@@ -0,0 +1,18 @@
+//  SDLGetDTCsResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+#import <SmartDeviceLink/SDLVehicleDataResultCode.h>
+
+@interface SDLGetDTCsResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* ecuHeader;
+@property(assign) NSMutableArray* dtc;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetDTCsResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetDTCsResponse.m
new file mode 100644 (file)
index 0000000..1e8b866
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetDTCsResponse.m
@@ -0,0 +1,45 @@
+//  SDLGetDTCsResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLGetDTCsResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLGetDTCsResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_GetDTCs]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setEcuHeader:(NSNumber*) ecuHeader {
+    if (ecuHeader != nil) {
+        [parameters setObject:ecuHeader forKey:NAMES_ecuHeader];
+    } else {
+        [parameters removeObjectForKey:NAMES_ecuHeader];
+    }
+}
+
+-(NSNumber*) ecuHeader {
+    return [parameters objectForKey:NAMES_ecuHeader];
+}
+
+-(void) setDtc:(NSMutableArray *) dtc {
+    if (dtc != nil) {
+        [parameters setObject:dtc forKey:NAMES_dtc];
+    } else {
+        [parameters removeObjectForKey:NAMES_dtc];
+    }
+}
+
+-(NSMutableArray*) dtc {
+    return [parameters objectForKey:NAMES_dtc];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetVehicleData.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetVehicleData.h
new file mode 100644 (file)
index 0000000..b831c5a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetVehicleData.h
@@ -0,0 +1,36 @@
+//  SDLGetVehicleData.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+#import <SmartDeviceLink/SDLVehicleDataType.h>
+
+@interface SDLGetVehicleData : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* gps;
+@property(assign) NSNumber* speed;
+@property(assign) NSNumber* rpm;
+@property(assign) NSNumber* fuelLevel;
+@property(assign) NSNumber* fuelLevelState;
+@property(assign) NSNumber* instantFuelConsumption;
+@property(assign) NSNumber* externalTemperature;
+@property(assign) NSNumber* vin;
+@property(assign) NSNumber* prndl;
+@property(assign) NSNumber* tirePressure;
+@property(assign) NSNumber* odometer;
+@property(assign) NSNumber* beltStatus;
+@property(assign) NSNumber* bodyInformation;
+@property(assign) NSNumber* deviceStatus;
+@property(assign) NSNumber* driverBraking;
+@property(assign) NSNumber* wiperStatus;
+@property(assign) NSNumber* headLampStatus;
+@property(assign) NSNumber* engineTorque;
+@property(assign) NSNumber* accPedalPosition;
+@property(assign) NSNumber* steeringWheelAngle;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetVehicleData.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetVehicleData.m
new file mode 100644 (file)
index 0000000..80ca879
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetVehicleData.m
@@ -0,0 +1,261 @@
+//  SDLGetVehicleData.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLGetVehicleData.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLGetVehicleData
+
+-(id) init {
+    if (self = [super initWithName:NAMES_GetVehicleData]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setGps:(NSNumber *) gps {
+    if (gps != nil) {
+        [parameters setObject:gps forKey:NAMES_gps];
+    } else {
+        [parameters removeObjectForKey:NAMES_gps];
+    }
+}
+
+-(NSNumber*) gps {
+    return [parameters objectForKey:NAMES_gps];
+}
+
+-(void) setSpeed:(NSNumber *) speed {
+    if (speed != nil) {
+        [parameters setObject:speed forKey:NAMES_speed];
+    } else {
+        [parameters removeObjectForKey:NAMES_speed];
+    }
+}
+
+-(NSNumber*) speed {
+    return [parameters objectForKey:NAMES_speed];
+}
+
+-(void) setRpm:(NSNumber *) rpm {
+    if (rpm != nil) {
+        [parameters setObject:rpm forKey:NAMES_rpm];
+    } else {
+        [parameters removeObjectForKey:NAMES_rpm];
+    }
+}
+
+-(NSNumber*) rpm {
+    return [parameters objectForKey:NAMES_rpm];
+}
+
+-(void) setFuelLevel:(NSNumber *) fuelLevel {
+    if (fuelLevel != nil) {
+        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevel];
+    }
+}
+
+-(NSNumber*) fuelLevel {
+    return [parameters objectForKey:NAMES_fuelLevel];
+}
+
+-(void) setFuelLevelState:(NSNumber *) fuelLevelState {
+    if (fuelLevelState != nil) {
+        [parameters setObject:fuelLevelState forKey:NAMES_fuelLevelState];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevelState];
+    }
+}
+
+-(NSNumber*) fuelLevelState {
+    return [parameters objectForKey:NAMES_fuelLevelState];
+}
+
+-(void) setInstantFuelConsumption:(NSNumber *) instantFuelConsumption {
+    if (instantFuelConsumption != nil) {
+        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+    } else {
+        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+    }
+}
+
+-(NSNumber*) instantFuelConsumption {
+    return [parameters objectForKey:NAMES_instantFuelConsumption];
+}
+
+-(void) setExternalTemperature:(NSNumber *) externalTemperature {
+    if (externalTemperature != nil) {
+        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+    } else {
+        [parameters removeObjectForKey:NAMES_externalTemperature];
+    }
+}
+
+-(NSNumber*) externalTemperature {
+    return [parameters objectForKey:NAMES_externalTemperature];
+}
+
+-(void) setVin:(NSNumber *) vin {
+    if (vin != nil) {
+        [parameters setObject:vin forKey:NAMES_vin];
+    } else {
+        [parameters removeObjectForKey:NAMES_vin];
+    }
+}
+
+-(NSNumber*) vin {
+    return [parameters objectForKey:NAMES_vin];
+}
+
+-(void) setPrndl:(NSNumber *) prndl {
+    if (prndl != nil) {
+        [parameters setObject:prndl forKey:NAMES_prndl];
+    } else {
+        [parameters removeObjectForKey:NAMES_prndl];
+    }
+}
+
+-(NSNumber*) prndl {
+    return [parameters objectForKey:NAMES_prndl];
+}
+
+-(void) setTirePressure:(NSNumber *) tirePressure {
+    if (tirePressure != nil) {
+        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+    } else {
+        [parameters removeObjectForKey:NAMES_tirePressure];
+    }
+}
+
+-(NSNumber*) tirePressure {
+    return [parameters objectForKey:NAMES_tirePressure];
+}
+
+-(void) setOdometer:(NSNumber *) odometer {
+    if (odometer != nil) {
+        [parameters setObject:odometer forKey:NAMES_odometer];
+    } else {
+        [parameters removeObjectForKey:NAMES_odometer];
+    }
+}
+
+-(NSNumber*) odometer {
+    return [parameters objectForKey:NAMES_odometer];
+}
+
+-(void) setBeltStatus:(NSNumber *) beltStatus {
+    if (beltStatus != nil) {
+        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_beltStatus];
+    }
+}
+
+-(NSNumber*) beltStatus {
+    return [parameters objectForKey:NAMES_beltStatus];
+}
+
+-(void) setBodyInformation:(NSNumber *) bodyInformation {
+    if (bodyInformation != nil) {
+        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+    } else {
+        [parameters removeObjectForKey:NAMES_bodyInformation];
+    }
+}
+
+-(NSNumber*) bodyInformation {
+    return [parameters objectForKey:NAMES_bodyInformation];
+}
+
+-(void) setDeviceStatus:(NSNumber *) deviceStatus {
+    if (deviceStatus != nil) {
+        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_deviceStatus];
+    }
+}
+
+-(NSNumber*) deviceStatus {
+    return [parameters objectForKey:NAMES_deviceStatus];
+}
+
+-(void) setDriverBraking:(NSNumber *) driverBraking {
+    if (driverBraking != nil) {
+        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+    } else {
+        [parameters removeObjectForKey:NAMES_driverBraking];
+    }
+}
+
+-(NSNumber*) driverBraking {
+    return [parameters objectForKey:NAMES_driverBraking];
+}
+
+-(void) setWiperStatus:(NSNumber *) wiperStatus {
+    if (wiperStatus != nil) {
+        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_wiperStatus];
+    }
+}
+
+-(NSNumber*) wiperStatus {
+    return [parameters objectForKey:NAMES_wiperStatus];
+}
+
+-(void) setHeadLampStatus:(NSNumber *) headLampStatus {
+    if (headLampStatus != nil) {
+        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_headLampStatus];
+    }
+}
+
+-(NSNumber*) headLampStatus {
+    return [parameters objectForKey:NAMES_headLampStatus];
+}
+
+-(void) setEngineTorque:(NSNumber *) engineTorque {
+    if (engineTorque != nil) {
+        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+    } else {
+        [parameters removeObjectForKey:NAMES_engineTorque];
+    }
+}
+
+-(NSNumber*) engineTorque {
+    return [parameters objectForKey:NAMES_engineTorque];
+}
+
+-(void) setAccPedalPosition:(NSNumber *) accPedalPosition {
+    if (accPedalPosition != nil) {
+        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+    } else {
+        [parameters removeObjectForKey:NAMES_accPedalPosition];
+    }
+}
+
+-(NSNumber*) accPedalPosition {
+    return [parameters objectForKey:NAMES_accPedalPosition];
+}
+
+-(void) setSteeringWheelAngle:(NSNumber *) steeringWheelAngle {
+    if (steeringWheelAngle != nil) {
+        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+    } else {
+        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+    }
+}
+
+-(NSNumber*) steeringWheelAngle {
+    return [parameters objectForKey:NAMES_steeringWheelAngle];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetVehicleDataResponse.h
new file mode 100644 (file)
index 0000000..f1508a5
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetVehicleDataResponse.h
@@ -0,0 +1,45 @@
+//  SDLGetVehicleDataResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+#import <SmartDeviceLink/SDLBeltStatus.h>
+#import <SmartDeviceLink/SDLBodyInformation.h>
+#import <SmartDeviceLink/SDLComponentVolumeStatus.h>
+#import <SmartDeviceLink/SDLDeviceStatus.h>
+#import <SmartDeviceLink/SDLGPSData.h>
+#import <SmartDeviceLink/SDLHeadLampStatus.h>
+#import <SmartDeviceLink/SDLPRNDL.h>
+#import <SmartDeviceLink/SDLTireStatus.h>
+#import <SmartDeviceLink/SDLVehicleDataEventStatus.h>
+#import <SmartDeviceLink/SDLWiperStatus.h>
+
+@interface SDLGetVehicleDataResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLGPSData* gps;
+@property(assign) NSNumber* speed;
+@property(assign) NSNumber* rpm;
+@property(assign) NSNumber* fuelLevel;
+@property(assign) SDLComponentVolumeStatus* fuelLevelState;
+@property(assign) NSNumber* instantFuelConsumption;
+@property(assign) NSNumber* externalTemperature;
+@property(assign) NSString* vin;
+@property(assign) SDLPRNDL* prndl;
+@property(assign) SDLTireStatus* tirePressure;
+@property(assign) NSNumber* odometer;
+@property(assign) SDLBeltStatus* beltStatus;
+@property(assign) SDLBodyInformation* bodyInformation;
+@property(assign) SDLDeviceStatus* deviceStatus;
+@property(assign) SDLVehicleDataEventStatus* driverBraking;
+@property(assign) SDLWiperStatus* wiperStatus;
+@property(assign) SDLHeadLampStatus* headLampStatus;
+@property(assign) NSNumber* engineTorque;
+@property(assign) NSNumber* accPedalPosition;
+@property(assign) NSNumber* steeringWheelAngle;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetVehicleDataResponse.m
new file mode 100644 (file)
index 0000000..696db0d
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGetVehicleDataResponse.m
@@ -0,0 +1,311 @@
+//  SDLGetVehicleDataResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLGetVehicleDataResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLGetVehicleDataResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_GetVehicleData]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setGps:(SDLGPSData*) gps {
+    if (gps != nil) {
+        [parameters setObject:gps forKey:NAMES_gps];
+    } else {
+        [parameters removeObjectForKey:NAMES_gps];
+    }
+}
+
+-(SDLGPSData*) gps {
+    NSObject* obj = [parameters objectForKey:NAMES_gps];
+    if ([obj isKindOfClass:SDLGPSData.class]) {
+        return (SDLGPSData*)obj;
+    } else {
+        return [[[SDLGPSData alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setSpeed:(NSNumber*) speed {
+    if (speed != nil) {
+        [parameters setObject:speed forKey:NAMES_speed];
+    } else {
+        [parameters removeObjectForKey:NAMES_speed];
+    }
+}
+
+-(NSNumber*) speed {
+    return [parameters objectForKey:NAMES_speed];
+}
+
+-(void) setRpm:(NSNumber*) rpm {
+    if (rpm != nil) {
+        [parameters setObject:rpm forKey:NAMES_rpm];
+    } else {
+        [parameters removeObjectForKey:NAMES_rpm];
+    }
+}
+
+-(NSNumber*) rpm {
+    return [parameters objectForKey:NAMES_rpm];
+}
+
+-(void) setFuelLevel:(NSNumber*) fuelLevel {
+    if (fuelLevel != nil) {
+        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevel];
+    }
+}
+
+-(NSNumber*) fuelLevel {
+    return [parameters objectForKey:NAMES_fuelLevel];
+}
+
+-(void) setFuelLevelState:(SDLComponentVolumeStatus*) fuelLevelState {
+    if (fuelLevelState != nil) {
+        [parameters setObject:fuelLevelState forKey:NAMES_fuelLevelState];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevelState];
+    }
+}
+
+-(SDLComponentVolumeStatus*) fuelLevelState {
+    NSObject* obj = [parameters objectForKey:NAMES_fuelLevelState];
+    if ([obj isKindOfClass:SDLComponentVolumeStatus.class]) {
+        return (SDLComponentVolumeStatus*)obj;
+    } else {
+        return [SDLComponentVolumeStatus valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setInstantFuelConsumption:(NSNumber*) instantFuelConsumption {
+    if (instantFuelConsumption != nil) {
+        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+    } else {
+        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+    }
+}
+
+-(NSNumber*) instantFuelConsumption {
+    return [parameters objectForKey:NAMES_instantFuelConsumption];
+}
+
+-(void) setExternalTemperature:(NSNumber*) externalTemperature {
+    if (externalTemperature != nil) {
+        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+    } else {
+        [parameters removeObjectForKey:NAMES_externalTemperature];
+    }
+}
+
+-(NSNumber*) externalTemperature {
+    return [parameters objectForKey:NAMES_externalTemperature];
+}
+
+-(void) setVin:(NSString*) vin {
+    if (vin != nil) {
+        [parameters setObject:vin forKey:NAMES_vin];
+    } else {
+        [parameters removeObjectForKey:NAMES_vin];
+    }
+}
+
+-(NSString*) vin {
+    return [parameters objectForKey:NAMES_vin];
+}
+
+-(void) setPrndl:(SDLPRNDL*) prndl {
+    if (prndl != nil) {
+        [parameters setObject:prndl forKey:NAMES_prndl];
+    } else {
+        [parameters removeObjectForKey:NAMES_prndl];
+    }
+}
+
+-(SDLPRNDL*) prndl {
+    NSObject* obj = [parameters objectForKey:NAMES_prndl];
+    if ([obj isKindOfClass:SDLPRNDL.class]) {
+        return (SDLPRNDL*)obj;
+    } else {
+        return [SDLPRNDL valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setTirePressure:(SDLTireStatus*) tirePressure {
+    if (tirePressure != nil) {
+        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+    } else {
+        [parameters removeObjectForKey:NAMES_tirePressure];
+    }
+}
+
+-(SDLTireStatus*) tirePressure {
+    NSObject* obj = [parameters objectForKey:NAMES_tirePressure];
+    if ([obj isKindOfClass:SDLTireStatus.class]) {
+        return (SDLTireStatus*)obj;
+    } else {
+        return [[[SDLTireStatus alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setOdometer:(NSNumber*) odometer {
+    if (odometer != nil) {
+        [parameters setObject:odometer forKey:NAMES_odometer];
+    } else {
+        [parameters removeObjectForKey:NAMES_odometer];
+    }
+}
+
+-(NSNumber*) odometer {
+    return [parameters objectForKey:NAMES_odometer];
+}
+
+-(void) setBeltStatus:(SDLBeltStatus*) beltStatus {
+    if (beltStatus != nil) {
+        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_beltStatus];
+    }
+}
+
+-(SDLBeltStatus*) beltStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_beltStatus];
+    if ([obj isKindOfClass:SDLBeltStatus.class]) {
+        return (SDLBeltStatus*)obj;
+    } else {
+        return [[[SDLBeltStatus alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setBodyInformation:(SDLBodyInformation*) bodyInformation {
+    if (bodyInformation != nil) {
+        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+    } else {
+        [parameters removeObjectForKey:NAMES_bodyInformation];
+    }
+}
+
+-(SDLBodyInformation*) bodyInformation {
+    NSObject* obj = [parameters objectForKey:NAMES_bodyInformation];
+    if ([obj isKindOfClass:SDLBodyInformation.class]) {
+        return (SDLBodyInformation*)obj;
+    } else {
+        return [[[SDLBodyInformation alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setDeviceStatus:(SDLDeviceStatus*) deviceStatus {
+    if (deviceStatus != nil) {
+        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_deviceStatus];
+    }
+}
+
+-(SDLDeviceStatus*) deviceStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_deviceStatus];
+    if ([obj isKindOfClass:SDLDeviceStatus.class]) {
+        return (SDLDeviceStatus*)obj;
+    } else {
+        return [[[SDLDeviceStatus alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setDriverBraking:(SDLVehicleDataEventStatus*) driverBraking {
+    if (driverBraking != nil) {
+        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+    } else {
+        [parameters removeObjectForKey:NAMES_driverBraking];
+    }
+}
+
+-(SDLVehicleDataEventStatus*) driverBraking {
+    NSObject* obj = [parameters objectForKey:NAMES_driverBraking];
+    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+        return (SDLVehicleDataEventStatus*)obj;
+    } else {
+        return [SDLVehicleDataEventStatus valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setWiperStatus:(SDLWiperStatus*) wiperStatus {
+    if (wiperStatus != nil) {
+        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_wiperStatus];
+    }
+}
+
+-(SDLWiperStatus*) wiperStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_wiperStatus];
+    if ([obj isKindOfClass:SDLWiperStatus.class]) {
+        return (SDLWiperStatus*)obj;
+    } else {
+        return [SDLWiperStatus valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setHeadLampStatus:(SDLHeadLampStatus*) headLampStatus {
+    if (headLampStatus != nil) {
+        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_headLampStatus];
+    }
+}
+
+-(SDLHeadLampStatus*) headLampStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_headLampStatus];
+    if ([obj isKindOfClass:SDLHeadLampStatus.class]) {
+        return (SDLHeadLampStatus*)obj;
+    } else {
+        return [[[SDLHeadLampStatus alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setEngineTorque:(NSNumber*) engineTorque {
+    if (engineTorque != nil) {
+        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+    } else {
+        [parameters removeObjectForKey:NAMES_engineTorque];
+    }
+}
+
+-(NSNumber*) engineTorque {
+    return [parameters objectForKey:NAMES_engineTorque];
+}
+
+-(void) setAccPedalPosition:(NSNumber*) accPedalPosition {
+    if (accPedalPosition != nil) {
+        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+    } else {
+        [parameters removeObjectForKey:NAMES_accPedalPosition];
+    }
+}
+
+-(NSNumber*) accPedalPosition {
+    return [parameters objectForKey:NAMES_accPedalPosition];
+}
+
+-(void) setSteeringWheelAngle:(NSNumber*) steeringWheelAngle {
+    if (steeringWheelAngle != nil) {
+        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+    } else {
+        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+    }
+}
+
+-(NSNumber*) steeringWheelAngle {
+    return [parameters objectForKey:NAMES_steeringWheelAngle];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLGlobalProperty.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGlobalProperty.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLGlobalProperty.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGlobalProperty.h
index 4323286..30d5a82 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLGlobalProperty.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGlobalProperty.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLGlobalProperty.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLGlobalProperty : SDLEnum {}
 
@@ -12,5 +12,7 @@
 
 +(SDLGlobalProperty*) HELPPROMPT;
 +(SDLGlobalProperty*) TIMEOUTPROMPT;
++(SDLGlobalProperty*) VRHELPTITLE;
++(SDLGlobalProperty*) VRHELPITEMS;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLGlobalProperty.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGlobalProperty.m
similarity index 63%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLGlobalProperty.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGlobalProperty.m
index aab2940..d54f3ba 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLGlobalProperty.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLGlobalProperty.m
@@ -1,11 +1,13 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLGlobalProperty.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLGlobalProperty.h"
+#import <SmartDeviceLink/SDLGlobalProperty.h>
 
 SDLGlobalProperty* SDLGlobalProperty_HELPPROMPT = nil;
 SDLGlobalProperty* SDLGlobalProperty_TIMEOUTPROMPT = nil;
+SDLGlobalProperty* SDLGlobalProperty_VRHELPTITLE = nil;
+SDLGlobalProperty* SDLGlobalProperty_VRHELPITEMS = nil;
 
 NSMutableArray* SDLGlobalProperty_values = nil;
 @implementation SDLGlobalProperty
@@ -43,4 +45,18 @@ NSMutableArray* SDLGlobalProperty_values = nil;
        return SDLGlobalProperty_TIMEOUTPROMPT;
 }
 
++(SDLGlobalProperty*) VRHELPTITLE {
+    if (SDLGlobalProperty_VRHELPTITLE == nil) {
+        SDLGlobalProperty_VRHELPTITLE = [[SDLGlobalProperty alloc] initWithValue:@"VRHELPTITLE"];
+    }
+    return SDLGlobalProperty_VRHELPTITLE;
+}
+
++(SDLGlobalProperty*) VRHELPITEMS {
+    if (SDLGlobalProperty_VRHELPITEMS == nil) {
+        SDLGlobalProperty_VRHELPITEMS = [[SDLGlobalProperty alloc] initWithValue:@"VRHELPITEMS"];
+    }
+    return SDLGlobalProperty_VRHELPITEMS;
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLHMILevel.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMILevel.h
similarity index 69%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLHMILevel.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMILevel.h
index 17bf942..3617568 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLHMILevel.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMILevel.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLHMILevel.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLHMILevel : SDLEnum {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLHMILevel.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMILevel.m
similarity index 93%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLHMILevel.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMILevel.m
index 4959af0..379d3ad 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLHMILevel.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMILevel.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLHMILevel.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLHMILevel.h"
+#import <SmartDeviceLink/SDLHMILevel.h>
 
 SDLHMILevel* SDLHMILevel_HMI_FULL = nil;
 SDLHMILevel* SDLHMILevel_HMI_LIMITED = nil;

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMIPermissions.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMIPermissions.h
new file mode 100644 (file)
index 0000000..7c616df
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMIPermissions.h
@@ -0,0 +1,16 @@
+//  SDLHMIPermissions.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+@interface SDLHMIPermissions : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSMutableArray* allowed;
+@property(assign) NSMutableArray* userDisallowed;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMIPermissions.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMIPermissions.m
new file mode 100644 (file)
index 0000000..7cf5320
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMIPermissions.m
@@ -0,0 +1,64 @@
+//  SDLHMIPermissions.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLHMIPermissions.h>
+
+#import <SmartDeviceLink/SDLHMILevel.h>
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLHMIPermissions
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setAllowed:(NSMutableArray*) allowed {
+    if (allowed != nil) {
+        [store setObject:allowed forKey:NAMES_allowed];
+    } else {
+        [store removeObjectForKey:NAMES_allowed];
+    }
+}
+
+-(NSMutableArray*) allowed {
+    NSMutableArray* array = [store objectForKey:NAMES_allowed];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLHMILevel.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSString* enumString in array) {
+            [newList addObject:[SDLHMILevel valueOf:enumString]];
+        }
+        return newList;
+    }
+}
+
+-(void) setUserDisallowed:(NSMutableArray*) userDisallowed {
+    if (userDisallowed != nil) {
+        [store setObject:userDisallowed forKey:NAMES_userDisallowed];
+    } else {
+        [store removeObjectForKey:NAMES_userDisallowed];
+    }
+}
+
+-(NSMutableArray*) userDisallowed {
+    NSMutableArray* array = [store objectForKey:NAMES_userDisallowed];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLHMILevel.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSString* enumString in array) {
+            [newList addObject:[SDLHMILevel valueOf:enumString]];
+        }
+        return newList;
+    }
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLHMIZoneCapabilities.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMIZoneCapabilities.h
similarity index 65%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLHMIZoneCapabilities.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMIZoneCapabilities.h
index 16a833e..781903d 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLHMIZoneCapabilities.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMIZoneCapabilities.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLHMIZoneCapabilities.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLHMIZoneCapabilities : SDLEnum {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLHMIZoneCapabilities.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMIZoneCapabilities.m
similarity index 89%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLHMIZoneCapabilities.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMIZoneCapabilities.m
index 33da65a..f2b96fe 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLHMIZoneCapabilities.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHMIZoneCapabilities.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLHMIZoneCapabilities.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLHMIZoneCapabilities.h"
+#import <SmartDeviceLink/SDLHMIZoneCapabilities.h>
 
 SDLHMIZoneCapabilities* SDLHMIZoneCapabilities_FRONT = nil;
 SDLHMIZoneCapabilities* SDLHMIZoneCapabilities_BACK = nil;

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHeadLampStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHeadLampStatus.h
new file mode 100644 (file)
index 0000000..def4967
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHeadLampStatus.h
@@ -0,0 +1,16 @@
+//  SDLHeadLampStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+@interface SDLHeadLampStatus : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* lowBeamsOn;
+@property(assign) NSNumber* highBeamsOn;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHeadLampStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHeadLampStatus.m
new file mode 100644 (file)
index 0000000..eca98f1
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLHeadLampStatus.m
@@ -0,0 +1,45 @@
+//  SDLHeadLampStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLHeadLampStatus.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLHeadLampStatus
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setLowBeamsOn:(NSNumber *) lowBeamsOn {
+    if (lowBeamsOn != nil) {
+        [store setObject:lowBeamsOn forKey:NAMES_lowBeamsOn];
+    } else {
+        [store removeObjectForKey:NAMES_lowBeamsOn];
+    }
+}
+
+-(NSNumber*) lowBeamsOn {
+    return [store objectForKey:NAMES_lowBeamsOn];
+}
+
+-(void) setHighBeamsOn:(NSNumber *) highBeamsOn {
+    if (highBeamsOn != nil) {
+        [store setObject:highBeamsOn forKey:NAMES_highBeamsOn];
+    } else {
+        [store removeObjectForKey:NAMES_highBeamsOn];
+    }
+}
+
+-(NSNumber*) highBeamsOn {
+    return [store objectForKey:NAMES_highBeamsOn];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIAPTransport.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIAPTransport.h
similarity index 83%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIAPTransport.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIAPTransport.h
index 5dfd12f..37251c7 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIAPTransport.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIAPTransport.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLIAPTransport.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLAbstractTransport.h"
+#import <SmartDeviceLink/SDLAbstractTransport.h>
 #import <ExternalAccessory/ExternalAccessory.h>
 
 @interface SDLIAPTransport : SDLAbstractTransport<NSStreamDelegate> {

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIAPTransport.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIAPTransport.m
similarity index 87%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIAPTransport.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIAPTransport.m
index 32e7cc2..fbea9c6 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIAPTransport.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIAPTransport.m
@@ -1,15 +1,14 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLIAPTransport.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLIAPTransport.h"
-#import "SDLDebugTool.h"
-#import "SDLSiphonServer.h"
+#import <SmartDeviceLink/SDLIAPTransport.h>
+#import <SmartDeviceLink/SDLDebugTool.h>
+#import <SmartDeviceLink/SDLSiphonServer.h>
 
 #define SYNC_PROTOCOL_STRING @"com.ford.sync.prot0"
 
-
 @interface SDLIAPTransport ()
 
 -(void) accessoryConnected:(NSNotification*) connectNotification;
@@ -24,7 +23,11 @@
 @synthesize outStream;
 
 -(id) init {
-       if (self = [super initWithEndpoint:nil endpointParam:nil]) {
+    
+    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"consoleLog" object:@"iAP Init"]];
+    [SDLDebugTool logInfo:@"iAP Init"];
+    
+    if (self = [super initWithEndpoint:nil endpointParam:nil]) {
                transportLock = [[NSObject alloc] init];
                writeQueue = [[NSMutableArray alloc] initWithCapacity:10];
                spaceAvailable = NO;
@@ -52,7 +55,6 @@
 }
 
 - (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode {
-    [SDLDebugTool logInfo:@"IAPTransport: stream:handleEvent: begins (eventCode = %@)", [self stringForEventCode:eventCode]];
        if (aStream == inStream) {
                if (eventCode == NSStreamEventHasBytesAvailable || eventCode == NSStreamEventOpenCompleted) {
                        UInt8 buf[1024];
@@ -81,7 +83,7 @@
                     
                                        int bytesWritten = [outStream write:msgBytes.bytes maxLength:msgBytes.length];
                     
-                    [SDLSiphonServer _siphonRawTransportDataFromApp:msgBytes.bytes msgBytesLength:bytesWritten];
+                    [SDLSiphonServer _siphonRawTransportDataFromApp:msgBytes.bytes msgBytesLength:bytesWritten]; 
                     
                                        if (bytesWritten < msgBytes.length) {
                                                NSData* leftover = [NSData dataWithBytes:msgBytes.bytes + bytesWritten length:msgBytes.length - bytesWritten];
@@ -125,8 +127,8 @@
 }
 
 - (BOOL)connect:(EAAccessory*)accessoryItem usedProtocol:(NSString*)protocolName
-{    
-       @synchronized (transportLock) {
+{
+    @synchronized (transportLock) {
                // Select the first accessory:
         self.session = [[[EASession alloc] initWithAccessory:accessoryItem forProtocol:protocolName] autorelease];        
         
@@ -185,8 +187,8 @@
         [SDLDebugTool logInfo:@"accessory name: %@", anAccessory.name];
                for (NSString *aProtocolString in [anAccessory protocolStrings]) {
                        [SDLDebugTool logInfo:@"IAPTransport: Found protocol string: %@", aProtocolString];
-                       if ([aProtocolString isEqualToString:SYNC_PROTOCOL_STRING]) {
-                               [SDLDebugTool logInfo:@"IAPTransport: Found accessory: %@", anAccessory.name];
+            if ([aProtocolString isEqualToString:SYNC_PROTOCOL_STRING]) {
+                [SDLDebugTool logInfo:@"IAPTransport: Found accessory: %@", anAccessory.name];
                 
                 if (connectedHeadUnitAccessory != nil) {
                     [connectedHeadUnitAccessory release];
@@ -214,7 +216,7 @@
     appInBackground = YES;
 }
 
--(EAAccessory*) getHeadUnitAccessoryFromNotification:(NSNotification*) notification {
+-(EAAccessory*) getSyncAccessoryFromNotification:(NSNotification*) notification {
     EAAccessory *accessory = [[notification userInfo] objectForKey:EAAccessoryKey];
     
     for (NSString *protocolString in [accessory protocolStrings]) {
@@ -227,26 +229,26 @@
 }
 
 -(void) accessoryConnected:(NSNotification*) connectNotification {
-    EAAccessory *connectedAccessory = [self getHeadUnitAccessoryFromNotification:connectNotification];
+    EAAccessory *connectedAccessory = [self getSyncAccessoryFromNotification:connectNotification];
     
     if(connectedAccessory == nil) {
-       // connectedAccessory is not a Head Unit accessory
+       // connectedAccessory is not a SYNC accessory
         return;
     }
     
-    // We're assuming connectedHeadUnitAccessory will be nil
-       if (connectedHeadUnitAccessory != nil) {
-        [connectedHeadUnitAccessory release];
-        connectedHeadUnitAccessory = nil;
+    // We're assuming connectedSyncAccessory will be nil
+       if (connectedAccessory != nil) {
+        [connectedAccessory release];
+        connectedAccessory = nil;
        }
     
-       connectedHeadUnitAccessory = [connectedAccessory retain];
+       connectedAccessory = [connectedAccessory retain];
        [self connect];
     
 }
 
 -(void) accessoryDisconnected:(NSNotification*) connectNotification {
-    EAAccessory *disconnectedAccessory = [self getHeadUnitAccessoryFromNotification:connectNotification];
+    EAAccessory *disconnectedAccessory = [self getSyncAccessoryFromNotification:connectNotification];
     
     if(disconnectedAccessory == nil) {
        // disconnectedAccessory is not a SYNC accessory
@@ -300,8 +302,8 @@
        return YES;
 }
 
-- (void) disconnect { 
-       @synchronized (transportLock) {
+- (void) disconnect {
+    @synchronized (transportLock) {
                
         transportUsable = NO;
         
@@ -330,11 +332,12 @@
 }
 
 - (void) dealloc {
+    
+    [self disconnect];
+    
     if (registeredForNotifications) {
-        [[NSNotificationCenter defaultCenter] removeObserver:self name:EAAccessoryDidConnectNotification 
-            object:nil];
-        [[NSNotificationCenter defaultCenter] removeObserver:self name:EAAccessoryDidDisconnectNotification 
-            object:nil];
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:EAAccessoryDidConnectNotification object:nil];
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:EAAccessoryDidDisconnectNotification object:nil];
         [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidEnterBackgroundNotification object:nil];
         [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationWillEnterForegroundNotification object:nil];
         registeredForNotifications = NO;
@@ -343,7 +346,7 @@
     [connectedHeadUnitAccessory release];
     connectedHeadUnitAccessory = nil;
     
-       [self disconnect];
+       
        [transportLock release];
     
        [super dealloc];

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIProtocol.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIProtocol.h
similarity index 65%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIProtocol.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIProtocol.h
index e281b5e..8ae73f1 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIProtocol.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIProtocol.h
@@ -1,11 +1,12 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLProtocol.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLProtocolListener.h"
-#import "SDLProtocolMessage.h"
-#import "SDLITransport.h"
+#import <SmartDeviceLink/SDLITransport.h>
+
+#import <SmartDeviceLink/SDLProtocolListener.h>
+#import <SmartDeviceLink/SDLProtocolMessage.h>
 
 @protocol SDLIProtocol<SDLTransportListener>
 
@@ -13,7 +14,7 @@
 
 -(void) sendStartSessionWithType:(SDLSessionType) sessionType;
 -(void) sendEndSessionWithType:(SDLSessionType)sessionType sessionID:(Byte)sessionID;
--(void) sendData:(NSData*) data sessionType:(SDLSessionType)sessionType sessionID:(Byte)sessionID;
+-(void) sendData:(SDLProtocolMessage*) protocolMsg;
 
 @property(assign) NSObject<SDLITransport>* transport;
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIProxy.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIProxy.h
new file mode 100644 (file)
index 0000000..ae2bf38
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIProxy.h
@@ -0,0 +1,21 @@
+//  SDLIProxy.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLIProtocol.h>
+#import <SmartDeviceLink/SDLProxyListener.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+#import <SmartDeviceLink/SDLITransport.h>
+
+@protocol SDLIProxy
+
+-(id) initWithTransport:(NSObject<SDLITransport>*) transport protocol:(NSObject<SDLIProtocol>*) protocol delegate:(NSObject<SDLProxyListener>*) delegate;
+
+-(void) dispose;
+-(void) addDelegate:(NSObject<SDLProxyListener>*) delegate;
+
+-(void) sendRPCRequest:(SDLRPCMessage*) msg;
+-(void) handleRpcMessage:(NSDictionary*) msg;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLITransport.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLITransport.h
similarity index 71%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLITransport.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLITransport.h
index 2cced81..e31a23f 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLITransport.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLITransport.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLITransport.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLTransportListener.h"
+#import <SmartDeviceLink/SDLTransportListener.h>
 
 @protocol SDLITransport
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIgnitionStableStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIgnitionStableStatus.h
new file mode 100644 (file)
index 0000000..511bd17
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIgnitionStableStatus.h
@@ -0,0 +1,19 @@
+//  SDLIgnitionStableStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLIgnitionStableStatus : SDLEnum {}
+
++(SDLIgnitionStableStatus*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLIgnitionStableStatus*) IGNITION_SWITCH_NOT_STABLE;
++(SDLIgnitionStableStatus*) IGNITION_SWITCH_STABLE;
++(SDLIgnitionStableStatus*) MISSING_FROM_TRANSMITTER;
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIgnitionStableStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIgnitionStableStatus.m
new file mode 100644 (file)
index 0000000..89c9049
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIgnitionStableStatus.m
@@ -0,0 +1,58 @@
+//  SDLIgnitionStableStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLIgnitionStableStatus.h>   
+
+SDLIgnitionStableStatus* SDLIgnitionStableStatus_IGNITION_SWITCH_NOT_STABLE = nil;
+SDLIgnitionStableStatus* SDLIgnitionStableStatus_IGNITION_SWITCH_STABLE = nil;
+SDLIgnitionStableStatus* SDLIgnitionStableStatus_MISSING_FROM_TRANSMITTER = nil;
+
+NSMutableArray* SDLIgnitionStableStatus_values = nil; 
+
+@implementation SDLIgnitionStableStatus
+
++(SDLIgnitionStableStatus*) valueOf:(NSString*) value {                       
+       for (SDLIgnitionStableStatus* item in SDLIgnitionStableStatus.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLIgnitionStableStatus_values == nil) {                               
+               SDLIgnitionStableStatus_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLIgnitionStableStatus.IGNITION_SWITCH_NOT_STABLE,
+                                    SDLIgnitionStableStatus.IGNITION_SWITCH_STABLE,
+                                    SDLIgnitionStableStatus.MISSING_FROM_TRANSMITTER,
+                                                                       nil];                        
+       } 
+       return SDLIgnitionStableStatus_values; 
+}
+
++(SDLIgnitionStableStatus*) IGNITION_SWITCH_NOT_STABLE {
+       if (SDLIgnitionStableStatus_IGNITION_SWITCH_NOT_STABLE == nil) {
+               SDLIgnitionStableStatus_IGNITION_SWITCH_NOT_STABLE = [[SDLIgnitionStableStatus alloc] initWithValue:@"IGNITION_SWITCH_NOT_STABLE"];
+       } 
+       return SDLIgnitionStableStatus_IGNITION_SWITCH_NOT_STABLE;  
+}
+
++(SDLIgnitionStableStatus*) IGNITION_SWITCH_STABLE {
+       if (SDLIgnitionStableStatus_IGNITION_SWITCH_STABLE == nil) {
+               SDLIgnitionStableStatus_IGNITION_SWITCH_STABLE = [[SDLIgnitionStableStatus alloc] initWithValue:@"IGNITION_SWITCH_STABLE"];
+       }
+       return SDLIgnitionStableStatus_IGNITION_SWITCH_STABLE;
+}
+
++(SDLIgnitionStableStatus*) MISSING_FROM_TRANSMITTER {
+       if (SDLIgnitionStableStatus_MISSING_FROM_TRANSMITTER == nil) {
+               SDLIgnitionStableStatus_MISSING_FROM_TRANSMITTER = [[SDLIgnitionStableStatus alloc] initWithValue:@"MISSING_FROM_TRANSMITTER"];
+       }
+       return SDLIgnitionStableStatus_MISSING_FROM_TRANSMITTER;
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIgnitionStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIgnitionStatus.h
new file mode 100644 (file)
index 0000000..594b49a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIgnitionStatus.h
@@ -0,0 +1,22 @@
+//  SDLIgnitionStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLIgnitionStatus : SDLEnum {}
+
++(SDLIgnitionStatus*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLIgnitionStatus*) UNKNOWN;
++(SDLIgnitionStatus*) OFF;
++(SDLIgnitionStatus*) ACCESSORY;
++(SDLIgnitionStatus*) RUN;
++(SDLIgnitionStatus*) START;
++(SDLIgnitionStatus*) INVALID;
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIgnitionStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIgnitionStatus.m
new file mode 100644 (file)
index 0000000..6119dd5
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLIgnitionStatus.m
@@ -0,0 +1,85 @@
+//  SDLIgnitionStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLIgnitionStatus.h>   
+
+SDLIgnitionStatus* SDLIgnitionStatus_UNKNOWN = nil;
+SDLIgnitionStatus* SDLIgnitionStatus_OFF = nil;
+SDLIgnitionStatus* SDLIgnitionStatus_ACCESSORY = nil;
+SDLIgnitionStatus* SDLIgnitionStatus_RUN = nil;
+SDLIgnitionStatus* SDLIgnitionStatus_START = nil;
+SDLIgnitionStatus* SDLIgnitionStatus_INVALID = nil;
+
+NSMutableArray* SDLIgnitionStatus_values = nil; 
+
+@implementation SDLIgnitionStatus
+
++(SDLIgnitionStatus*) valueOf:(NSString*) value {                       
+       for (SDLIgnitionStatus* item in SDLIgnitionStatus.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLIgnitionStatus_values == nil) {                               
+               SDLIgnitionStatus_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLIgnitionStatus.UNKNOWN,
+                                    SDLIgnitionStatus.OFF,
+                                    SDLIgnitionStatus.ACCESSORY,
+                                    SDLIgnitionStatus.RUN,
+                                    SDLIgnitionStatus.START,
+                                    SDLIgnitionStatus.INVALID,
+                                                                       nil];
+       } 
+       return SDLIgnitionStatus_values; 
+}
+
++(SDLIgnitionStatus*) UNKNOWN {
+       if (SDLIgnitionStatus_UNKNOWN == nil) {
+               SDLIgnitionStatus_UNKNOWN = [[SDLIgnitionStatus alloc] initWithValue:@"UNKNOWN"];
+       } 
+       return SDLIgnitionStatus_UNKNOWN;  
+}
+
++(SDLIgnitionStatus*) OFF {
+       if (SDLIgnitionStatus_OFF == nil) {
+               SDLIgnitionStatus_OFF = [[SDLIgnitionStatus alloc] initWithValue:@"OFF"];
+       }
+       return SDLIgnitionStatus_OFF;
+}
+
++(SDLIgnitionStatus*) ACCESSORY {
+       if (SDLIgnitionStatus_ACCESSORY == nil) {
+               SDLIgnitionStatus_ACCESSORY = [[SDLIgnitionStatus alloc] initWithValue:@"ACCESSORY"];
+       }
+       return SDLIgnitionStatus_ACCESSORY;
+}
+
++(SDLIgnitionStatus*) RUN {
+       if (SDLIgnitionStatus_RUN == nil) {
+               SDLIgnitionStatus_RUN = [[SDLIgnitionStatus alloc] initWithValue:@"RUN"];
+       }
+       return SDLIgnitionStatus_RUN;
+}
+
++(SDLIgnitionStatus*) START {
+       if (SDLIgnitionStatus_START == nil) {
+               SDLIgnitionStatus_START = [[SDLIgnitionStatus alloc] initWithValue:@"START"];
+       }
+       return SDLIgnitionStatus_START;
+}
+
++(SDLIgnitionStatus*) INVALID {
+       if (SDLIgnitionStatus_INVALID == nil) {
+               SDLIgnitionStatus_INVALID = [[SDLIgnitionStatus alloc] initWithValue:@"INVALID"];
+       }
+       return SDLIgnitionStatus_INVALID;
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLImage.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLImage.h
new file mode 100644 (file)
index 0000000..5f1770c
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLImage.h
@@ -0,0 +1,18 @@
+//  SDLImage.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLImageType.h>
+
+@interface SDLImage : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSString* value;
+@property(assign) SDLImageType* imageType;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLImage.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLImage.m
new file mode 100644 (file)
index 0000000..bcce011
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLImage.m
@@ -0,0 +1,50 @@
+//  SDLImage.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLImage.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLImage
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setValue:(NSString*) value {
+    if (value != nil) {
+        [store setObject:value forKey:NAMES_value];
+    } else {
+        [store removeObjectForKey:NAMES_value];
+    }
+}
+
+-(NSString*) value {
+    return [store objectForKey:NAMES_value];
+}
+
+-(void) setImageType:(SDLImageType*) imageType {
+    if (imageType != nil) {
+        [store setObject:imageType forKey:NAMES_imageType];
+    } else {
+        [store removeObjectForKey:NAMES_imageType];
+    }
+}
+
+-(SDLImageType*) imageType {
+    NSObject* obj = [store objectForKey:NAMES_imageType];
+    if ([obj isKindOfClass:SDLImageType.class]) {
+        return (SDLImageType*)obj;
+    } else { 
+        return [SDLImageType valueOf:(NSString*)obj];
+    }
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLImageType.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLImageType.h
new file mode 100644 (file)
index 0000000..f62d5d6
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLImageType.h
@@ -0,0 +1,16 @@
+//  SDLImageType.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLImageType : SDLEnum {}
+
++(SDLImageType*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLImageType*) STATIC;
++(SDLImageType*) DYNAMIC;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLImageType.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLImageType.m
new file mode 100644 (file)
index 0000000..d569776
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLImageType.m
@@ -0,0 +1,46 @@
+//  SDLImageType.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLImageType.h>
+
+SDLImageType* SDLImageType_STATIC = nil;
+SDLImageType* SDLImageType_DYNAMIC = nil;
+
+NSMutableArray* SDLImageType_values = nil;
+@implementation SDLImageType
+
++(SDLImageType*) valueOf:(NSString*) imageType {
+    for (SDLImageType* item in SDLImageType.values) {
+        if ([item.value isEqualToString:imageType]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLImageType_values == nil) {
+        SDLImageType_values = [[NSMutableArray alloc] initWithObjects:
+                SDLImageType.STATIC,
+                SDLImageType.DYNAMIC,
+                nil];
+    }
+    return SDLImageType_values;
+}
+
++(SDLImageType*) STATIC {
+       if (SDLImageType_STATIC == nil) {
+                       SDLImageType_STATIC = [[SDLImageType alloc] initWithValue:@"STATIC"];
+       }
+       return SDLImageType_STATIC;
+}
+
++(SDLImageType*) DYNAMIC {
+       if (SDLImageType_DYNAMIC == nil) {
+                       SDLImageType_DYNAMIC = [[SDLImageType alloc] initWithValue:@"DYNAMIC"];
+       }
+       return SDLImageType_DYNAMIC;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLInteractionMode.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLInteractionMode.h
similarity index 67%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLInteractionMode.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLInteractionMode.h
index 44f4ba7..f01028f 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLInteractionMode.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLInteractionMode.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLInteractionMode.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLInteractionMode : SDLEnum {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLInteractionMode.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLInteractionMode.m
similarity index 91%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLInteractionMode.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLInteractionMode.m
index aed6f9a..fcfcc10 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLInteractionMode.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLInteractionMode.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLInteractionMode.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLInteractionMode.h"
+#import <SmartDeviceLink/SDLInteractionMode.h>
 
 SDLInteractionMode* SDLInteractionMode_MANUAL_ONLY = nil;
 SDLInteractionMode* SDLInteractionMode_VR_ONLY = nil;

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJingle.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJingle.h
similarity index 73%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJingle.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJingle.h
index 30fbd85..fdb076e 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJingle.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJingle.h
@@ -1,6 +1,6 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLJingle.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJingle.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJingle.m
similarity index 73%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJingle.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJingle.m
index 3c0ac6a..b5ce29a 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJingle.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJingle.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLJingle.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLJingle.h"
+#import <SmartDeviceLink/SDLJingle.h>
 
 @implementation SDLJingle
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJsonDecoder.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJsonDecoder.h
new file mode 100644 (file)
index 0000000..5d324ab
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJsonDecoder.h
@@ -0,0 +1,12 @@
+//  SDLJsonDecoder.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLDecoder.h>
+
+@interface SDLJsonDecoder : NSObject<SDLDecoder> {}
+
++(NSObject<SDLDecoder>*) instance;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJsonDecoder.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJsonDecoder.m
new file mode 100644 (file)
index 0000000..cdcf948
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJsonDecoder.m
@@ -0,0 +1,27 @@
+//  SDLJsonDecoder.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLJsonDecoder.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLJsonDecoder
+
+static NSObject<SDLDecoder>* jsonDecoderInstance;
+
++(NSObject<SDLDecoder>*) instance {
+       if (jsonDecoderInstance == nil) {
+               jsonDecoderInstance = [[SDLJsonDecoder alloc] init];
+       }
+       return jsonDecoderInstance;
+}
+
+-(NSDictionary*) decode:(NSData*) msgBytes{
+       NSError* error;
+    NSDictionary* jsonObject = [NSJSONSerialization JSONObjectWithData:msgBytes options:kNilOptions error:&error];
+    
+       return jsonObject;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJsonEncoder.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJsonEncoder.h
new file mode 100644 (file)
index 0000000..3f488be
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJsonEncoder.h
@@ -0,0 +1,12 @@
+//  SDLJsonEncoder.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEncoder.h>
+
+@interface SDLJsonEncoder : NSObject<SDLEncoder> {}
+
++(NSObject<SDLEncoder>*) instance;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJsonEncoder.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJsonEncoder.m
new file mode 100644 (file)
index 0000000..68553a4
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLJsonEncoder.m
@@ -0,0 +1,27 @@
+//  SDLJsonEncoder.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLJsonEncoder.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLJsonEncoder
+
+static NSObject<SDLEncoder>* jsonEncoderInstance;
+
++(NSObject<SDLEncoder>*) instance {
+       if (jsonEncoderInstance == nil) {
+               jsonEncoderInstance = [[SDLJsonEncoder alloc] init];
+       }
+       return jsonEncoderInstance;
+}
+
+-(NSData*) encodeDictionary:(NSDictionary*) dict {
+    NSError* error;
+    NSData* jsonData = [NSJSONSerialization dataWithJSONObject:dict options:kNilOptions error:&error];
+    
+    return jsonData;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLLanguage.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLLanguage.h
new file mode 100644 (file)
index 0000000..6cbc763
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLLanguage.h
@@ -0,0 +1,38 @@
+//  SDLLanguage.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLLanguage : SDLEnum {}
+
++(SDLLanguage*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLLanguage*) EN_US;
++(SDLLanguage*) ES_MX;
++(SDLLanguage*) FR_CA;
++(SDLLanguage*) DE_DE;
++(SDLLanguage*) ES_ES;
++(SDLLanguage*) EN_GB;
++(SDLLanguage*) RU_RU;
++(SDLLanguage*) TR_TR;
++(SDLLanguage*) PL_PL;
++(SDLLanguage*) FR_FR;
++(SDLLanguage*) IT_IT;
++(SDLLanguage*) SV_SE;
++(SDLLanguage*) PT_PT;
++(SDLLanguage*) NL_NL;
++(SDLLanguage*) EN_AU;
++(SDLLanguage*) ZH_CN;
++(SDLLanguage*) ZH_TW;
++(SDLLanguage*) JA_JP;
++(SDLLanguage*) AR_SA;
++(SDLLanguage*) KO_KR;
++(SDLLanguage*) PT_BR;
++(SDLLanguage*) CS_CZ;
++(SDLLanguage*) DA_DK;
++(SDLLanguage*) NO_NO;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLLanguage.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLLanguage.m
new file mode 100644 (file)
index 0000000..cc1091a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLLanguage.m
@@ -0,0 +1,244 @@
+//  SDLLanguage.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLLanguage.h>
+
+SDLLanguage* SDLLanguage_EN_US = nil;
+SDLLanguage* SDLLanguage_ES_MX = nil;
+SDLLanguage* SDLLanguage_FR_CA = nil;
+SDLLanguage* SDLLanguage_DE_DE = nil;
+SDLLanguage* SDLLanguage_ES_ES = nil;
+SDLLanguage* SDLLanguage_EN_GB = nil;
+SDLLanguage* SDLLanguage_RU_RU = nil;
+SDLLanguage* SDLLanguage_TR_TR = nil;
+SDLLanguage* SDLLanguage_PL_PL = nil;
+SDLLanguage* SDLLanguage_FR_FR = nil;
+SDLLanguage* SDLLanguage_IT_IT = nil;
+SDLLanguage* SDLLanguage_SV_SE = nil;
+SDLLanguage* SDLLanguage_PT_PT = nil;
+SDLLanguage* SDLLanguage_NL_NL = nil;
+SDLLanguage* SDLLanguage_EN_AU = nil;
+SDLLanguage* SDLLanguage_ZH_CN = nil;
+SDLLanguage* SDLLanguage_ZH_TW = nil;
+SDLLanguage* SDLLanguage_JA_JP = nil;
+SDLLanguage* SDLLanguage_AR_SA = nil;
+SDLLanguage* SDLLanguage_KO_KR = nil;
+SDLLanguage* SDLLanguage_PT_BR = nil;
+SDLLanguage* SDLLanguage_CS_CZ = nil;
+SDLLanguage* SDLLanguage_DA_DK = nil;
+SDLLanguage* SDLLanguage_NO_NO = nil;
+
+NSMutableArray* SDLLanguage_values = nil;
+@implementation SDLLanguage
+
++(SDLLanguage*) valueOf:(NSString*) value {
+    for (SDLLanguage* item in SDLLanguage.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLLanguage_values == nil) {
+        SDLLanguage_values = [[NSMutableArray alloc] initWithObjects:
+                             SDLLanguage.EN_US,
+                             SDLLanguage.ES_MX,
+                             SDLLanguage.FR_CA,
+                             SDLLanguage.DE_DE,
+                             SDLLanguage.ES_ES,
+                             SDLLanguage.EN_GB,
+                             SDLLanguage.RU_RU,
+                             SDLLanguage.TR_TR,
+                             SDLLanguage.PL_PL,
+                             SDLLanguage.FR_FR,
+                             SDLLanguage.IT_IT,
+                             SDLLanguage.SV_SE,
+                             SDLLanguage.PT_PT,
+                             SDLLanguage.NL_NL,
+                             SDLLanguage.EN_AU,
+                             SDLLanguage.ZH_CN,
+                             SDLLanguage.ZH_TW,
+                             SDLLanguage.JA_JP,
+                             SDLLanguage.AR_SA,
+                             SDLLanguage.KO_KR,
+                             SDLLanguage.PT_BR,
+                             SDLLanguage.CS_CZ,
+                             SDLLanguage.DA_DK,
+                             SDLLanguage.NO_NO,
+                             nil];
+    }
+    return SDLLanguage_values;
+}
+
++(SDLLanguage*) EN_US {
+    if (SDLLanguage_EN_US == nil) {
+        SDLLanguage_EN_US = [[SDLLanguage alloc] initWithValue:@"EN-US"];
+    }
+    return SDLLanguage_EN_US;
+}
+
++(SDLLanguage*) ES_MX {
+    if (SDLLanguage_ES_MX == nil) {
+        SDLLanguage_ES_MX = [[SDLLanguage alloc] initWithValue:@"ES-MX"];
+    }
+    return SDLLanguage_ES_MX;
+}
+
++(SDLLanguage*) FR_CA {
+    if (SDLLanguage_FR_CA == nil) {
+        SDLLanguage_FR_CA = [[SDLLanguage alloc] initWithValue:@"FR-CA"];
+    }
+    return SDLLanguage_FR_CA;
+}
+
++(SDLLanguage*) DE_DE {
+    if (SDLLanguage_DE_DE == nil) {
+        SDLLanguage_DE_DE = [[SDLLanguage alloc] initWithValue:@"DE-DE"];
+    }
+    return SDLLanguage_DE_DE;
+}
+
++(SDLLanguage*) ES_ES {
+    if (SDLLanguage_ES_ES == nil) {
+        SDLLanguage_ES_ES = [[SDLLanguage alloc] initWithValue:@"ES-ES"];
+    }
+    return SDLLanguage_ES_ES;
+}
+
++(SDLLanguage*) EN_GB {
+    if (SDLLanguage_EN_GB == nil) {
+        SDLLanguage_EN_GB = [[SDLLanguage alloc] initWithValue:@"EN-GB"];
+    }
+    return SDLLanguage_EN_GB;
+}
+
++(SDLLanguage*) RU_RU {
+    if (SDLLanguage_RU_RU == nil) {
+        SDLLanguage_RU_RU = [[SDLLanguage alloc] initWithValue:@"RU-RU"];
+    }
+    return SDLLanguage_RU_RU;
+}
+
++(SDLLanguage*) TR_TR {
+    if (SDLLanguage_TR_TR == nil) {
+        SDLLanguage_TR_TR = [[SDLLanguage alloc] initWithValue:@"TR-TR"];
+    }
+    return SDLLanguage_TR_TR;
+}
+
++(SDLLanguage*) PL_PL {
+    if (SDLLanguage_PL_PL == nil) {
+        SDLLanguage_PL_PL = [[SDLLanguage alloc] initWithValue:@"PL-PL"];
+    }
+    return SDLLanguage_PL_PL;
+}
+
++(SDLLanguage*) FR_FR {
+    if (SDLLanguage_FR_FR == nil) {
+        SDLLanguage_FR_FR = [[SDLLanguage alloc] initWithValue:@"FR-FR"];
+    }
+    return SDLLanguage_FR_FR;
+}
+
++(SDLLanguage*) IT_IT {
+    if (SDLLanguage_IT_IT == nil) {
+        SDLLanguage_IT_IT = [[SDLLanguage alloc] initWithValue:@"IT-IT"];
+    }
+    return SDLLanguage_IT_IT;
+}
+
++(SDLLanguage*) SV_SE {
+    if (SDLLanguage_SV_SE == nil) {
+        SDLLanguage_SV_SE = [[SDLLanguage alloc] initWithValue:@"SV-SE"];
+    }
+    return SDLLanguage_SV_SE;
+}
+
++(SDLLanguage*) PT_PT {
+    if (SDLLanguage_PT_PT == nil) {
+        SDLLanguage_PT_PT = [[SDLLanguage alloc] initWithValue:@"PT-PT"];
+    }
+    return SDLLanguage_PT_PT;
+}
+
++(SDLLanguage*) NL_NL {
+    if (SDLLanguage_NL_NL == nil) {
+        SDLLanguage_NL_NL = [[SDLLanguage alloc] initWithValue:@"NL-NL"];
+    }
+    return SDLLanguage_NL_NL;
+}
+
++(SDLLanguage*) EN_AU {
+    if (SDLLanguage_EN_AU == nil) {
+        SDLLanguage_EN_AU = [[SDLLanguage alloc] initWithValue:@"EN-AU"];
+    }
+    return SDLLanguage_EN_AU;
+}
+
++(SDLLanguage*) ZH_CN {
+    if (SDLLanguage_ZH_CN == nil) {
+        SDLLanguage_ZH_CN = [[SDLLanguage alloc] initWithValue:@"ZH-CN"];
+    }
+    return SDLLanguage_ZH_CN;
+}
+
++(SDLLanguage*) ZH_TW {
+    if (SDLLanguage_ZH_TW == nil) {
+        SDLLanguage_ZH_TW = [[SDLLanguage alloc] initWithValue:@"ZH-TW"];
+    }
+    return SDLLanguage_ZH_TW;
+}
+
++(SDLLanguage*) JA_JP {
+    if (SDLLanguage_JA_JP == nil) {
+        SDLLanguage_JA_JP = [[SDLLanguage alloc] initWithValue:@"JA-JP"];
+    }
+    return SDLLanguage_JA_JP;
+}
+
++(SDLLanguage*) AR_SA {
+    if (SDLLanguage_AR_SA == nil) {
+        SDLLanguage_AR_SA = [[SDLLanguage alloc] initWithValue:@"AR-SA"];
+    }
+    return SDLLanguage_AR_SA;
+}
+
++(SDLLanguage*) KO_KR {
+    if (SDLLanguage_KO_KR == nil) {
+        SDLLanguage_KO_KR = [[SDLLanguage alloc] initWithValue:@"KO-KR"];
+    }
+    return SDLLanguage_KO_KR;
+}
+
++(SDLLanguage*) PT_BR {
+    if (SDLLanguage_PT_BR == nil) {
+        SDLLanguage_PT_BR = [[SDLLanguage alloc] initWithValue:@"PT-BR"];
+    }
+    return SDLLanguage_PT_BR;
+}
+
++(SDLLanguage*) CS_CZ {
+    if (SDLLanguage_CS_CZ == nil) {
+        SDLLanguage_CS_CZ = [[SDLLanguage alloc] initWithValue:@"CS-CZ"];
+    }
+    return SDLLanguage_CS_CZ;
+}
+
++(SDLLanguage*) DA_DK {
+    if (SDLLanguage_DA_DK == nil) {
+        SDLLanguage_DA_DK = [[SDLLanguage alloc] initWithValue:@"DA-DK"];
+    }
+    return SDLLanguage_DA_DK;
+}
+
++(SDLLanguage*) NO_NO {
+    if (SDLLanguage_DA_DK == nil) {
+        SDLLanguage_DA_DK = [[SDLLanguage alloc] initWithValue:@"NO-NO"];
+    }
+    return SDLLanguage_NO_NO;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLListFiles.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLListFiles.h
new file mode 100644 (file)
index 0000000..ada5149
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLListFiles.h
@@ -0,0 +1,13 @@
+//  SDLListFiles.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+@interface SDLListFiles : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLListFiles.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLListFiles.m
new file mode 100644 (file)
index 0000000..52e99ec
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLListFiles.m
@@ -0,0 +1,21 @@
+//  SDLListFiles.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLListFiles.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLListFiles
+
+-(id) init {
+    if (self = [super initWithName:NAMES_ListFiles]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLListFilesResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLListFilesResponse.h
new file mode 100644 (file)
index 0000000..d051b5d
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLListFilesResponse.h
@@ -0,0 +1,16 @@
+//  SDLListFilesResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLListFilesResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSMutableArray* filenames;
+@property(assign) NSNumber* spaceAvailable;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLListFilesResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLListFilesResponse.m
new file mode 100644 (file)
index 0000000..6e4f243
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLListFilesResponse.m
@@ -0,0 +1,45 @@
+//  SDLListFilesResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLListFilesResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLListFilesResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_ListFiles]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setFilenames:(NSMutableArray*) filenames {
+    if (filenames != nil) {
+        [parameters setObject:filenames forKey:NAMES_filenames];
+    } else {
+        [parameters removeObjectForKey:NAMES_filenames];
+    }
+}
+
+-(NSMutableArray*) filenames {
+    return [parameters objectForKey:NAMES_filenames];
+}
+
+-(void) setSpaceAvailable:(NSNumber *) spaceAvailable {
+    if (spaceAvailable != nil) {
+        [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable];
+    } else {
+        [parameters removeObjectForKey:NAMES_spaceAvailable];
+    }
+}
+
+-(NSNumber*) spaceAvailable {
+    return [parameters objectForKey:NAMES_spaceAvailable];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMaintenanceModeStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMaintenanceModeStatus.h
new file mode 100644 (file)
index 0000000..552f479
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMaintenanceModeStatus.h
@@ -0,0 +1,20 @@
+//  SDLMaintenanceModeStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLMaintenanceModeStatus : SDLEnum {}
+
++(SDLMaintenanceModeStatus*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLMaintenanceModeStatus*) NORMAL;
++(SDLMaintenanceModeStatus*) NEAR;
++(SDLMaintenanceModeStatus*) ACTIVE;
++(SDLMaintenanceModeStatus*) FEATURE_NOT_PRESENT;
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMaintenanceModeStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMaintenanceModeStatus.m
new file mode 100644 (file)
index 0000000..deb0845
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMaintenanceModeStatus.m
@@ -0,0 +1,67 @@
+//  SDLMaintenanceModeStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLMaintenanceModeStatus.h>
+
+SDLMaintenanceModeStatus* SDLMaintenanceModeStatus_NORMAL = nil;
+SDLMaintenanceModeStatus* SDLMaintenanceModeStatus_NEAR = nil;
+SDLMaintenanceModeStatus* SDLMaintenanceModeStatus_ACTIVE = nil;
+SDLMaintenanceModeStatus* SDLMaintenanceModeStatus_FEATURE_NOT_PRESENT = nil;
+
+NSMutableArray* SDLMaintenanceModeStatus_values = nil; 
+
+@implementation SDLMaintenanceModeStatus
+
++(SDLMaintenanceModeStatus*) valueOf:(NSString*) value {                       
+       for (SDLMaintenanceModeStatus* item in SDLMaintenanceModeStatus.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLMaintenanceModeStatus_values == nil) {                               
+               SDLMaintenanceModeStatus_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLMaintenanceModeStatus.NORMAL,
+                                    SDLMaintenanceModeStatus.NEAR,
+                                    SDLMaintenanceModeStatus.ACTIVE,
+                                    SDLMaintenanceModeStatus.FEATURE_NOT_PRESENT,
+                                                                       nil];
+       } 
+       return SDLMaintenanceModeStatus_values; 
+}
+
++(SDLMaintenanceModeStatus*) NORMAL {
+       if (SDLMaintenanceModeStatus_NORMAL == nil) {
+               SDLMaintenanceModeStatus_NORMAL = [[SDLMaintenanceModeStatus alloc] initWithValue:@"NORMAL"];
+       } 
+       return SDLMaintenanceModeStatus_NORMAL;  
+}
+
++(SDLMaintenanceModeStatus*) NEAR {
+       if (SDLMaintenanceModeStatus_NEAR == nil) {
+               SDLMaintenanceModeStatus_NEAR = [[SDLMaintenanceModeStatus alloc] initWithValue:@"NEAR"];
+       }
+       return SDLMaintenanceModeStatus_NEAR;
+}
+
++(SDLMaintenanceModeStatus*) ACTIVE {
+       if (SDLMaintenanceModeStatus_ACTIVE == nil) {
+               SDLMaintenanceModeStatus_ACTIVE = [[SDLMaintenanceModeStatus alloc] initWithValue:@"ACTIVE"];
+       }
+       return SDLMaintenanceModeStatus_ACTIVE;
+}
+
++(SDLMaintenanceModeStatus*) FEATURE_NOT_PRESENT {
+       if (SDLMaintenanceModeStatus_FEATURE_NOT_PRESENT == nil) {
+               SDLMaintenanceModeStatus_FEATURE_NOT_PRESENT = [[SDLMaintenanceModeStatus alloc] initWithValue:@"FEATURE_NOT_PRESENT"];
+       }
+       return SDLMaintenanceModeStatus_FEATURE_NOT_PRESENT;
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMediaClockFormat.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMediaClockFormat.h
similarity index 63%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMediaClockFormat.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMediaClockFormat.h
index b993983..ac49a52 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMediaClockFormat.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMediaClockFormat.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLMediaClockFormat.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLMediaClockFormat : SDLEnum {}
 
@@ -12,8 +12,10 @@
 
 +(SDLMediaClockFormat*) CLOCK1;
 +(SDLMediaClockFormat*) CLOCK2;
++(SDLMediaClockFormat*) CLOCK3;
 +(SDLMediaClockFormat*) CLOCKTEXT1;
 +(SDLMediaClockFormat*) CLOCKTEXT2;
 +(SDLMediaClockFormat*) CLOCKTEXT3;
++(SDLMediaClockFormat*) CLOCKTEXT4;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMediaClockFormat.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMediaClockFormat.m
new file mode 100644 (file)
index 0000000..6a220a6
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMediaClockFormat.m
@@ -0,0 +1,91 @@
+//  SDLMediaClockFormat.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLMediaClockFormat.h>
+
+SDLMediaClockFormat* SDLMediaClockFormat_CLOCK1 = nil;
+SDLMediaClockFormat* SDLMediaClockFormat_CLOCK2 = nil;
+SDLMediaClockFormat* SDLMediaClockFormat_CLOCK3 = nil;
+SDLMediaClockFormat* SDLMediaClockFormat_CLOCKTEXT1 = nil;
+SDLMediaClockFormat* SDLMediaClockFormat_CLOCKTEXT2 = nil;
+SDLMediaClockFormat* SDLMediaClockFormat_CLOCKTEXT3 = nil;
+SDLMediaClockFormat* SDLMediaClockFormat_CLOCKTEXT4 = nil;
+
+NSMutableArray* SDLMediaClockFormat_values = nil;
+@implementation SDLMediaClockFormat
+
++(SDLMediaClockFormat*) valueOf:(NSString*) value {
+    for (SDLMediaClockFormat* item in SDLMediaClockFormat.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLMediaClockFormat_values == nil) {
+        SDLMediaClockFormat_values = [[NSMutableArray alloc] initWithObjects:
+                                     SDLMediaClockFormat.CLOCK1,
+                                     SDLMediaClockFormat.CLOCK2,
+                                     SDLMediaClockFormat.CLOCK3,
+                                     SDLMediaClockFormat.CLOCKTEXT1,
+                                     SDLMediaClockFormat.CLOCKTEXT2,
+                                     SDLMediaClockFormat.CLOCKTEXT3,
+                                     SDLMediaClockFormat.CLOCKTEXT4,
+                                     nil];
+    }
+    return SDLMediaClockFormat_values;
+}
+
++(SDLMediaClockFormat*) CLOCK1 {
+    if (SDLMediaClockFormat_CLOCK1 == nil) {
+        SDLMediaClockFormat_CLOCK1 = [[SDLMediaClockFormat alloc] initWithValue:@"CLOCK1"];
+    }
+    return SDLMediaClockFormat_CLOCK1;
+}
+
++(SDLMediaClockFormat*) CLOCK2 {
+    if (SDLMediaClockFormat_CLOCK2 == nil) {
+        SDLMediaClockFormat_CLOCK2 = [[SDLMediaClockFormat alloc] initWithValue:@"CLOCK2"];
+    }
+    return SDLMediaClockFormat_CLOCK2;
+}
+
++(SDLMediaClockFormat*) CLOCK3 {
+    if (SDLMediaClockFormat_CLOCK3 == nil) {
+        SDLMediaClockFormat_CLOCK3 = [[SDLMediaClockFormat alloc] initWithValue:@"CLOCK3"];
+    }
+    return SDLMediaClockFormat_CLOCK2;
+}
+
++(SDLMediaClockFormat*) CLOCKTEXT1 {
+    if (SDLMediaClockFormat_CLOCKTEXT1 == nil) {
+        SDLMediaClockFormat_CLOCKTEXT1 = [[SDLMediaClockFormat alloc] initWithValue:@"CLOCKTEXT1"];
+    }
+    return SDLMediaClockFormat_CLOCKTEXT1;
+}
+
++(SDLMediaClockFormat*) CLOCKTEXT2 {
+    if (SDLMediaClockFormat_CLOCKTEXT2 == nil) {
+        SDLMediaClockFormat_CLOCKTEXT2 = [[SDLMediaClockFormat alloc] initWithValue:@"CLOCKTEXT2"];
+    }
+    return SDLMediaClockFormat_CLOCKTEXT2;
+}
+
++(SDLMediaClockFormat*) CLOCKTEXT3 {
+    if (SDLMediaClockFormat_CLOCKTEXT3 == nil) {
+        SDLMediaClockFormat_CLOCKTEXT3 = [[SDLMediaClockFormat alloc] initWithValue:@"CLOCKTEXT3"];
+    }
+    return SDLMediaClockFormat_CLOCKTEXT3;
+}
+
++(SDLMediaClockFormat*) CLOCKTEXT4 {
+    if (SDLMediaClockFormat_CLOCKTEXT4 == nil) {
+        SDLMediaClockFormat_CLOCKTEXT4 = [[SDLMediaClockFormat alloc] initWithValue:@"CLOCKTEXT4"];
+    }
+    return SDLMediaClockFormat_CLOCKTEXT4;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMenuParams.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMenuParams.h
similarity index 68%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMenuParams.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMenuParams.h
index d9b8e66..7cc927d 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMenuParams.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMenuParams.h
@@ -1,10 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLMenuParams.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCMessage.h"
-
+#import <SmartDeviceLink/SDLRPCMessage.h>
 
 @interface SDLMenuParams : SDLRPCStruct {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMenuParams.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMenuParams.m
similarity index 86%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMenuParams.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMenuParams.m
index 200f9bb..f4943c6 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMenuParams.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLMenuParams.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLMenuParams.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLMenuParams.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLMenuParams.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLMenuParams
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLNames.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLNames.h
new file mode 100644 (file)
index 0000000..4579d9e
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLNames.h
@@ -0,0 +1,304 @@
+//  SDLNames.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+
+#define NAMES_accPedalPosition @"accPedalPosition"
+#define NAMES_actual @"actual"
+#define NAMES_AddCommand @"AddCommand"
+#define NAMES_AddSubMenu @"AddSubMenu"
+#define NAMES_Alert @"Alert"
+#define NAMES_AlertManeuver @"AlertManeuver"
+#define NAMES_alertText1 @"alertText1"
+#define NAMES_alertText2 @"alertText2"
+#define NAMES_alertText3 @"alertText3"
+#define NAMES_alignment @"alignment"
+#define NAMES_allowed @"allowed"
+#define NAMES_altitude @"altitude"
+#define NAMES_appHMIType @"appHMIType"
+#define NAMES_appID @"appID"
+#define NAMES_appName @"appName"
+#define NAMES_audioPassThruCapabilities @"audioPassThruCapabilities"
+#define NAMES_audioPassThruDisplayText1 @"audioPassThruDisplayText1"
+#define NAMES_audioPassThruDisplayText2 @"audioPassThruDisplayText2"
+#define NAMES_audioStreamingState @"audioStreamingState"
+#define NAMES_audioType @"audioType"
+#define NAMES_battLevelStatus @"battLevelStatus"
+#define NAMES_beltStatus @"beltStatus"
+#define NAMES_bitsPerSample @"bitsPerSample"
+#define NAMES_bodyInformation @"bodyInformation"
+#define NAMES_btIconOn @"btIconOn"
+#define NAMES_bulkData @"bulkData"
+#define NAMES_buttonCapabilities @"buttonCapabilities"
+#define NAMES_buttonEventMode @"buttonEventMode"
+#define NAMES_buttonName @"buttonName"
+#define NAMES_buttonPressMode @"buttonPressMode"
+#define NAMES_callActive @"callActive"
+#define NAMES_ChangeRegistration @"ChangeRegistration"
+#define NAMES_characterSet @"characterSet"
+#define NAMES_choiceID @"choiceID"
+#define NAMES_choiceSet @"choiceSet"
+#define NAMES_cmdIcon @"cmdIcon"
+#define NAMES_cmdID @"cmdID"
+#define NAMES_compassDirection @"compassDirection"
+#define NAMES_correlationID @"correlationID"
+#define NAMES_CreateInteractionChoiceSet @"CreateInteractionChoiceSet"
+#define NAMES_customButtonID @"customButtonID"
+#define NAMES_customPresets @"customPresets"
+#define NAMES_data @"data"
+#define NAMES_dataResult @"dataResult"
+#define NAMES_dataType @"dataType"
+#define NAMES_DeleteCommand @"DeleteCommand"
+#define NAMES_DeleteFile @"DeleteFile"
+#define NAMES_DeleteInteractionChoiceSet @"DeleteInteractionChoiceSet"
+#define NAMES_DeleteSubMenu @"DeleteSubMenu"
+#define NAMES_deviceStatus @"deviceStatus"
+#define NAMES_didLocation @"didLocation"
+#define NAMES_didResult @"didResult"
+#define NAMES_dimension @"dimension"
+#define NAMES_displayCapabilities @"displayCapabilities"
+#define NAMES_displayLayout @"displayLayout"
+#define NAMES_displayType @"displayType"
+#define NAMES_distanceToEmpty @"distanceToEmpty"
+#define NAMES_distanceToManeuver @"distanceToManeuver"
+#define NAMES_distanceToManeuverScale @"distanceToManeuverScale"
+#define NAMES_driverBeltDeployed @"driverBeltDeployed"
+#define NAMES_driverBraking @"driverBraking"
+#define NAMES_driverBuckleBelted @"driverBuckleBelted"
+#define NAMES_driverDoorAjar @"driverDoorAjar"
+#define NAMES_dtc @"dtc"
+#define NAMES_dtcMask @"dtcMask"
+#define NAMES_duration @"duration"
+#define NAMES_eCallEventActive @"eCallEventActive"
+#define NAMES_ecuHeader @"ecuHeader"
+#define NAMES_ecuName @"ecuName"
+#define NAMES_electricFuelConsumption @"electricFuelConsumption"
+#define NAMES_EndAudioPassThru @"EndAudioPassThru"
+#define NAMES_engineTorque @"engineTorque"
+#define NAMES_eta @"eta"
+#define NAMES_externalTemperature @"externalTemperature"
+#define NAMES_filenames @"filenames"
+#define NAMES_fileType @"fileType"
+#define NAMES_fuelLevel @"fuelLevel"
+#define NAMES_fuelLevelState @"fuelLevel_State"
+#define NAMES_fuelMaintenanceMode @"fuelMaintenanceMode"
+#define NAMES_GenericResponse @"GenericResponse"
+#define NAMES_GetDTCs @"GetDTCs"
+#define NAMES_GetVehicleData @"GetVehicleData"
+#define NAMES_gps @"gps"
+#define NAMES_graphic @"graphic"
+#define NAMES_graphicSupported @"graphicSupported"
+#define NAMES_hdop @"hdop"
+#define NAMES_heading @"heading"
+#define NAMES_headLampStatus @"headLampStatus"
+#define NAMES_helpPrompt @"helpPrompt"
+#define NAMES_highBeamsOn @"highBeamsOn"
+#define NAMES_hmiDisplayLanguage @"hmiDisplayLanguage"
+#define NAMES_hmiDisplayLanguageDesired @"hmiDisplayLanguageDesired"
+#define NAMES_hmiLevel @"hmiLevel"
+#define NAMES_hmiPermissions @"hmiPermissions"
+#define NAMES_hmiZoneCapabilities @"hmiZoneCapabilities"
+#define NAMES_hours @"hours"
+#define NAMES_ignitionStableStatus @"ignitionStableStatus"
+#define NAMES_ignitionStatus @"ignitionStatus"
+#define NAMES_image @"image"
+#define NAMES_imageSupported @"imageSupported"
+#define NAMES_imageType @"imageType"
+#define NAMES_info @"info"
+#define NAMES_initialPrompt @"initialPrompt"
+#define NAMES_initialText @"initialText"
+#define NAMES_innerLeftRear @"innerLeftRear"
+#define NAMES_innerRightRear @"innerRightRear"
+#define NAMES_instantFuelConsumption @"instantFuelConsumption"
+#define NAMES_interactionChoiceSetID @"interactionChoiceSetID"
+#define NAMES_interactionChoiceSetIDList @"interactionChoiceSetIDList"
+#define NAMES_interactionMode @"interactionMode"
+#define NAMES_isHighlighted @"isHighlighted"
+#define NAMES_isMediaApplication @"isMediaApplication"
+#define NAMES_language @"language"
+#define NAMES_languageDesired @"languageDesired"
+#define NAMES_latitudeDegrees @"latitudeDegrees"
+#define NAMES_leftFront @"leftFront"
+#define NAMES_leftRear @"leftRear"
+#define NAMES_leftRearInflatableBelted @"leftRearInflatableBelted"
+#define NAMES_leftRow2BuckleBelted @"leftRow2BuckleBelted"
+#define NAMES_leftRow3BuckledBelted @"leftRow3BuckledBelted"
+#define NAMES_ListFiles @"ListFiles"
+#define NAMES_longitudeDegrees @"longitudeDegrees"
+#define NAMES_longPress @"longPress"
+#define NAMES_longPressAvailable @"longPressAvailable"
+#define NAMES_lowBeamsOn @"lowBeamsOn"
+#define NAMES_mainField1 @"mainField1"
+#define NAMES_mainField2 @"mainField2"
+#define NAMES_mainField3 @"mainField3"
+#define NAMES_mainField4 @"mainField4"
+#define NAMES_majorVersion @"majorVersion"
+#define NAMES_make @"make"
+#define NAMES_maneuverComplete @"maneuverComplete"
+#define NAMES_maxDuration @"maxDuration"
+#define NAMES_mediaClock @"mediaClock"
+#define NAMES_mediaClockFormats @"mediaClockFormats"
+#define NAMES_mediaTrack @"mediaTrack"
+#define NAMES_menuID @"menuID"
+#define NAMES_menuName @"menuName"
+#define NAMES_menuParams @"menuParams"
+#define NAMES_middleRow1BeltDeployed @"middleRow1BeltDeployed"
+#define NAMES_middleRow1BuckleBelted @"middleRow1BuckleBelted"
+#define NAMES_middleRow2BuckleBelted @"middleRow2BuckleBelted"
+#define NAMES_middleRow3BuckleBelted @"middleRow3BuckleBelted"
+#define NAMES_minorVersion @"minorVersion"
+#define NAMES_minutes @"minutes"
+#define NAMES_model @"model"
+#define NAMES_modelYear @"modelYear"
+#define NAMES_monoAudioOutputMuted @"monoAudioOutputMuted"
+#define NAMES_muteAudio @"muteAudio"
+#define NAMES_name @"name"
+#define NAMES_navigationText @"navigationText"
+#define NAMES_navigationText1 @"navigationText1"
+#define NAMES_navigationText2 @"navigationText2"
+#define NAMES_ngnMediaScreenAppName @"ngnMediaScreenAppName"
+#define NAMES_notification @"notification"
+#define NAMES_numTicks @"numTicks"
+#define NAMES_odometer @"odometer"
+#define NAMES_OnAppInterfaceUnregistered @"OnAppInterfaceUnregistered"
+#define NAMES_OnAudioPassThru @"OnAudioPassThru"
+#define NAMES_OnButtonEvent @"OnButtonEvent"
+#define NAMES_OnButtonPress @"OnButtonPress"
+#define NAMES_OnCommand @"OnCommand"
+#define NAMES_OnDriverDistraction @"OnDriverDistraction"
+#define NAMES_OnHMIStatus @"OnHMIStatus"
+#define NAMES_OnLanguageChange @"OnLanguageChange"
+#define NAMES_OnPermissionsChange @"OnPermissionsChange"
+#define NAMES_onScreenPresetsAvailable @"onScreenPresetsAvailable"
+#define NAMES_OnTBTClientState @"OnTBTClientState"
+#define NAMES_OnVehicleData @"OnVehicleData"
+#define NAMES_operation_name @"name"
+#define NAMES_parameterPermissions @"parameterPermissions"
+#define NAMES_parameters @"parameters"
+#define NAMES_parentID @"parentID"
+#define NAMES_parkBrakeActive @"parkBrakeActive"
+#define NAMES_passengerBeltDeployed @"passengerBeltDeployed"
+#define NAMES_passengerBuckleBelted @"passengerBuckleBelted"
+#define NAMES_passengerChildDetected @"passengerChildDetected"
+#define NAMES_passengerDoorAjar @"passengerDoorAjar"
+#define NAMES_pdop @"pdop"
+#define NAMES_PerformAudioPassThru @"PerformAudioPassThru"
+#define NAMES_PerformInteraction @"PerformInteraction"
+#define NAMES_PermissionItem @"PermissionItem"
+#define NAMES_persistentFile @"persistentFile"
+#define NAMES_phoneRoaming @"phoneRoaming"
+#define NAMES_playTone @"playTone"
+#define NAMES_position @"position"
+#define NAMES_presetBankCapabilities @"presetBankCapabilities"
+#define NAMES_pressure @"pressure"
+#define NAMES_pressureTelltale @"pressureTelltale"
+#define NAMES_primaryAudioSource @"primaryAudioSource"
+#define NAMES_prndl @"prndl"
+#define NAMES_properties @"properties"
+#define NAMES_PutFile @"PutFile"
+#define NAMES_ReadDID @"ReadDID"
+#define NAMES_rearLeftDoorAjar @"rearLeftDoorAjar"
+#define NAMES_rearRightDoorAjar @"rearRightDoorAjar"
+#define NAMES_reason @"reason"
+#define NAMES_RegisterAppInterface @"RegisterAppInterface"
+#define NAMES_request @"request"
+#define NAMES_reserved @"reserved"
+#define NAMES_ResetGlobalProperties @"ResetGlobalProperties"
+#define NAMES_response @"response"
+#define NAMES_result @"result"
+#define NAMES_resultCode @"resultCode"
+#define NAMES_rightFront @"rightFront"
+#define NAMES_rightRear @"rightRear"
+#define NAMES_rightRearInflatableBelted @"rightRearInflatableBelted"
+#define NAMES_rightRow2BuckleBelted @"rightRow2BuckleBelted"
+#define NAMES_rightRow3BuckleBelted @"rightRow3BuckleBelted"
+#define NAMES_rows @"rows"
+#define NAMES_rpcName @"rpcName"
+#define NAMES_rpm @"rpm"
+#define NAMES_samplingRate @"samplingRate"
+#define NAMES_satellites @"satellites"
+#define NAMES_ScrollableMessage @"ScrollableMessage"
+#define NAMES_scrollableMessageBody @"scrollableMessageBody"
+#define NAMES_seconds @"seconds"
+#define NAMES_SetAppIcon @"SetAppIcon"
+#define NAMES_SetDisplayLayout @"SetDisplayLayout"
+#define NAMES_SetGlobalProperties @"SetGlobalProperties"
+#define NAMES_SetMediaClockTimer @"SetMediaClockTimer"
+#define NAMES_shortPress @"shortPress"
+#define NAMES_shortPressAvailable @"shortPressAvailable"
+#define NAMES_Show @"Show"
+#define NAMES_ShowConstantTBT @"ShowConstantTBT"
+#define NAMES_signalLevelStatus @"signalLevelStatus"
+#define NAMES_Slider @"Slider"
+#define NAMES_sliderFooter @"sliderFooter"
+#define NAMES_sliderHeader @"sliderHeader"
+#define NAMES_softButtonCapabilities @"softButtonCapabilities"
+#define NAMES_softButtonID @"softButtonID"
+#define NAMES_softButtons @"softButtons"
+#define NAMES_spaceAvailable @"spaceAvailable"
+#define NAMES_Speak @"Speak"
+#define NAMES_speechCapabilities @"speechCapabilities"
+#define NAMES_speed @"speed"
+#define NAMES_startTime @"startTime"
+#define NAMES_state @"state"
+#define NAMES_stateOfCharge @"stateOfCharge"
+#define NAMES_status @"status"
+#define NAMES_statusBar @"statusBar"
+#define NAMES_steeringWheelAngle @"steeringWheelAngle"
+#define NAMES_stereoAudioOutputMuted @"stereoAudioOutputMuted"
+#define NAMES_Subscribe @"Subscribe"
+#define NAMES_SubscribeButton @"SubscribeButton"
+#define NAMES_SubscribeVehicleData @"SubscribeVehicleData"
+#define NAMES_success @"success"
+#define NAMES_syncFileName @"syncFileName"
+#define NAMES_syncMsgVersion @"syncMsgVersion"
+#define NAMES_systemAction @"systemAction"
+#define NAMES_systemContext @"systemContext"
+#define NAMES_text @"text"
+#define NAMES_textFields @"textFields"
+#define NAMES_textMsgAvailable @"textMsgAvailable"
+#define NAMES_timeout @"timeout"
+#define NAMES_timeoutPrompt @"timeoutPrompt"
+#define NAMES_tirePressure @"tirePressure"
+#define NAMES_totalDistance @"totalDistance"
+#define NAMES_triggerSource @"triggerSource"
+#define NAMES_trim @"trim"
+#define NAMES_ttsChunks @"ttsChunks"
+#define NAMES_ttsName @"ttsName"
+#define NAMES_turnIcon @"turnIcon"
+#define NAMES_turnList @"turnList"
+#define NAMES_type @"type"
+#define NAMES_UnregisterAppInterface @"UnregisterAppInterface"
+#define NAMES_Unsubscribe @"Unsubscribe"
+#define NAMES_UnsubscribeButton @"UnsubscribeButton"
+#define NAMES_UnsubscribeVehicleData @"UnsubscribeVehicleData"
+#define NAMES_updateMode @"updateMode"
+#define NAMES_UpdateTurnList @"UpdateTurnList"
+#define NAMES_upDownAvailable @"upDownAvailable"
+#define NAMES_URL @"URL"
+#define NAMES_userDisallowed @"userDisallowed"
+#define NAMES_utcDay @"utcDay"
+#define NAMES_utcHours @"utcHours"
+#define NAMES_utcMinutes @"utcMinutes"
+#define NAMES_utcMonth @"utcMonth"
+#define NAMES_utcSeconds @"utcSeconds"
+#define NAMES_utcYear @"utcYear"
+#define NAMES_value @"value"
+#define NAMES_vdop @"vdop"
+#define NAMES_vehicleType @"vehicleType"
+#define NAMES_vin @"vin"
+#define NAMES_voiceRecOn @"voiceRecOn"
+#define NAMES_vrCapabilities @"vrCapabilities"
+#define NAMES_vrCommands @"vrCommands"
+#define NAMES_vrHelp @"vrHelp"
+#define NAMES_vrHelpTitle @"vrHelpTitle"
+#define NAMES_vrSynonyms @"vrSynonyms"
+#define NAMES_width @"width"
+#define NAMES_wiperStatus @"wiperStatus"
+
+
+#define NAMES_EncodedSyncPData @"EncodedSyncPData"
+#define NAMES_SyncPData @"SyncPData"
+#define NAMES_OnEncodedSyncPData @"OnEncodedSyncPData"
+#define NAMES_OnSyncPData @"OnSyncPData"

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnAppInterfaceUnregistered.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h
similarity index 53%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnAppInterfaceUnregistered.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h
index 2e0f8ad..10dc997 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnAppInterfaceUnregistered.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h
@@ -1,11 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLOnAppInterfaceUnregistered.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCNotification.h"
+#import <SmartDeviceLink/SDLRPCNotification.h>
 
-#import "SDLAppInterfaceUnregisteredReason.h"
+#import <SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h>
 
 @interface SDLOnAppInterfaceUnregistered : SDLRPCNotification {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnAppInterfaceUnregistered.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
similarity index 81%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnAppInterfaceUnregistered.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
index a2e4fd3..6d91e24 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnAppInterfaceUnregistered.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLOnAppInterfaceUnregistered.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLOnAppInterfaceUnregistered.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLOnAppInterfaceUnregistered.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLOnAppInterfaceUnregistered
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnAudioPassThru.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnAudioPassThru.h
new file mode 100644 (file)
index 0000000..f7d704a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnAudioPassThru.h
@@ -0,0 +1,15 @@
+//  SDLOnAudioPassThru.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCNotification.h>
+
+@interface SDLOnAudioPassThru : SDLRPCNotification {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSData* bulkData;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnAudioPassThru.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnAudioPassThru.m
new file mode 100644 (file)
index 0000000..141bed7
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnAudioPassThru.m
@@ -0,0 +1,33 @@
+//  SDLOnAudioPassThru.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLOnAudioPassThru.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLOnAudioPassThru
+
+-(id) init {
+    if (self = [super initWithName:NAMES_OnAudioPassThru]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setBulkData:(NSData *)bulkData {
+    if (bulkData != nil) {
+        [store setObject:bulkData forKey:NAMES_bulkData];
+    } else {
+        [store removeObjectForKey:NAMES_bulkData];
+    }
+}
+
+-(NSData*) bulkData {
+    return [store objectForKey:NAMES_bulkData];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnButtonEvent.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnButtonEvent.h
new file mode 100644 (file)
index 0000000..b289a31
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnButtonEvent.h
@@ -0,0 +1,20 @@
+//  SDLOnButtonEvent.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCNotification.h>
+
+#import <SmartDeviceLink/SDLButtonEventMode.h>
+#import <SmartDeviceLink/SDLButtonName.h>
+
+@interface SDLOnButtonEvent : SDLRPCNotification {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLButtonName* buttonName;
+@property(assign) SDLButtonEventMode* buttonEventMode;
+@property(assign) NSNumber* customButtonID;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnButtonEvent.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnButtonEvent.m
similarity index 71%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnButtonEvent.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnButtonEvent.m
index 3e0e53c..62902e2 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnButtonEvent.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnButtonEvent.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLOnButtonEvent.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLOnButtonEvent.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLOnButtonEvent.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLOnButtonEvent
 
@@ -51,4 +52,16 @@
     }
 }
 
+-(void) setCustomButtonID:(NSNumber *) customButtonID {
+    if (customButtonID != nil) {
+        [parameters setObject:customButtonID forKey:NAMES_customButtonID];
+    } else {
+        [parameters removeObjectForKey:NAMES_customButtonID];
+    }
+}
+
+-(NSNumber*) customButtonID {
+    return [parameters objectForKey:NAMES_customButtonID];
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnButtonPress.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnButtonPress.h
new file mode 100644 (file)
index 0000000..9460c44
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnButtonPress.h
@@ -0,0 +1,20 @@
+//  SDLOnButtonPress.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCNotification.h>
+
+#import <SmartDeviceLink/SDLButtonName.h>
+#import <SmartDeviceLink/SDLButtonPressMode.h>
+
+@interface SDLOnButtonPress : SDLRPCNotification {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLButtonName* buttonName;
+@property(assign) SDLButtonPressMode* buttonPressMode;
+@property(assign) NSNumber* customButtonID;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnButtonPress.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnButtonPress.m
similarity index 71%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnButtonPress.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnButtonPress.m
index c5a9f37..8fc14ec 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnButtonPress.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnButtonPress.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLOnButtonPress.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLOnButtonPress.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLOnButtonPress.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLOnButtonPress
 
@@ -51,4 +52,16 @@
     }
 }
 
+-(void) setCustomButtonID:(NSNumber *) customButtonID {
+    if (customButtonID != nil) {
+        [parameters setObject:customButtonID forKey:NAMES_customButtonID];
+    } else {
+        [parameters removeObjectForKey:NAMES_customButtonID];
+    }
+}
+
+-(NSNumber*) customButtonID {
+    return [parameters objectForKey:NAMES_customButtonID];
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnCommand.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnCommand.h
similarity index 58%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnCommand.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnCommand.h
index cf258b1..a7d2845 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnCommand.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnCommand.h
@@ -1,11 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLOnCommand.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCNotification.h"
+#import <SmartDeviceLink/SDLRPCNotification.h>
 
-#import "SDLTriggerSource.h"
+#import <SmartDeviceLink/SDLTriggerSource.h>
 
 @interface SDLOnCommand : SDLRPCNotification {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnCommand.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnCommand.m
similarity index 86%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnCommand.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnCommand.m
index 4e08675..167fb48 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnCommand.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnCommand.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLOnCommand.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLOnCommand.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLOnCommand.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLOnCommand
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnDriverDistraction.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnDriverDistraction.h
similarity index 53%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnDriverDistraction.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnDriverDistraction.h
index 17420a8..46f5810 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnDriverDistraction.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnDriverDistraction.h
@@ -1,10 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLOnDriverDistraction.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCNotification.h"
-#import "SDLDriverDistractionState.h"
+#import <SmartDeviceLink/SDLRPCNotification.h>
+
+#import <SmartDeviceLink/SDLDriverDistractionState.h>
 
 @interface SDLOnDriverDistraction: SDLRPCNotification {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnDriverDistraction.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnDriverDistraction.m
similarity index 81%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnDriverDistraction.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnDriverDistraction.m
index 1e3e4b5..156f396 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnDriverDistraction.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnDriverDistraction.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLOnDriverDistraction.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLOnDriverDistraction.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLOnDriverDistraction.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLOnDriverDistraction
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnEncodedSyncPData.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnEncodedSyncPData.h
new file mode 100644 (file)
index 0000000..f1105a7
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnEncodedSyncPData.h
@@ -0,0 +1,17 @@
+//  SDLOnEncodedSyncPData.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCNotification.h>
+
+@interface SDLOnEncodedSyncPData: SDLRPCNotification {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSMutableArray* data;
+@property(assign) NSString* url;
+@property(assign) NSNumber* timeout;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnEncodedSyncPData.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnEncodedSyncPData.m
new file mode 100644 (file)
index 0000000..04a408e
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnEncodedSyncPData.m
@@ -0,0 +1,58 @@
+//  SDLOnEncodedSyncPData.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLOnEncodedSyncPData.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLOnEncodedSyncPData
+
+-(id) init {
+    if (self = [super initWithName:NAMES_OnEncodedSyncPData]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setData:(NSMutableArray*) data {
+    if (data != nil) {
+        [parameters setObject:data forKey:NAMES_data];
+    } else {
+        [parameters removeObjectForKey:NAMES_data];
+    }
+}
+
+-(NSMutableArray*) data {
+    NSMutableArray* obj = [parameters objectForKey:NAMES_data];
+       return (NSMutableArray*)obj;
+}
+
+-(void) setUrl:(NSString *)url {
+    if (url != nil) {
+        [parameters setObject:url forKey:NAMES_URL];
+    } else {
+        [parameters removeObjectForKey:NAMES_URL];
+    }
+}
+
+-(NSString*)url {
+    return [parameters objectForKey:NAMES_URL];
+}
+
+-(void) setTimeout:(NSNumber*) timeout {
+    if (timeout != nil) {
+        [parameters setObject:timeout forKey:NAMES_timeout];
+    } else {
+        [parameters removeObjectForKey:NAMES_timeout];
+    }
+}
+
+-(NSNumber*) timeout {
+    return [parameters objectForKey:NAMES_timeout];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnHMIStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnHMIStatus.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnHMIStatus.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnHMIStatus.h
index 4ab4549..9379953 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnHMIStatus.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnHMIStatus.h
@@ -1,13 +1,13 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLOnHMIStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCNotification.h"
+#import <SmartDeviceLink/SDLRPCNotification.h>
 
-#import "SDLHMILevel.h"
-#import "SDLAudioStreamingState.h"
-#import "SDLSystemContext.h"
+#import <SmartDeviceLink/SDLAudioStreamingState.h>
+#import <SmartDeviceLink/SDLHMILevel.h>
+#import <SmartDeviceLink/SDLSystemContext.h>
 
 @interface SDLOnHMIStatus : SDLRPCNotification {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnHMIStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnHMIStatus.m
similarity index 91%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnHMIStatus.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnHMIStatus.m
index a591dd0..c989a9a 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnHMIStatus.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnHMIStatus.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLOnHMIStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLOnHMIStatus.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLOnHMIStatus.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLOnHMIStatus
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnLanguageChange.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnLanguageChange.h
new file mode 100644 (file)
index 0000000..5c9edde
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnLanguageChange.h
@@ -0,0 +1,18 @@
+//  SDLOnLanguageChange.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCNotification.h>
+
+#import <SmartDeviceLink/SDLLanguage.h>
+
+@interface SDLOnLanguageChange : SDLRPCNotification {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLLanguage* language;
+@property(assign) SDLLanguage* hmiDisplayLanguage;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnLanguageChange.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnLanguageChange.m
new file mode 100644 (file)
index 0000000..93f273e
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnLanguageChange.m
@@ -0,0 +1,55 @@
+//  SDLOnLanguageChange.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLOnLanguageChange.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLOnLanguageChange
+
+-(id) init {
+    if (self = [super initWithName:NAMES_OnLanguageChange]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setLanguage:(SDLLanguage *) language {
+    if (language != nil) {
+        [parameters setObject:language forKey:NAMES_language];
+    } else {
+        [parameters removeObjectForKey:NAMES_language];
+    }
+}
+
+-(SDLLanguage*) language {
+    NSObject* obj = [parameters objectForKey:NAMES_language];
+    if ([obj isKindOfClass:SDLLanguage.class]) {
+        return (SDLLanguage*)obj;
+    } else { 
+        return [SDLLanguage valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setHmiDisplayLanguage:(SDLLanguage *) hmiDisplayLanguage {
+    if (hmiDisplayLanguage != nil) {
+        [parameters setObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage];
+    } else {
+        [parameters removeObjectForKey:NAMES_hmiDisplayLanguage];
+    }
+}
+
+-(SDLLanguage*) hmiDisplayLanguage {
+    NSObject* obj = [parameters objectForKey:NAMES_hmiDisplayLanguage];
+    if ([obj isKindOfClass:SDLLanguage.class]) {
+        return (SDLLanguage*)obj;
+    } else {
+        return [SDLLanguage valueOf:(NSString*)obj];
+    }
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnPermissionsChange.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnPermissionsChange.h
new file mode 100644 (file)
index 0000000..ad8dc1b
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnPermissionsChange.h
@@ -0,0 +1,15 @@
+//  SDLOnPermissionsChange.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLPermissionItem.h>
+#import <SmartDeviceLink/SDLRPCNotification.h>
+
+@interface SDLOnPermissionsChange : SDLRPCNotification
+
+-(id)init;
+-(id)initWithDictionary:(NSMutableDictionary *)dict;
+
+@property(assign) NSMutableArray* permissionItem;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnPermissionsChange.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnPermissionsChange.m
new file mode 100644 (file)
index 0000000..75602cf
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnPermissionsChange.m
@@ -0,0 +1,37 @@
+//  SDLOnPermissionsChange.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLOnPermissionsChange.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLOnPermissionsChange
+
+-(id) init {
+    if (self = [super initWithName:NAMES_OnPermissionsChange]) {
+        
+    }
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary *)dict {
+    if (self = [super initWithDictionary:dict]) {
+        
+    }
+    return self;
+}
+
+-(void) setPermissionItem:(NSMutableArray *)permissionItem {
+    if (permissionItem != nil) {
+        [parameters setObject:permissionItem forKey:NAMES_PermissionItem];
+    } else {
+        [parameters removeObjectForKey:NAMES_PermissionItem];
+    }
+}
+
+-(NSMutableArray*) permissionItem {
+    return [parameters objectForKey:NAMES_PermissionItem];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnSyncPData.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnSyncPData.h
new file mode 100644 (file)
index 0000000..87950d9
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnSyncPData.h
@@ -0,0 +1,17 @@
+//  SDLOnSyncPData.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCNotification.h>
+
+@interface SDLOnSyncPData: SDLRPCNotification {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSMutableArray* data;
+@property(assign) NSString* url;
+@property(assign) NSNumber* timeout;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnSyncPData.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnSyncPData.m
new file mode 100644 (file)
index 0000000..4da875c
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnSyncPData.m
@@ -0,0 +1,58 @@
+//  SDLOnSyncPData.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLOnSyncPData.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLOnSyncPData
+
+-(id) init {
+    if (self = [super initWithName:NAMES_OnSyncPData]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setData:(NSMutableArray*) data {
+    if (data != nil) {
+        [parameters setObject:data forKey:NAMES_data];
+    } else {
+        [parameters removeObjectForKey:NAMES_data];
+    }
+}
+
+-(NSMutableArray*) data {
+    NSMutableArray* obj = [parameters objectForKey:NAMES_data];
+       return (NSMutableArray*)obj;
+}
+
+-(void) setUrl:(NSString *)url {
+    if (url != nil) {
+        [parameters setObject:url forKey:NAMES_URL];
+    } else {
+        [parameters removeObjectForKey:NAMES_URL];
+    }
+}
+
+-(NSString*)url {
+    return [parameters objectForKey:NAMES_URL];
+}
+
+-(void) setTimeout:(NSNumber*) timeout {
+    if (timeout != nil) {
+        [parameters setObject:timeout forKey:NAMES_timeout];
+    } else {
+        [parameters removeObjectForKey:NAMES_timeout];
+    }
+}
+
+-(NSNumber*) timeout {
+    return [parameters objectForKey:NAMES_timeout];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnTBTClientState.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnTBTClientState.h
similarity index 53%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnTBTClientState.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnTBTClientState.h
index 1aee4f3..24229ef 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnTBTClientState.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnTBTClientState.h
@@ -1,10 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLOnTBTClientState.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCNotification.h"
-#import "SDLTBTState.h"
+#import <SmartDeviceLink/SDLRPCNotification.h>
+
+#import <SmartDeviceLink/SDLTBTState.h>
 
 @interface SDLOnTBTClientState: SDLRPCNotification {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnTBTClientState.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnTBTClientState.m
similarity index 80%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnTBTClientState.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnTBTClientState.m
index 329f63f..2ba1222 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnTBTClientState.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnTBTClientState.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLOnTBTClientState.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLOnTBTClientState.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLOnTBTClientState.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLOnTBTClientState
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnVehicleData.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnVehicleData.h
new file mode 100644 (file)
index 0000000..4685994
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnVehicleData.h
@@ -0,0 +1,45 @@
+//  SDLOnVehicleData.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCNotification.h>
+
+#import <SmartDeviceLink/SDLBeltStatus.h>
+#import <SmartDeviceLink/SDLBodyInformation.h>
+#import <SmartDeviceLink/SDLComponentVolumeStatus.h>
+#import <SmartDeviceLink/SDLDeviceStatus.h>
+#import <SmartDeviceLink/SDLGPSData.h>
+#import <SmartDeviceLink/SDLHeadLampStatus.h>
+#import <SmartDeviceLink/SDLPRNDL.h>
+#import <SmartDeviceLink/SDLTireStatus.h>
+#import <SmartDeviceLink/SDLVehicleDataEventStatus.h>
+#import <SmartDeviceLink/SDLWiperStatus.h>
+
+@interface SDLOnVehicleData : SDLRPCNotification {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLGPSData* gps;
+@property(assign) NSNumber* speed;
+@property(assign) NSNumber* rpm;
+@property(assign) NSNumber* fuelLevel;
+@property(assign) SDLComponentVolumeStatus* fuelLevelState;
+@property(assign) NSNumber* instantFuelConsumption;
+@property(assign) NSNumber* externalTemperature;
+@property(assign) NSString* vin;
+@property(assign) SDLPRNDL* prndl;
+@property(assign) SDLTireStatus* tirePressure;
+@property(assign) NSNumber* odometer;
+@property(assign) SDLBeltStatus* beltStatus;
+@property(assign) SDLBodyInformation* bodyInformation;
+@property(assign) SDLDeviceStatus* deviceStatus;
+@property(assign) SDLVehicleDataEventStatus* driverBraking;
+@property(assign) SDLWiperStatus* wiperStatus;
+@property(assign) SDLHeadLampStatus* headLampStatus;
+@property(assign) NSNumber* engineTorque;
+@property(assign) NSNumber* accPedalPosition;
+@property(assign) NSNumber* steeringWheelAngle;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnVehicleData.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnVehicleData.m
new file mode 100644 (file)
index 0000000..fc6ec53
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLOnVehicleData.m
@@ -0,0 +1,311 @@
+//  SDLOnVehicleData.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLOnVehicleData.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLOnVehicleData
+
+-(id) init {
+    if (self = [super initWithName:NAMES_OnVehicleData]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setGps:(SDLGPSData*) gps {
+    if (gps != nil) {
+        [parameters setObject:gps forKey:NAMES_gps];
+    } else {
+        [parameters removeObjectForKey:NAMES_gps];
+    }
+}
+
+-(SDLGPSData*) gps {
+    NSObject* obj = [parameters objectForKey:NAMES_gps];
+    if ([obj isKindOfClass:SDLGPSData.class]) {
+        return (SDLGPSData*)obj;
+    } else {
+        return [[[SDLGPSData alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setSpeed:(NSNumber*) speed {
+    if (speed != nil) {
+        [parameters setObject:speed forKey:NAMES_speed];
+    } else {
+        [parameters removeObjectForKey:NAMES_speed];
+    }
+}
+
+-(NSNumber*) speed {
+    return [parameters objectForKey:NAMES_speed];
+}
+
+-(void) setRpm:(NSNumber*) rpm {
+    if (rpm != nil) {
+        [parameters setObject:rpm forKey:NAMES_rpm];
+    } else {
+        [parameters removeObjectForKey:NAMES_rpm];
+    }
+}
+
+-(NSNumber*) rpm {
+    return [parameters objectForKey:NAMES_rpm];
+}
+
+-(void) setFuelLevel:(NSNumber*) fuelLevel {
+    if (fuelLevel != nil) {
+        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevel];
+    }
+}
+
+-(NSNumber*) fuelLevel {
+    return [parameters objectForKey:NAMES_fuelLevel];
+}
+
+-(void) setFuelLevelState:(SDLComponentVolumeStatus*) fuelLevelState {
+    if (fuelLevelState != nil) {
+        [parameters setObject:fuelLevelState forKey:NAMES_fuelLevelState];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevelState];
+    }
+}
+
+-(SDLComponentVolumeStatus*) fuelLevelState {
+    NSObject* obj = [parameters objectForKey:NAMES_fuelLevelState];
+    if ([obj isKindOfClass:SDLComponentVolumeStatus.class]) {
+        return (SDLComponentVolumeStatus*)obj;
+    } else {
+        return [SDLComponentVolumeStatus valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setInstantFuelConsumption:(NSNumber*) instantFuelConsumption {
+    if (instantFuelConsumption != nil) {
+        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+    } else {
+        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+    }
+}
+
+-(NSNumber*) instantFuelConsumption {
+    return [parameters objectForKey:NAMES_instantFuelConsumption];
+}
+
+-(void) setExternalTemperature:(NSNumber*) externalTemperature {
+    if (externalTemperature != nil) {
+        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+    } else {
+        [parameters removeObjectForKey:NAMES_externalTemperature];
+    }
+}
+
+-(NSNumber*) externalTemperature {
+    return [parameters objectForKey:NAMES_externalTemperature];
+}
+
+-(void) setVin:(NSString*) vin {
+    if (vin != nil) {
+        [parameters setObject:vin forKey:NAMES_vin];
+    } else {
+        [parameters removeObjectForKey:NAMES_vin];
+    }
+}
+
+-(NSString*) vin {
+    return [parameters objectForKey:NAMES_vin];
+}
+
+-(void) setPrndl:(SDLPRNDL*) prndl {
+    if (prndl != nil) {
+        [parameters setObject:prndl forKey:NAMES_prndl];
+    } else {
+        [parameters removeObjectForKey:NAMES_prndl];
+    }
+}
+
+-(SDLPRNDL*) prndl {
+    NSObject* obj = [parameters objectForKey:NAMES_prndl];
+    if ([obj isKindOfClass:SDLPRNDL.class]) {
+        return (SDLPRNDL*)obj;
+    } else {
+        return [SDLPRNDL valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setTirePressure:(SDLTireStatus*) tirePressure {
+    if (tirePressure != nil) {
+        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+    } else {
+        [parameters removeObjectForKey:NAMES_tirePressure];
+    }
+}
+
+-(SDLTireStatus*) tirePressure {
+    NSObject* obj = [parameters objectForKey:NAMES_tirePressure];
+    if ([obj isKindOfClass:SDLTireStatus.class]) {
+        return (SDLTireStatus*)obj;
+    } else {
+        return [[[SDLTireStatus alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setOdometer:(NSNumber*) odometer {
+    if (odometer != nil) {
+        [parameters setObject:odometer forKey:NAMES_odometer];
+    } else {
+        [parameters removeObjectForKey:NAMES_odometer];
+    }
+}
+
+-(NSNumber*) odometer {
+    return [parameters objectForKey:NAMES_odometer];
+}
+
+-(void) setBeltStatus:(SDLBeltStatus*) beltStatus {
+    if (beltStatus != nil) {
+        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_beltStatus];
+    }
+}
+
+-(SDLBeltStatus*) beltStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_beltStatus];
+    if ([obj isKindOfClass:SDLBeltStatus.class]) {
+        return (SDLBeltStatus*)obj;
+    } else {
+        return [[[SDLBeltStatus alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setBodyInformation:(SDLBodyInformation*) bodyInformation {
+    if (bodyInformation != nil) {
+        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+    } else {
+        [parameters removeObjectForKey:NAMES_bodyInformation];
+    }
+}
+
+-(SDLBodyInformation*) bodyInformation {
+    NSObject* obj = [parameters objectForKey:NAMES_bodyInformation];
+    if ([obj isKindOfClass:SDLBodyInformation.class]) {
+        return (SDLBodyInformation*)obj;
+    } else {
+        return [[[SDLBodyInformation alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setDeviceStatus:(SDLDeviceStatus*) deviceStatus {
+    if (deviceStatus != nil) {
+        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_deviceStatus];
+    }
+}
+
+-(SDLDeviceStatus*) deviceStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_deviceStatus];
+    if ([obj isKindOfClass:SDLDeviceStatus.class]) {
+        return (SDLDeviceStatus*)obj;
+    } else {
+        return [[[SDLDeviceStatus alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setDriverBraking:(SDLVehicleDataEventStatus*) driverBraking {
+    if (driverBraking != nil) {
+        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+    } else {
+        [parameters removeObjectForKey:NAMES_driverBraking];
+    }
+}
+
+-(SDLVehicleDataEventStatus*) driverBraking {
+    NSObject* obj = [parameters objectForKey:NAMES_driverBraking];
+    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+        return (SDLVehicleDataEventStatus*)obj;
+    } else {
+        return [SDLVehicleDataEventStatus valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setWiperStatus:(SDLWiperStatus*) wiperStatus {
+    if (wiperStatus != nil) {
+        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_wiperStatus];
+    }
+}
+
+-(SDLWiperStatus*) wiperStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_wiperStatus];
+    if ([obj isKindOfClass:SDLWiperStatus.class]) {
+        return (SDLWiperStatus*)obj;
+    } else {
+        return [SDLWiperStatus valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setHeadLampStatus:(SDLHeadLampStatus*) headLampStatus {
+    if (headLampStatus != nil) {
+        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_headLampStatus];
+    }
+}
+
+-(SDLHeadLampStatus*) headLampStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_headLampStatus];
+    if ([obj isKindOfClass:SDLHeadLampStatus.class]) {
+        return (SDLHeadLampStatus*)obj;
+    } else {
+        return [[[SDLHeadLampStatus alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setEngineTorque:(NSNumber*) engineTorque {
+    if (engineTorque != nil) {
+        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+    } else {
+        [parameters removeObjectForKey:NAMES_engineTorque];
+    }
+}
+
+-(NSNumber*) engineTorque {
+    return [parameters objectForKey:NAMES_engineTorque];
+}
+
+-(void) setAccPedalPosition:(NSNumber*) accPedalPosition {
+    if (accPedalPosition != nil) {
+        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+    } else {
+        [parameters removeObjectForKey:NAMES_accPedalPosition];
+    }
+}
+
+-(NSNumber*) accPedalPosition {
+    return [parameters objectForKey:NAMES_accPedalPosition];
+}
+
+-(void) setSteeringWheelAngle:(NSNumber*) steeringWheelAngle {
+    if (steeringWheelAngle != nil) {
+        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+    } else {
+        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+    }
+}
+
+-(NSNumber*) steeringWheelAngle {
+    return [parameters objectForKey:NAMES_steeringWheelAngle];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPRNDL.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPRNDL.h
new file mode 100644 (file)
index 0000000..a039cb8
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPRNDL.h
@@ -0,0 +1,30 @@
+//  SDLPRNDL.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLPRNDL : SDLEnum {}
+
++(SDLPRNDL*) valueOf:(NSString*) value;
++(NSMutableArray*) values;                                 
+
++(SDLPRNDL*) PARK;
++(SDLPRNDL*) REVERSE;
++(SDLPRNDL*) NEUTRAL;
++(SDLPRNDL*) DRIVE;
++(SDLPRNDL*) SPORT;
++(SDLPRNDL*) LOWGEAR;
++(SDLPRNDL*) FIRST;
++(SDLPRNDL*) SECOND;
++(SDLPRNDL*) THIRD;
++(SDLPRNDL*) FOURTH;
++(SDLPRNDL*) FIFTH;
++(SDLPRNDL*) SIXTH;
++(SDLPRNDL*) SEVENTH;
++(SDLPRNDL*) EIGTH;
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPRNDL.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPRNDL.m
new file mode 100644 (file)
index 0000000..5701c05
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPRNDL.m
@@ -0,0 +1,157 @@
+//  SDLPRNDL.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLPRNDL.h>   
+
+SDLPRNDL* SDLPRNDL_PARK = nil;
+SDLPRNDL* SDLPRNDL_REVERSE = nil;
+SDLPRNDL* SDLPRNDL_NEUTRAL = nil;
+SDLPRNDL* SDLPRNDL_DRIVE = nil;
+SDLPRNDL* SDLPRNDL_SPORT = nil;
+SDLPRNDL* SDLPRNDL_LOWGEAR = nil;
+SDLPRNDL* SDLPRNDL_FIRST = nil;
+SDLPRNDL* SDLPRNDL_SECOND = nil;
+SDLPRNDL* SDLPRNDL_THIRD = nil;
+SDLPRNDL* SDLPRNDL_FOURTH = nil;
+SDLPRNDL* SDLPRNDL_FIFTH = nil;
+SDLPRNDL* SDLPRNDL_SIXTH = nil;
+SDLPRNDL* SDLPRNDL_SEVENTH = nil;
+SDLPRNDL* SDLPRNDL_EIGTH = nil;
+
+NSMutableArray* SDLPRNDL_values = nil; 
+
+@implementation SDLPRNDL
+
++(SDLPRNDL*) valueOf:(NSString*) value {                       
+       for (SDLPRNDL* item in SDLPRNDL.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLPRNDL_values == nil) {                               
+               SDLPRNDL_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLPRNDL.PARK,
+                                    SDLPRNDL.REVERSE,
+                                    SDLPRNDL.NEUTRAL,
+                                    SDLPRNDL.DRIVE,
+                                    SDLPRNDL.SPORT,
+                                    SDLPRNDL.LOWGEAR,
+                                    SDLPRNDL.FIRST,
+                                    SDLPRNDL.SECOND,
+                                    SDLPRNDL.THIRD,
+                                    SDLPRNDL.FOURTH,
+                                    SDLPRNDL.FIFTH,
+                                    SDLPRNDL.SIXTH,
+                                    SDLPRNDL.SEVENTH,
+                                    SDLPRNDL.EIGTH,
+                                                                       nil];
+       } 
+       return SDLPRNDL_values; 
+}
+
++(SDLPRNDL*) PARK {
+       if (SDLPRNDL_PARK == nil) {
+               SDLPRNDL_PARK = [[SDLPRNDL alloc] initWithValue:@"PARK"];
+       } 
+       return SDLPRNDL_PARK;  
+}
+
++(SDLPRNDL*) REVERSE {
+       if (SDLPRNDL_REVERSE == nil) {
+               SDLPRNDL_REVERSE = [[SDLPRNDL alloc] initWithValue:@"REVERSE"];
+       }
+       return SDLPRNDL_REVERSE;
+}
+
++(SDLPRNDL*) NEUTRAL {
+       if (SDLPRNDL_NEUTRAL == nil) {
+               SDLPRNDL_NEUTRAL = [[SDLPRNDL alloc] initWithValue:@"NEUTRAL"];
+       }
+       return SDLPRNDL_NEUTRAL;
+}
+
++(SDLPRNDL*) DRIVE {
+       if (SDLPRNDL_DRIVE == nil) {
+               SDLPRNDL_DRIVE = [[SDLPRNDL alloc] initWithValue:@"DRIVE"];
+       }
+       return SDLPRNDL_DRIVE;
+}
+
++(SDLPRNDL*) SPORT {
+       if (SDLPRNDL_SPORT == nil) {
+               SDLPRNDL_SPORT = [[SDLPRNDL alloc] initWithValue:@"SPORT"];
+       }
+       return SDLPRNDL_SPORT;
+}
+
++(SDLPRNDL*) LOWGEAR {
+       if (SDLPRNDL_LOWGEAR == nil) {
+               SDLPRNDL_LOWGEAR = [[SDLPRNDL alloc] initWithValue:@"LOWGEAR"];
+       }
+       return SDLPRNDL_LOWGEAR;
+}
+
++(SDLPRNDL*) FIRST {
+       if (SDLPRNDL_FIRST == nil) {
+               SDLPRNDL_FIRST = [[SDLPRNDL alloc] initWithValue:@"FIRST"];
+       }
+       return SDLPRNDL_FIRST;
+}
+
++(SDLPRNDL*) SECOND {
+       if (SDLPRNDL_SECOND == nil) {
+               SDLPRNDL_SECOND = [[SDLPRNDL alloc] initWithValue:@"SECOND"];
+       }
+       return SDLPRNDL_SECOND;
+}
+
++(SDLPRNDL*) THIRD {
+       if (SDLPRNDL_THIRD == nil) {
+               SDLPRNDL_THIRD = [[SDLPRNDL alloc] initWithValue:@"THIRD"];
+       }
+       return SDLPRNDL_THIRD;
+}
+
++(SDLPRNDL*) FOURTH {
+       if (SDLPRNDL_FOURTH == nil) {
+               SDLPRNDL_FOURTH = [[SDLPRNDL alloc] initWithValue:@"FOURTH"];
+       }
+       return SDLPRNDL_FOURTH;
+}
+
++(SDLPRNDL*) FIFTH {
+       if (SDLPRNDL_FIFTH == nil) {
+               SDLPRNDL_FIFTH = [[SDLPRNDL alloc] initWithValue:@"FIFTH"];
+       }
+       return SDLPRNDL_FIFTH;
+}
+
++(SDLPRNDL*) SIXTH {
+       if (SDLPRNDL_SIXTH == nil) {
+               SDLPRNDL_SIXTH = [[SDLPRNDL alloc] initWithValue:@"SIXTH"];
+       }
+       return SDLPRNDL_SIXTH;
+}
+
++(SDLPRNDL*) SEVENTH {
+       if (SDLPRNDL_SEVENTH == nil) {
+               SDLPRNDL_SEVENTH = [[SDLPRNDL alloc] initWithValue:@"SEVENTH"];
+       }
+       return SDLPRNDL_SEVENTH;
+}
+
++(SDLPRNDL*) EIGTH {
+       if (SDLPRNDL_EIGTH == nil) {
+               SDLPRNDL_EIGTH = [[SDLPRNDL alloc] initWithValue:@"EIGTH"];
+       }
+       return SDLPRNDL_EIGTH;
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLParameterPermissions.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLParameterPermissions.h
new file mode 100644 (file)
index 0000000..ed4e678
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLParameterPermissions.h
@@ -0,0 +1,16 @@
+//  SDLParameterPermissions.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+@interface SDLParameterPermissions : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSMutableArray* allowed;
+@property(assign) NSMutableArray* userDisallowed;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLParameterPermissions.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLParameterPermissions.m
new file mode 100644 (file)
index 0000000..cfa72df
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLParameterPermissions.m
@@ -0,0 +1,45 @@
+//  SDLParameterPermissions.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLParameterPermissions.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLParameterPermissions
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setAllowed:(NSMutableArray *) allowed {
+    if (allowed != nil) {
+        [store setObject:allowed forKey:NAMES_allowed];
+    } else {
+        [store removeObjectForKey:NAMES_allowed];
+    }
+}
+
+-(NSMutableArray*) allowed {
+    return [store objectForKey:NAMES_allowed];
+}
+
+-(void) setUserDisallowed:(NSMutableArray *) userDisallowed {
+    if (userDisallowed != nil) {
+        [store setObject:userDisallowed forKey:NAMES_userDisallowed];
+    } else {
+        [store removeObjectForKey:NAMES_userDisallowed];
+    }
+}
+
+-(NSMutableArray*) userDisallowed {
+    return [store objectForKey:NAMES_userDisallowed];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformAudioPassThru.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformAudioPassThru.h
new file mode 100644 (file)
index 0000000..a69b394
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformAudioPassThru.h
@@ -0,0 +1,26 @@
+//  SDLPerformAudioPassThru.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+#import <SmartDeviceLink/SDLAudioType.h>
+#import <SmartDeviceLink/SDLBitsPerSample.h>
+#import <SmartDeviceLink/SDLSamplingRate.h>
+
+@interface SDLPerformAudioPassThru : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSMutableArray* initialPrompt;
+@property(assign) NSString* audioPassThruDisplayText1;
+@property(assign) NSString* audioPassThruDisplayText2;
+@property(assign) SDLSamplingRate* samplingRate;
+@property(assign) NSNumber* maxDuration;
+@property(assign) SDLBitsPerSample* bitsPerSample;
+@property(assign) SDLAudioType* audioType;
+@property(assign) NSNumber* muteAudio;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformAudioPassThru.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformAudioPassThru.m
new file mode 100644 (file)
index 0000000..8729527
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformAudioPassThru.m
@@ -0,0 +1,144 @@
+//  SDLPerformAudioPassThru.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLPerformAudioPassThru.h>
+
+#import <SmartDeviceLink/SDLTTSChunk.h>
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLPerformAudioPassThru
+
+-(id) init {
+    if (self = [super initWithName:NAMES_PerformAudioPassThru]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setInitialPrompt:(NSMutableArray*) initialPrompt {
+    if (initialPrompt != nil) {
+        [parameters setObject:initialPrompt forKey:NAMES_initialPrompt];
+    } else {
+        [parameters removeObjectForKey:NAMES_initialPrompt];
+    }
+}
+
+-(NSMutableArray*) initialPrompt {
+    NSMutableArray* array = [parameters objectForKey:NAMES_initialPrompt];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
+-(void) setAudioPassThruDisplayText1:(NSString*) audioPassThruDisplayText1 {
+    if (audioPassThruDisplayText1 != nil) {
+        [parameters setObject:audioPassThruDisplayText1 forKey:NAMES_audioPassThruDisplayText1];
+    } else {
+        [parameters removeObjectForKey:NAMES_audioPassThruDisplayText1];
+    }
+}
+
+-(NSString*) audioPassThruDisplayText1 {
+    return [parameters objectForKey:NAMES_audioPassThruDisplayText2];
+}
+
+-(void) setAudioPassThruDisplayText2:(NSString*) audioPassThruDisplayText2 {
+    if (audioPassThruDisplayText2 != nil) {
+        [parameters setObject:audioPassThruDisplayText2 forKey:NAMES_audioPassThruDisplayText2];
+    } else {
+        [parameters removeObjectForKey:NAMES_audioPassThruDisplayText2];
+    }
+}
+
+-(NSString*) audioPassThruDisplayText2 {
+    return [parameters objectForKey:NAMES_audioPassThruDisplayText2];
+}
+
+-(void) setSamplingRate:(SDLSamplingRate *)samplingRate {
+    if (samplingRate != nil) {
+        [parameters setObject:samplingRate forKey:NAMES_samplingRate];
+    } else {
+        [parameters removeObjectForKey:NAMES_samplingRate];
+    }
+}
+
+-(SDLSamplingRate*) samplingRate {
+    NSObject* obj = [parameters objectForKey:NAMES_samplingRate];
+    if ([obj isKindOfClass:SDLBitsPerSample.class]) {
+        return (SDLSamplingRate*)obj;
+    } else {
+        return [SDLSamplingRate valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setMaxDuration:(NSNumber*) maxDuration {
+    if (maxDuration != nil) {
+        [parameters setObject:maxDuration forKey:NAMES_maxDuration];
+    } else {
+        [parameters removeObjectForKey:NAMES_maxDuration];
+    }
+}
+
+-(NSNumber*) maxDuration {
+    return [parameters objectForKey:NAMES_maxDuration];
+}
+
+-(void) setBitsPerSample:(SDLBitsPerSample *) bitsPerSample {
+    if (bitsPerSample != nil) {
+        [parameters setObject:bitsPerSample forKey:NAMES_bitsPerSample];
+    } else {
+        [parameters removeObjectForKey:NAMES_bitsPerSample];
+    }
+}
+
+-(SDLBitsPerSample*) bitsPerSample {
+    NSObject* obj = [parameters objectForKey:NAMES_bitsPerSample];
+    if ([obj isKindOfClass:SDLBitsPerSample.class]) {
+        return (SDLBitsPerSample*)obj;
+    } else { 
+        return [SDLBitsPerSample valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setAudioType:(SDLAudioType *)audioType {
+    if (audioType != nil) {
+        [parameters setObject:audioType forKey:NAMES_audioType];
+    } else {
+        [parameters removeObjectForKey:NAMES_audioType];
+    }
+}
+
+-(SDLAudioType*) audioType {
+    NSObject* obj = [parameters objectForKey:NAMES_audioType];
+    if ([obj isKindOfClass:SDLAudioType.class]) {
+        return (SDLAudioType*)obj;
+    } else {
+        return [SDLAudioType valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setMuteAudio:(NSNumber*) muteAudio {
+    if (muteAudio != nil) {
+        [parameters setObject:muteAudio forKey:NAMES_muteAudio];
+    } else {
+        [parameters removeObjectForKey:NAMES_muteAudio];
+    }
+}
+
+-(NSNumber*) muteAudio {
+    return [parameters objectForKey:NAMES_muteAudio];
+}
+
+
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformAudioPassThruResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformAudioPassThruResponse.h
new file mode 100644 (file)
index 0000000..aa6c9f2
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformAudioPassThruResponse.h
@@ -0,0 +1,13 @@
+//  SDLPerformAudioPassThruResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLPerformAudioPassThruResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformAudioPassThruResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
new file mode 100644 (file)
index 0000000..805ecd1
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
@@ -0,0 +1,21 @@
+//  SDLPerformAudioPassThruResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLPerformAudioPassThruResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLPerformAudioPassThruResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_PerformAudioPassThru]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLPerformInteraction.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformInteraction.h
similarity index 69%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLPerformInteraction.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformInteraction.h
index 0056abe..343f02d 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLPerformInteraction.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformInteraction.h
@@ -1,14 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLPerformInteraction.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
-#import "SDLTTSChunk.h"
-#import "SDLInteractionMode.h"
-#import "SDLTTSChunk.h"
-#import "SDLTTSChunk.h"
+#import <SmartDeviceLink/SDLInteractionMode.h>
 
 @interface SDLPerformInteraction : SDLRPCRequest {}
 
@@ -22,5 +19,6 @@
 @property(assign) NSMutableArray* helpPrompt;
 @property(assign) NSMutableArray* timeoutPrompt;
 @property(assign) NSNumber* timeout;
+@property(assign) NSMutableArray* vrHelp;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLPerformInteraction.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformInteraction.m
similarity index 80%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLPerformInteraction.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformInteraction.m
index 4274d93..3538be5 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLPerformInteraction.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformInteraction.m
@@ -1,9 +1,12 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLPerformInteraction.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLPerformInteraction.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLPerformInteraction.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+#import <SmartDeviceLink/SDLTTSChunk.h>
+#import <SmartDeviceLink/SDLVrHelpItem.h>
 
 @implementation SDLPerformInteraction
 
@@ -133,4 +136,25 @@
     return [parameters objectForKey:NAMES_timeout];
 }
 
+-(void) setVrHelp:(NSMutableArray *) vrHelp {
+    if (vrHelp != nil) {
+        [parameters setObject:vrHelp forKey:NAMES_vrHelp];
+    } else {
+        [parameters removeObjectForKey:NAMES_vrHelp];
+    }
+}
+
+-(NSMutableArray*) vrHelp {
+    NSMutableArray* array = [parameters objectForKey:NAMES_vrHelp];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVrHelpItem.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLVrHelpItem alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLPerformInteractionResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformInteractionResponse.h
similarity index 58%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLPerformInteractionResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformInteractionResponse.h
index 9107f80..fa99bb0 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLPerformInteractionResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformInteractionResponse.h
@@ -1,12 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLPerformInteractionResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
-#import "SDLResult.h"
-#import "SDLTriggerSource.h"
+#import <SmartDeviceLink/SDLTriggerSource.h>
 
 @interface SDLPerformInteractionResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLPerformInteractionResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformInteractionResponse.m
similarity index 84%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLPerformInteractionResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformInteractionResponse.m
index 7adafb9..02547a4 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLPerformInteractionResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPerformInteractionResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLPerformInteractionResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLPerformInteractionResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLPerformInteractionResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLPerformInteractionResponse
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPermissionItem.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPermissionItem.h
new file mode 100644 (file)
index 0000000..412e731
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPermissionItem.h
@@ -0,0 +1,20 @@
+//  SDLPermissionItem.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLHMIPermissions.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLParameterPermissions.h>
+#import <SmartDeviceLink/SDLPermissionStatus.h>
+
+@interface SDLPermissionItem : SDLRPCStruct {}
+
+-(id)init;
+-(id)initWithDictionary:(NSMutableDictionary *)dict;
+
+@property(assign) NSString* rpcName;
+@property(assign) NSMutableArray* hmiPermissions;
+@property(assign) NSMutableArray* parameterPermissions;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPermissionItem.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPermissionItem.m
new file mode 100644 (file)
index 0000000..b2678ec
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPermissionItem.m
@@ -0,0 +1,79 @@
+//  SDLPermissionItem.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLPermissionItem.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLPermissionItem
+
+-(id)init {
+    if (self = [super init]) {
+        
+    }
+    return self;
+}
+
+-(id)initWithDictionary:(NSMutableDictionary *)dict {
+    if (self = [super initWithDictionary:dict]) {
+        
+    }
+    return self;
+}
+
+-(void) setRpcName:(NSString *) rpcName {
+    if (rpcName != nil) {
+        [store setObject:rpcName forKey:NAMES_rpcName];
+    } else {
+        [store removeObjectForKey:NAMES_rpcName];
+    }
+}
+
+-(NSString*) rpcName {
+    return [store objectForKey:NAMES_rpcName];
+}
+
+-(void) setHmiPermissions:(NSMutableArray*) hmiPermissions {
+    if (hmiPermissions != nil) {
+        [store setObject:hmiPermissions forKey:NAMES_hmiPermissions];
+    } else {
+        [store removeObjectForKey:NAMES_hmiPermissions];
+    }
+}
+
+-(NSMutableArray*) hmiPermissions {
+    NSMutableArray* array = [store objectForKey:NAMES_hmiPermissions];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLHMIPermissions.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLHMIPermissions alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
+-(void) setParameterPermissions:(NSMutableArray*) parameterPermissions {
+    if (parameterPermissions != nil) {
+        [store setObject:parameterPermissions forKey:NAMES_parameterPermissions];
+    } else {
+        [store removeObjectForKey:NAMES_parameterPermissions];
+    }
+}
+
+-(NSMutableArray*) parameterPermissions {
+    NSMutableArray* array = [store objectForKey:NAMES_parameterPermissions];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLParameterPermissions.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLParameterPermissions alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPermissionStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPermissionStatus.h
new file mode 100644 (file)
index 0000000..5be5dfb
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPermissionStatus.h
@@ -0,0 +1,17 @@
+//  SDLPermissionStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLPermissionStatus : SDLEnum {}
+
++(SDLPermissionStatus*) valueOf:(NSString*) value;
++(NSMutableArray*) values;                                
+
++(SDLPermissionStatus*) ALLOWED; 
++(SDLPermissionStatus*) DISALLOWED;
++(SDLPermissionStatus*) USER_DISALLOWED; 
++(SDLPermissionStatus*) USER_CONSENT_PENDING;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPermissionStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPermissionStatus.m
new file mode 100644 (file)
index 0000000..e2d3eba
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPermissionStatus.m
@@ -0,0 +1,65 @@
+//  SDLPermissionStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLPermissionStatus.h>
+
+SDLPermissionStatus* SDLPermissionStatus_ALLOWED = nil;
+SDLPermissionStatus* SDLPermissionStatus_DISALLOWED = nil;
+SDLPermissionStatus* SDLPermissionStatus_USER_DISALLOWED = nil;
+SDLPermissionStatus* SDLPermissionStatus_USER_CONSENT_PENDING = nil;
+
+NSMutableArray* SDLPermissionStatus_values = nil;
+
+@implementation SDLPermissionStatus
+
++(SDLPermissionStatus*)valueOf:(NSString *)value {
+    for (SDLPermissionStatus *item in SDLPermissionStatus.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*)values {
+    if (SDLPermissionStatus_values == nil) {
+        SDLPermissionStatus_values = [[NSMutableArray alloc] initWithObjects: 
+                                     SDLPermissionStatus.ALLOWED,
+                                     SDLPermissionStatus.DISALLOWED,
+                                     SDLPermissionStatus.USER_DISALLOWED,
+                                     SDLPermissionStatus.USER_CONSENT_PENDING,
+                                     nil];
+    }
+    return SDLPermissionStatus_values;
+}
+
++(SDLPermissionStatus*)ALLOWED {
+    if (SDLPermissionStatus_ALLOWED == nil) {
+        SDLPermissionStatus_ALLOWED = [[SDLPermissionStatus alloc] initWithValue:@"ALLOWED"];
+    }
+    return SDLPermissionStatus_ALLOWED;
+}
+
++(SDLPermissionStatus*)DISALLOWED {
+    if (SDLPermissionStatus_DISALLOWED == nil) {
+        SDLPermissionStatus_DISALLOWED = [[SDLPermissionStatus alloc] initWithValue:@"DISALLOWED"];
+    }
+    return SDLPermissionStatus_DISALLOWED;
+}
+
++(SDLPermissionStatus*)USER_DISALLOWED {
+    if (SDLPermissionStatus_USER_DISALLOWED == nil) {
+        SDLPermissionStatus_USER_DISALLOWED = [[SDLPermissionStatus alloc] initWithValue:@"USER_DISALLOWED"];
+    }
+    return SDLPermissionStatus_USER_DISALLOWED;
+}
+
++(SDLPermissionStatus*)USER_CONSENT_PENDING {
+    if (SDLPermissionStatus_USER_CONSENT_PENDING == nil) {
+        SDLPermissionStatus_USER_CONSENT_PENDING = [[SDLPermissionStatus alloc] initWithValue:@"USER_CONSENT_PENDING"];
+    }
+    return SDLPermissionStatus_USER_CONSENT_PENDING;
+}
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPresetBankCapabilities.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPresetBankCapabilities.h
new file mode 100644 (file)
index 0000000..3a2a627
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPresetBankCapabilities.h
@@ -0,0 +1,15 @@
+//  SDLPresetBankCapabilities.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+@interface SDLPresetBankCapabilities : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* onScreenPresetsAvailable;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPresetBankCapabilities.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPresetBankCapabilities.m
new file mode 100644 (file)
index 0000000..6a8e36c
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPresetBankCapabilities.m
@@ -0,0 +1,33 @@
+//  SDLPresetBankCapabilities.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLPresetBankCapabilities.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLPresetBankCapabilities
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setOnScreenPresetsAvailable:(NSNumber*) onScreenPresetsAvailable {
+    if (onScreenPresetsAvailable != nil) {
+        [store setObject:onScreenPresetsAvailable forKey:NAMES_onScreenPresetsAvailable];
+    } else {
+        [store removeObjectForKey:NAMES_onScreenPresetsAvailable];
+    }
+}
+
+-(NSNumber*) onScreenPresetsAvailable {
+    return [store objectForKey:NAMES_onScreenPresetsAvailable];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPrimaryAudioSource.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPrimaryAudioSource.h
new file mode 100644 (file)
index 0000000..f3899d0
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPrimaryAudioSource.h
@@ -0,0 +1,23 @@
+//  SDLPrimaryAudioSource.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLPrimaryAudioSource : SDLEnum {}
+
++(SDLPrimaryAudioSource*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLPrimaryAudioSource*) NO_SOURCE_SELECTED;
++(SDLPrimaryAudioSource*) USB;
++(SDLPrimaryAudioSource*) USB2;
++(SDLPrimaryAudioSource*) BLUETOOTH_STEREO_BTST;
++(SDLPrimaryAudioSource*) LINE_IN;
++(SDLPrimaryAudioSource*) IPOD;
++(SDLPrimaryAudioSource*) MOBILE_APP;
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPrimaryAudioSource.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPrimaryAudioSource.m
new file mode 100644 (file)
index 0000000..3d5df57
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPrimaryAudioSource.m
@@ -0,0 +1,94 @@
+//  SDLPrimaryAudioSource.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLPrimaryAudioSource.h>
+
+SDLPrimaryAudioSource* SDLPrimaryAudioSource_NO_SOURCE_SELECTED = nil;
+SDLPrimaryAudioSource* SDLPrimaryAudioSource_USB = nil;
+SDLPrimaryAudioSource* SDLPrimaryAudioSource_USB2 = nil;
+SDLPrimaryAudioSource* SDLPrimaryAudioSource_BLUETOOTH_STEREO_BTST = nil;
+SDLPrimaryAudioSource* SDLPrimaryAudioSource_LINE_IN = nil;
+SDLPrimaryAudioSource* SDLPrimaryAudioSource_IPOD = nil;
+SDLPrimaryAudioSource* SDLPrimaryAudioSource_MOBILE_APP = nil;
+
+NSMutableArray* SDLPrimaryAudioSource_values = nil; 
+
+@implementation SDLPrimaryAudioSource
+
++(SDLPrimaryAudioSource*) valueOf:(NSString*) value {                       
+       for (SDLPrimaryAudioSource* item in SDLPrimaryAudioSource.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLPrimaryAudioSource_values == nil) {                               
+               SDLPrimaryAudioSource_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLPrimaryAudioSource.NO_SOURCE_SELECTED,
+                                    SDLPrimaryAudioSource.USB,
+                                    SDLPrimaryAudioSource.USB2,
+                                    SDLPrimaryAudioSource.BLUETOOTH_STEREO_BTST,
+                                    SDLPrimaryAudioSource.LINE_IN,
+                                    SDLPrimaryAudioSource.IPOD,
+                                    SDLPrimaryAudioSource.MOBILE_APP,
+                                                                       nil];
+       } 
+       return SDLPrimaryAudioSource_values; 
+}
+
++(SDLPrimaryAudioSource*) NO_SOURCE_SELECTED {
+       if (SDLPrimaryAudioSource_NO_SOURCE_SELECTED == nil) {
+               SDLPrimaryAudioSource_NO_SOURCE_SELECTED = [[SDLPrimaryAudioSource alloc] initWithValue:@"NO_SOURCE_SELECTED"];
+       } 
+       return SDLPrimaryAudioSource_NO_SOURCE_SELECTED;  
+}
+
++(SDLPrimaryAudioSource*) USB {
+       if (SDLPrimaryAudioSource_USB == nil) {
+               SDLPrimaryAudioSource_USB = [[SDLPrimaryAudioSource alloc] initWithValue:@"USB"];
+       }
+       return SDLPrimaryAudioSource_USB;
+}
+
++(SDLPrimaryAudioSource*) USB2 {
+       if (SDLPrimaryAudioSource_USB2 == nil) {
+               SDLPrimaryAudioSource_USB2 = [[SDLPrimaryAudioSource alloc] initWithValue:@"USB2"];
+       }
+       return SDLPrimaryAudioSource_USB2;
+}
+
++(SDLPrimaryAudioSource*) BLUETOOTH_STEREO_BTST {
+       if (SDLPrimaryAudioSource_BLUETOOTH_STEREO_BTST == nil) {
+               SDLPrimaryAudioSource_BLUETOOTH_STEREO_BTST = [[SDLPrimaryAudioSource alloc] initWithValue:@"BLUETOOTH_STEREO_BTST"];
+       }
+       return SDLPrimaryAudioSource_BLUETOOTH_STEREO_BTST;
+}
+
++(SDLPrimaryAudioSource*) LINE_IN {
+       if (SDLPrimaryAudioSource_LINE_IN == nil) {
+               SDLPrimaryAudioSource_LINE_IN = [[SDLPrimaryAudioSource alloc] initWithValue:@"LINE_IN"];
+       }
+       return SDLPrimaryAudioSource_LINE_IN;
+}
+
++(SDLPrimaryAudioSource*) IPOD {
+       if (SDLPrimaryAudioSource_IPOD == nil) {
+               SDLPrimaryAudioSource_IPOD = [[SDLPrimaryAudioSource alloc] initWithValue:@"IPOD"];
+       }
+       return SDLPrimaryAudioSource_IPOD;
+}
+
++(SDLPrimaryAudioSource*) MOBILE_APP {
+       if (SDLPrimaryAudioSource_MOBILE_APP == nil) {
+               SDLPrimaryAudioSource_MOBILE_APP = [[SDLPrimaryAudioSource alloc] initWithValue:@"MOBILE_APP"];
+       }
+       return SDLPrimaryAudioSource_MOBILE_APP;
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocol.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocol.h
similarity index 80%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocol.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocol.h
index fc3765c..872e2bc 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocol.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocol.h
@@ -1,11 +1,13 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLProtocol.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLAbstractProtocol.h"
+#import <SmartDeviceLink/SDLAbstractProtocol.h>
 
 @interface SDLProtocol : SDLAbstractProtocol {
+    int headerSize;
+    Byte _version;
        BOOL haveHeader;
        NSMutableData* headerBuf;
        NSMutableData* dataBuf;
@@ -13,18 +15,23 @@
        NSMutableDictionary *frameAssemblerForSessionID;
        NSInteger dataBufFinalLength;
        NSObject *msgLock;
+    UInt32 _messageID;
 }
 
+-(void) setVersion:(Byte) version;
 -(void) resetHeaderAndData;
+
 @end
 
 @interface FrameAssembler : NSObject {
+    Byte _version;
        BOOL hasFirstFrame;
        BOOL hasSecondFrame;
        NSMutableData *accumulator;
        NSInteger totalSize;
        NSInteger framesRemaining;
        NSArray* listeners;
+    UInt32 _hashID;
 }
        
 -(id) initWithListeners:(NSArray*)listeners;
@@ -34,11 +41,11 @@
 -(void) notifyIfFinished:(SDLProtocolFrameHeader*) header;
 -(void) handleMultiFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data;
 -(void) handleFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data;      
--(SDLMessageType) messageTypeForFrameHeader:(SDLProtocolFrameHeader*)header;
        
 @end
 
 @interface BulkAssembler: FrameAssembler {
+       
        NSInteger bulkCorrId;
 }
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocol.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocol.m
new file mode 100644 (file)
index 0000000..2dfc3ed
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocol.m
@@ -0,0 +1,544 @@
+//  SDLProtocol.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLProtocol.h>
+
+#import <UIKit/UIKit.h>
+#import <SmartDeviceLink/SDLBitConverter.h>
+#import <SmartDeviceLink/SDLDebugTool.h>
+#import <SmartDeviceLink/SDLProtocolFrameHeaderFactory.h>
+#import <SmartDeviceLink/SDLProtocolFrameHeader.h>
+#import <SmartDeviceLink/SDLBinaryFrameHeader.h>
+
+#define HEADER_BUF_LENGTH 8
+#define PROT2_HEADER_BUF_LENGTH 12
+#define MTU_SIZE 512
+
+@implementation SDLProtocol
+
+-(id) init {
+       if (self = [super init]) {
+               msgLock = [[NSObject alloc] init];
+               headerBuf = nil;
+               dataBuf = nil;
+               currentHeader = nil;
+               [self resetHeaderAndData];
+               frameAssemblerForSessionID = [[NSMutableDictionary alloc] initWithCapacity:2];
+        
+        _version = 1;
+        _messageID = 0;
+       }
+       return self;
+}
+
+-(void) resetHeaderAndData {
+    [headerBuf release];
+
+       haveHeader = NO;
+    if (_version == 1) {
+        headerSize = HEADER_BUF_LENGTH * sizeof(Byte);
+    } else {
+        headerSize = PROT2_HEADER_BUF_LENGTH * sizeof(Byte);
+    }
+       headerBuf = [[NSMutableData alloc] initWithCapacity:headerSize];
+
+    [dataBuf release];
+    dataBuf = nil;
+
+    [currentHeader release];
+    currentHeader = nil;
+}
+
+- (void) setVersion:(Byte) version {
+    _version = version;
+    
+    [headerBuf release];
+    headerBuf = nil;
+    
+    if (version == 2) {
+        headerSize = PROT2_HEADER_BUF_LENGTH * sizeof(Byte);
+        headerBuf = [[NSMutableData alloc] initWithCapacity:headerSize];
+    }
+}
+
+- (void) doAlertMessage:(NSString*) message withTitle:(NSString*) title{
+       UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:title message:message delegate:self cancelButtonTitle:@"OK" otherButtonTitles:nil];
+       [alertView show];
+       [alertView release];
+       
+}
+
+-(FrameAssembler*) getFrameAssemblerForFrameHeader:(SDLProtocolFrameHeader*) header {
+       id sessionIDKey = [NSNumber numberWithInt:header._sessionID];
+    
+       FrameAssembler *ret = [frameAssemblerForSessionID objectForKey:sessionIDKey];
+
+       if (ret == nil) {
+               if (header._sessionType == SDLSessionType_RPC) {
+                       ret = [[FrameAssembler alloc] initWithListeners:protocolListeners];
+               } else if (header._sessionType == SDLSessionType_BulkData) {
+                       ret = [[BulkAssembler alloc] initWithListeners:protocolListeners];
+               }
+        
+               [frameAssemblerForSessionID setObject:ret forKey:sessionIDKey];
+        return [ret autorelease];
+       }
+       return ret;
+}
+
+-(void) handleBytesFromTransport:(Byte *)receivedBytes length:(long)receivedBytesLength {
+       long receivedBytesReadPos = 0;
+    
+    //Check for a version difference
+    if (_version == 1) {
+        //Nothing has been read into the buffer and version is 2
+        if (headerBuf.length == 0 && (receivedBytes[0] >> 4) == 2) {
+            [self setVersion:(Byte) receivedBytes[0] >> 4];
+                       //Buffer has something in it and version is 2
+        } else if ((((Byte *)headerBuf.bytes)[0] >> 4) == 2) {
+            //safe current state of the buffer and also set the new version
+            NSMutableData* tempHeader = nil;
+            tempHeader = [[NSMutableData alloc] initWithCapacity:headerBuf.length];
+            tempHeader = headerBuf;
+            [self setVersion:(Byte) ((Byte *)headerBuf.bytes)[0] >> 4];
+            headerBuf = tempHeader;
+        }
+    }
+    
+       // If I don't yet know the message size, grab those bytes.
+       if (!haveHeader) {
+               // If I can't get the size, just get the bytes that are there.
+        int sizeBytesNeeded;
+        if (_version == 1) {
+            sizeBytesNeeded = HEADER_BUF_LENGTH - headerBuf.length;
+        } else {
+            sizeBytesNeeded = PROT2_HEADER_BUF_LENGTH - headerBuf.length;
+        }
+        
+               if (receivedBytesLength < sizeBytesNeeded) {
+                       [headerBuf appendBytes:receivedBytes + receivedBytesReadPos length:receivedBytesLength];
+                       return;
+               } else {
+            // If I got the size, allocate the buffer
+                       [headerBuf appendBytes:receivedBytes + receivedBytesReadPos length:sizeBytesNeeded];
+                       receivedBytesReadPos += sizeBytesNeeded;
+                       haveHeader = true;
+                       dataBufFinalLength = [SDLBitConverter intFromByteArray:(Byte*)headerBuf.bytes offset:4];
+            
+            [dataBuf release];
+            dataBuf = nil;
+
+                       dataBuf = [[NSMutableData alloc] initWithCapacity:dataBufFinalLength];
+                       currentHeader = [[SDLProtocolFrameHeaderFactory parseHeader:headerBuf] retain];
+               }
+               
+       }
+       
+       int bytesLeft = receivedBytesLength - receivedBytesReadPos;
+       int bytesNeeded = dataBufFinalLength - dataBuf.length;
+       // If I don't have enough bytes for the message, just grab what's there.
+       if (bytesLeft < bytesNeeded) {
+               [dataBuf appendBytes:receivedBytes + receivedBytesReadPos length:bytesLeft];
+               return;
+       } else {
+        // Fill the buffer and call the handler!
+               [dataBuf appendBytes:receivedBytes + receivedBytesReadPos length:bytesNeeded];
+               receivedBytesReadPos += bytesNeeded;
+               FrameAssembler *assembler = [self getFrameAssemblerForFrameHeader:currentHeader];
+               [assembler handleFrame:currentHeader data:dataBuf];
+               [self resetHeaderAndData];
+               
+               //If there are any bytes left, recurse.
+               int moreBytesLeft = receivedBytesLength - receivedBytesReadPos;
+               if (moreBytesLeft > 0) {
+                       [self handleBytesFromTransport:receivedBytes + receivedBytesReadPos  length:moreBytesLeft];
+               }
+       }
+}
+
+-(NSData*) assembleHeaderBytes:(SDLProtocolFrameHeader*) msg {
+       UInt32 header = 0;
+       header |= msg._version;
+       header <<= 1;
+       header |= (msg._compressed ? 1 : 0);
+       header <<= 3;
+       header |= msg._frameType;
+       header <<= 8;
+       header |= msg._sessionType;
+       header <<= 8;
+       header |= msg._frameData;
+       header <<= 8;
+       header |= msg._sessionID;
+       
+    NSData* ret;
+    if (_version == 1) {
+        Byte* mallocPtr = malloc(HEADER_BUF_LENGTH);
+        if (mallocPtr == nil) {
+            @throw [NSException exceptionWithName:@"OutOfMemoryException" reason:@"malloc failed" userInfo:nil];
+        }
+        ret = [[NSData alloc] initWithBytesNoCopy:mallocPtr length:HEADER_BUF_LENGTH];
+
+        memcpy((void*)ret.bytes, [SDLBitConverter intToByteArray:header].bytes, 4);
+        memcpy((void*)ret.bytes + 4, [SDLBitConverter intToByteArray:msg._dataSize].bytes, 4);
+    } else {
+        Byte* mallocPtr = malloc(PROT2_HEADER_BUF_LENGTH);
+        if (mallocPtr == nil) {
+            @throw [NSException exceptionWithName:@"OutOfMemoryException" reason:@"malloc failed" userInfo:nil];
+        }
+        ret = [[NSData alloc] initWithBytesNoCopy:mallocPtr length:PROT2_HEADER_BUF_LENGTH];
+        
+        memcpy((void*)ret.bytes, [SDLBitConverter intToByteArray:header].bytes, 4);
+        memcpy((void*)ret.bytes + 4, [SDLBitConverter intToByteArray:msg._dataSize].bytes, 4);
+        memcpy((void*)ret.bytes + 8, [SDLBitConverter intToByteArray:msg._messageID].bytes, 4);
+    }
+       
+       return [ret autorelease];
+}
+
+-(void) sendFrameToTransport:(SDLProtocolFrameHeader *)header withData:(NSData*) data {
+       if (data == nil || data.length == 0){
+               [transport sendBytes:[self assembleHeaderBytes:header]];
+       } else {
+        NSMutableData* toSend;
+        if (_version == 1) {
+            toSend = [NSMutableData dataWithCapacity:data.length + HEADER_BUF_LENGTH];
+        } else {
+            toSend = [NSMutableData dataWithCapacity:data.length + PROT2_HEADER_BUF_LENGTH];
+        }
+               
+               [toSend appendData:[self assembleHeaderBytes:header]];
+               
+               [toSend appendData:data];
+               
+               [transport sendBytes:toSend];
+       }
+       
+}
+
+-(void) sendFrameToTransport:(SDLProtocolFrameHeader *)header {
+       [self sendFrameToTransport:header withData:nil];
+}
+
+-(void) sendFrameToTransport:(SDLProtocolFrameHeader *)header withData:(NSData*) data offset:(NSInteger) offset length:(NSInteger) length{
+       
+    NSMutableData* toSend;
+    if (_version == 1) {
+        toSend = [NSMutableData dataWithCapacity:length + HEADER_BUF_LENGTH];
+    } else {
+        toSend = [NSMutableData dataWithCapacity:length + PROT2_HEADER_BUF_LENGTH];
+    }
+       
+       [toSend appendData:[self assembleHeaderBytes:header]];
+       
+       [toSend appendBytes:data.bytes + offset length:length];
+       
+       [transport sendBytes:toSend];
+       
+}
+
+-(void) sendData:(SDLProtocolMessage*) protocolMsg {
+    protocolMsg._rpcType = (Byte) 0x00;
+    SDLSessionType sessionType = protocolMsg._sessionType;
+    Byte sessionID = protocolMsg._sessionID;
+    
+    NSData* data;
+    if (_version == 2) {
+        if (protocolMsg._bulkData != nil) {
+            Byte* mallocPtr = malloc(12 + protocolMsg._jsonSize + protocolMsg._bulkData.length);
+            if (mallocPtr == nil) {
+                @throw [NSException exceptionWithName:@"OutOfMemoryException" reason:@"malloc failed" userInfo:nil];
+            }
+            data = [[NSData alloc] initWithBytesNoCopy:mallocPtr length:(12 + protocolMsg._jsonSize + protocolMsg._bulkData.length)];
+            sessionType = SDLSessionType_BulkData;
+        } else {
+            Byte* mallocPtr = malloc(12 + protocolMsg._jsonSize);
+            if (mallocPtr == nil) {
+                @throw [NSException exceptionWithName:@"OutOfMemoryException" reason:@"malloc failed" userInfo:nil];
+            }
+            data = [[NSData alloc] initWithBytesNoCopy:mallocPtr length:(12 + protocolMsg._jsonSize)];
+        }
+        SDLBinaryFrameHeader* binFrameHeader = [[SDLBinaryFrameHeader alloc] init];
+        binFrameHeader._rpcType = protocolMsg._rpcType;
+        binFrameHeader._functionID = protocolMsg._functionID;
+        binFrameHeader._correlationID = protocolMsg._correlationID;
+        binFrameHeader._jsonSize = protocolMsg._jsonSize;
+        
+        memcpy((void*)data.bytes, [binFrameHeader assembleHeaderBytes].bytes, 12);
+        memcpy((void*)data.bytes + 12, protocolMsg._data.bytes, protocolMsg._jsonSize);
+        
+        if (protocolMsg._bulkData != nil) {
+            memcpy((void*)data.bytes + 12 + protocolMsg._jsonSize, protocolMsg._bulkData.bytes, protocolMsg._bulkData.length);
+        }
+        protocolMsg._data = data;
+    }
+    
+    int maxDataSize;
+    if (_version == 1) {
+        maxDataSize = MTU_SIZE - HEADER_BUF_LENGTH;
+    } else {
+        maxDataSize = MTU_SIZE - PROT2_HEADER_BUF_LENGTH;
+    }
+       
+       @synchronized (msgLock) {
+        if (protocolMsg._data.length < maxDataSize) {
+            
+            _messageID++;
+            SDLProtocolFrameHeader *singleHeader = [SDLProtocolFrameHeaderFactory singleFrameWithSessionType:sessionType sessionID:sessionID dataSize:protocolMsg._data.length messageID:_messageID version:_version];
+            
+            [self sendFrameToTransport:singleHeader withData:protocolMsg._data];
+        } else {
+            _messageID++;
+            SDLProtocolFrameHeader *firstHeader = [SDLProtocolFrameHeaderFactory firstFrameWithSessionType:sessionType sessionID:sessionID messageID:_messageID version:_version];
+            
+            // Assemble first frame.
+            int frameCount = protocolMsg._data.length / maxDataSize;
+            if (protocolMsg._data.length % maxDataSize > 0) {
+                frameCount++;
+            }
+            NSMutableData *firstFrameData = [NSMutableData dataWithCapacity:8];
+            // First four bytes are data size.
+            [firstFrameData appendData:[SDLBitConverter intToByteArray:protocolMsg._data.length]];
+            // Second four bytes are frame count.
+            [firstFrameData appendData:[SDLBitConverter intToByteArray:frameCount]];
+            
+            [self sendFrameToTransport:firstHeader withData:firstFrameData];
+            
+            int currentOffset = 0;
+            
+            for (int i = 0; i < frameCount; i++) {
+                int bytesToWrite = protocolMsg._data.length - currentOffset;
+                if (bytesToWrite > maxDataSize) { bytesToWrite = maxDataSize
+                    ; }
+                SDLProtocolFrameHeader *consecHeader = [SDLProtocolFrameHeaderFactory consecutiveFrameWithSessionType:sessionType sessionID:sessionID dataSize:bytesToWrite messageID:_messageID version:_version];
+                [self sendFrameToTransport:consecHeader withData:protocolMsg._data offset:currentOffset length:bytesToWrite];
+                currentOffset += bytesToWrite;
+                
+            }
+        }
+               
+       }
+}
+
+-(void) sendStartSessionWithType:(SDLSessionType) sessionType {
+    SDLProtocolFrameHeader *header = [SDLProtocolFrameHeaderFactory startSessionWithSessionType:sessionType messageID:0x00 version:_version];
+       
+       @synchronized (msgLock) {
+               [self sendFrameToTransport:header];
+       }
+}
+
+-(void) sendEndSessionWithType:(SDLSessionType)sessionType sessionID:(Byte)sessionID {
+       SDLProtocolFrameHeader *header = [SDLProtocolFrameHeaderFactory endSessionWithSessionType:sessionType sessionID:sessionID messageID:0x00 version:_version];
+       @synchronized (msgLock) {
+               [self sendFrameToTransport:header];
+       }
+}
+
+
+-(void) dealloc {
+
+    [headerBuf release];
+    headerBuf = nil;
+
+    [dataBuf release];
+    dataBuf = nil;
+
+    [currentHeader release];
+    currentHeader = nil;
+
+    [frameAssemblerForSessionID release];
+    frameAssemblerForSessionID = nil;
+
+    [msgLock release];
+    msgLock = nil;
+       
+       [super dealloc];
+}
+
+@end
+
+@implementation FrameAssembler
+
+-(id) initWithListeners:(NSArray*)theListeners{
+       if (self = [super init]) {
+               listeners = [theListeners retain];
+       }
+       return self;
+}
+
+-(void) handleFirstFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data {
+       //The message is new, so let's figure out how big it is.
+       hasFirstFrame = true;
+       totalSize = [SDLBitConverter intFromByteArray:(Byte*)data.bytes offset:0] - 8;
+       framesRemaining = [SDLBitConverter intFromByteArray:(Byte*)data.bytes offset:4];
+    
+    [accumulator release];
+    accumulator = nil;
+    
+       accumulator = [[NSMutableData dataWithCapacity:totalSize] retain];
+       
+}
+
+-(void) handleSecondFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data {
+       [self handleRemainingFrame:header data:data];
+}
+
+-(void) handleRemainingFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data {
+       [accumulator appendData:data];
+       [self notifyIfFinished:header];
+       
+}
+
+-(void) notifyIfFinished:(SDLProtocolFrameHeader*) header {
+       if (framesRemaining == 0) {
+               SDLProtocolMessage * message = [[SDLProtocolMessage alloc] init];
+        if (header._sessionType == SDLSessionType_RPC) {
+            message._messageType = SDLMessageType_RPC;
+        } else if (header._sessionType == SDLSessionType_BulkData) {
+            message._messageType = SDLMessageType_BULK;
+        }
+               message._sessionType = header._sessionType;
+               message._sessionID = header._sessionID;
+        
+        if (_version == 2) {
+            SDLBinaryFrameHeader* binFrameHeader = [SDLBinaryFrameHeader parseBinaryHeader:accumulator];
+            message._version = _version;
+            message._rpcType = binFrameHeader._rpcType;
+            message._functionID = binFrameHeader._functionID;
+            message._jsonSize = binFrameHeader._jsonSize;
+            message._correlationID = binFrameHeader._correlationID;
+            if (binFrameHeader._jsonSize > 0) {
+                message._data = binFrameHeader._jsonData;
+            }
+            if (binFrameHeader._bulkData != nil) {
+                message._bulkData = binFrameHeader._bulkData;
+            }
+        } else {
+            message._data = accumulator;
+        }
+               
+               NSArray* localListeners = nil;
+               @synchronized (listeners) {
+                       localListeners = [listeners copy];
+               }
+                       
+               for (NSObject<SDLProtocolListener> *listener in localListeners) {
+                       [listener onProtocolMessageReceived:message];
+               }
+               [localListeners release];
+        
+        [message release];
+               
+               hasFirstFrame = false;
+               hasSecondFrame = false;
+
+        [accumulator release];
+        accumulator = nil;
+
+       }
+}
+
+-(void) handleMultiFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data {
+       if (!hasFirstFrame) {
+               hasFirstFrame = true;
+               [self handleFirstFrame:header data:data];
+       } else if (!hasSecondFrame) {
+               hasSecondFrame = true;
+               framesRemaining--;
+               [self handleSecondFrame:header data:data ];
+       } else {
+               framesRemaining--;
+               [self handleRemainingFrame:header data:data];
+       }
+       
+}
+
+-(void) handleFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data {
+    if (header._version == 2) {
+        _version = header._version;
+    }
+    
+    if (header._frameType == SDLFrameType_Control) {
+        if (header._frameData == SDLFrameData_StartSessionACK) {
+            if (_version == 2) {
+                _hashID = header._messageID;
+            }
+            NSArray* localListeners = nil;
+            @synchronized (listeners) {
+                localListeners = [listeners copy];
+            }
+            
+            for (NSObject<SDLProtocolListener> *listener in localListeners) {
+                [listener handleProtocolSessionStarted:header._sessionType sessionID:header._sessionID version:_version];
+            }
+            [localListeners release];
+        }
+    } else {
+        if (header._frameType == SDLFrameType_First || header._frameType == SDLFrameType_Consecutive) {
+            [self handleMultiFrame:header data:data];
+        } else {
+            SDLProtocolMessage * message = [[SDLProtocolMessage alloc] init];
+            if (header._sessionType == SDLSessionType_RPC) {
+                message._messageType = SDLMessageType_RPC;
+            } else if (header._sessionType == SDLSessionType_BulkData) {
+                message._messageType = SDLMessageType_BULK;
+            } // end-if
+            message._sessionType = header._sessionType;
+            message._sessionID = header._sessionID;
+            if (_version == 2) {
+                SDLBinaryFrameHeader* binFrameHeader = [SDLBinaryFrameHeader parseBinaryHeader:data];
+                message._version = _version;
+                message._rpcType = binFrameHeader._rpcType;
+                message._functionID = binFrameHeader._functionID;
+                message._jsonSize = binFrameHeader._jsonSize;
+                message._correlationID = binFrameHeader._correlationID;
+                if (binFrameHeader._jsonSize > 0) {
+                    message._data = binFrameHeader._jsonData;
+                }
+                if (binFrameHeader._bulkData != nil) {
+                    message._bulkData = binFrameHeader._bulkData;
+                }
+            } else {
+                message._data = data;
+            }
+            
+            NSArray* localListeners = nil;
+            @synchronized (listeners) {
+                localListeners = [listeners copy];
+            }
+            
+            for (NSObject<SDLProtocolListener> *listener in localListeners) {
+                [listener onProtocolMessageReceived:message];
+            }
+            [localListeners release];
+            
+            [message release];
+        }
+    }
+}
+
+-(void) dealloc {
+
+    [accumulator release];
+    accumulator = nil;
+    
+    [listeners release];
+    listeners = nil;
+    
+    [super dealloc];
+}
+
+@end
+
+@implementation BulkAssembler
+
+-(void) handleSecondFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data {
+       bulkCorrId = [SDLBitConverter intFromByteArray:(Byte*)data.bytes offset:4];
+       [accumulator appendBytes:data.bytes + 8 length:header._dataSize - 8];
+       [self notifyIfFinished:header];
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolFrameHeader.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolFrameHeader.h
similarity index 53%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolFrameHeader.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolFrameHeader.h
index a20fb84..dead581 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolFrameHeader.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolFrameHeader.h
@@ -1,6 +1,6 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLProtocolFrameHeader.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
 
@@ -29,23 +29,23 @@ typedef enum SDLFrameData {
 } SDLFrameData;
 
 @interface SDLProtocolFrameHeader : NSObject {
-       Byte version;
-       BOOL compressed;
-       SDLFrameType frameType;
-       SDLSessionType sessionType;
-       Byte frameData;
-       Byte sessionID;
-       
-       UInt32 dataSize;
+       Byte _version;
+       BOOL _compressed;
+       SDLFrameType _frameType;
+       SDLSessionType _sessionType;
+       Byte _frameData;
+       Byte _sessionID;
+       UInt32 _dataSize;
+    UInt32 _messageID;
 }
 
-@property(assign) Byte version;
-@property(assign) BOOL compressed;
-@property(assign) SDLFrameType frameType;
-@property(assign) SDLSessionType sessionType;
-@property(assign) Byte frameData;
-@property(assign) Byte sessionID;
-
-@property(assign) UInt32 dataSize;
+@property(assign) Byte _version;
+@property(assign) BOOL _compressed;
+@property(assign) SDLFrameType _frameType;
+@property(assign) SDLSessionType _sessionType;
+@property(assign) Byte _frameData;
+@property(assign) Byte _sessionID;
+@property(assign) UInt32 _dataSize;
+@property(assign) UInt32 _messageID;
 
 @end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolFrameHeader.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolFrameHeader.m
new file mode 100644 (file)
index 0000000..f828953
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolFrameHeader.m
@@ -0,0 +1,33 @@
+//  SDLProtocolFrameHeader.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLProtocolMessage.h>
+
+@implementation SDLProtocolFrameHeader
+
+@synthesize _version;
+@synthesize _compressed;
+@synthesize _frameType;
+@synthesize _sessionType;
+@synthesize _frameData;
+@synthesize _sessionID;
+@synthesize _dataSize;
+@synthesize _messageID;
+
+
+-(id) init {
+       if (self = [super init]) {
+               _version = 1;
+               _compressed = false;
+               _frameType = SDLFrameType_Control;
+               _sessionType = SDLSessionType_RPC;
+               _frameData = 0;
+               _sessionID = 0;
+               _dataSize = 0;
+        _messageID = 0;
+       }
+       return self;
+}
+                               
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolFrameHeaderFactory.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolFrameHeaderFactory.h
similarity index 53%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolFrameHeaderFactory.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolFrameHeaderFactory.h
index d768f96..718449f 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolFrameHeaderFactory.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolFrameHeaderFactory.h
@@ -1,17 +1,18 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLProtocolFrameHeaderFactory.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLProtocolFrameHeader.h"
+
+#import <SmartDeviceLink/SDLProtocolFrameHeader.h>
 
 @interface SDLProtocolFrameHeaderFactory : NSObject {}
 
 +(SDLProtocolFrameHeader*) parseHeader:(NSData*) header;
-+(SDLProtocolFrameHeader*) startSessionWithSessionType:(SDLSessionType)sessionType;
-+(SDLProtocolFrameHeader*) endSessionWithSessionType:(SDLSessionType)sessionType sessionID:(Byte)sessionID;
-+(SDLProtocolFrameHeader*) singleFrameWithSessionType:(SDLSessionType)sessionType sessionID:(Byte)sessionID dataSize:(NSInteger)dataSize;
-+(SDLProtocolFrameHeader*) firstFrameWithSessionType:(SDLSessionType)sessionType sessionID:(Byte)sessionID;
-+(SDLProtocolFrameHeader*) consecutiveFrameWithSessionType:(SDLSessionType) sessionType sessionID:(Byte)sessionID dataSize:(NSInteger)dataSize ;
++(SDLProtocolFrameHeader*) startSessionWithSessionType:(SDLSessionType)sessionType messageID:(UInt32)messageID version:(Byte)version;
++(SDLProtocolFrameHeader*) endSessionWithSessionType:(SDLSessionType)sessionType sessionID:(Byte)sessionID messageID:(UInt32)messageID version:(Byte)version;
++(SDLProtocolFrameHeader*) singleFrameWithSessionType:(SDLSessionType)sessionType sessionID:(Byte)sessionID dataSize:(NSInteger)dataSize messageID:(UInt32)messageID version:(Byte)version;
++(SDLProtocolFrameHeader*) firstFrameWithSessionType:(SDLSessionType)sessionType sessionID:(Byte)sessionID messageID:(UInt32)messageID version:(Byte)version;
++(SDLProtocolFrameHeader*) consecutiveFrameWithSessionType:(SDLSessionType) sessionType sessionID:(Byte)sessionID dataSize:(NSInteger)dataSize messageID:(UInt32)messageID version:(Byte)version;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolFrameHeaderFactory.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolFrameHeaderFactory.m
new file mode 100644 (file)
index 0000000..15c8ccf
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolFrameHeaderFactory.m
@@ -0,0 +1,99 @@
+//  SDLProtocolFrameHeaderFactory.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLProtocolFrameHeaderFactory.h>
+
+#import <SmartDeviceLink/SDLBitConverter.h>
+
+@implementation SDLProtocolFrameHeaderFactory
+
++(SDLProtocolFrameHeader*) parseHeader:(NSData*) header {
+       SDLProtocolFrameHeader* msg = [[[SDLProtocolFrameHeader alloc] init] autorelease];
+       
+       Byte version = (Byte)(((Byte*)header.bytes)[0] >> 4);
+       BOOL compressed = (1 == ((((Byte*)header.bytes)[0] & 0x08) >> 3));
+       Byte frameType = (Byte)(((Byte*)header.bytes)[0] & 0x07);
+       Byte sessionType = ((Byte*)header.bytes)[1];
+       Byte frameData = ((Byte*)header.bytes)[2];
+       Byte sessionID = ((Byte*)header.bytes)[3];
+       UInt32 dataSize = [SDLBitConverter intFromByteArray:((Byte*)header.bytes) offset:4];
+    
+    if (version == 2) {
+        UInt32 messageID = [SDLBitConverter intFromByteArray:((Byte*)header.bytes) offset:8];
+        msg._messageID = messageID;
+    } else {
+        msg._messageID = 0;
+    }
+       
+       msg._version = version;
+       msg._compressed = compressed;
+       msg._frameType = frameType;
+       msg._sessionType = sessionType;
+       msg._frameData = frameData;
+       msg._sessionID = sessionID;
+       msg._dataSize = dataSize;
+       
+       return msg;
+}
+
++(SDLProtocolFrameHeader*) startSessionWithSessionType:(SDLSessionType) sessionType messageID:(UInt32)messageID version:(Byte)version {
+       SDLProtocolFrameHeader* header = [[[SDLProtocolFrameHeader alloc] init] autorelease];
+    header._version = version;
+       header._frameType = SDLFrameType_Control;
+       header._sessionType = sessionType;
+       header._frameData = SDLFrameData_StartSession;
+    header._messageID = messageID;
+       
+       return header;
+}
+
+
++(SDLProtocolFrameHeader*) endSessionWithSessionType:(SDLSessionType)sessionType sessionID:(Byte)sessionID messageID:(UInt32)messageID version:(Byte)version {
+       SDLProtocolFrameHeader* header = [[[SDLProtocolFrameHeader alloc] init] autorelease];
+    header._version = version;
+       header._frameType = SDLFrameType_Control;
+       header._sessionType = sessionType;
+       header._sessionID = sessionID;
+       header._frameData = SDLFrameData_EndSession;
+    header._messageID = messageID;
+
+       return header;
+}
++(SDLProtocolFrameHeader*) singleFrameWithSessionType:(SDLSessionType) sessionType sessionID:(Byte) sessionID dataSize:(NSInteger) dataSize messageID:(UInt32)messageID version:(Byte)version {
+       SDLProtocolFrameHeader* header = [[[SDLProtocolFrameHeader alloc] init] autorelease];
+    header._version = version;
+       header._sessionType = sessionType;
+       header._sessionID = sessionID;
+       header._frameType = SDLFrameType_Single;
+       header._dataSize = dataSize;
+    header._messageID = messageID;
+       
+       return header;
+}
+
++(SDLProtocolFrameHeader*) firstFrameWithSessionType:(SDLSessionType) sessionType sessionID:(Byte) sessionID messageID:(UInt32)messageID version:(Byte)version {
+       SDLProtocolFrameHeader* header = [[[SDLProtocolFrameHeader alloc] init] autorelease];
+    header._version = version;
+       header._sessionType = sessionType;
+       header._sessionID = sessionID;
+       header._frameType = SDLFrameType_First;
+       header._dataSize = 8;
+    header._messageID = messageID;
+       
+       return header;
+}
+
++(SDLProtocolFrameHeader*) consecutiveFrameWithSessionType:(SDLSessionType) sessionType sessionID:(Byte) sessionID dataSize:(NSInteger) dataSize messageID:(UInt32)messageID version:(Byte)version {
+       SDLProtocolFrameHeader* header = [[[SDLProtocolFrameHeader alloc] init] autorelease];
+    header._version = version;
+       header._sessionType = sessionType;
+       header._sessionID = sessionID;
+       header._frameType = SDLFrameType_Consecutive;
+       header._dataSize = dataSize;
+    header._messageID = messageID;
+       
+       return header;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolListener.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolListener.h
new file mode 100644 (file)
index 0000000..967b709
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolListener.h
@@ -0,0 +1,18 @@
+//  SDLProtocolListener.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLProtocolMessage.h>
+
+@protocol SDLProtocolListener
+
+-(void) handleProtocolSessionStarted:(SDLSessionType) sessionType sessionID:(Byte) sessionID version:(Byte) version;
+-(void) onProtocolMessageReceived:(SDLProtocolMessage*) msg;
+
+-(void) onProtocolOpened;
+-(void) onProtocolClosed;
+-(void) onError:(NSString*) info exception:(NSException*) e;
+
+@end
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolMessage.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolMessage.h
new file mode 100644 (file)
index 0000000..ac91283
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolMessage.h
@@ -0,0 +1,40 @@
+//  SDLProtocolMessage.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLProtocolFrameHeader.h>
+
+typedef enum SDLMessageType {
+       SDLMessageType_UNDEFINED = 0x01,
+       SDLMessageType_BULK = 0x02,
+       SDLMessageType_RPC = 0x03
+} SDLMessageType;
+
+@interface SDLProtocolMessage : NSObject {
+    Byte _version;
+       SDLSessionType _sessionType;
+       SDLMessageType _messageType;
+       Byte _sessionID;
+    Byte _rpcType;
+    UInt32 _functionID;
+    UInt32 _correlationID;
+    UInt32 _jsonSize;
+       
+       NSData* _data;
+       NSData* _bulkData;
+}
+
+@property(assign) Byte _version;
+@property(assign) SDLSessionType _sessionType;
+@property(assign) SDLMessageType _messageType;
+@property(assign) Byte _sessionID;
+@property(assign) Byte _rpcType;
+@property(assign) UInt32 _functionID;
+@property(assign) UInt32 _correlationID;
+@property(assign) UInt32 _jsonSize;
+
+@property(retain) NSData* _data;
+@property(retain) NSData* _bulkData;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolMessage.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolMessage.m
new file mode 100644 (file)
index 0000000..97a8541
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProtocolMessage.m
@@ -0,0 +1,42 @@
+//  SDLProtocolMessage.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLProtocolMessage.h>
+
+@implementation SDLProtocolMessage
+
+@synthesize _version;
+@synthesize _sessionType;
+@synthesize _messageType;
+@synthesize _sessionID;
+@synthesize _rpcType;
+@synthesize _functionID;
+@synthesize _correlationID;
+@synthesize _jsonSize;
+@synthesize _data;
+@synthesize _bulkData;
+
+-(id) init {
+       if (self = [super init]) {
+        _version = 1;
+               _sessionType = SDLSessionType_RPC;
+               _messageType = SDLMessageType_UNDEFINED;
+               _sessionID = 0;
+        _rpcType = 0;
+        _functionID = 0;
+        _correlationID = 0;
+        _jsonSize = 0;
+        _data = nil;
+        _bulkData = nil;
+       }
+       return self;
+}
+
+-(void) dealloc {
+    [_data release];
+    [_bulkData release];
+    [super dealloc];
+}
+                               
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxy.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxy.h
new file mode 100644 (file)
index 0000000..528ed20
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxy.h
@@ -0,0 +1,53 @@
+//  SDLProxy.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+//  Version: SDL-2.0.0
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLExternalLibrary.h>
+#import <SmartDeviceLink/SDLIProxy.h>
+#import <SmartDeviceLink/SDLIProtocol.h>
+#import <SmartDeviceLink/SDLProxyListener.h>
+#import <SmartDeviceLink/SDLRPCRequestFactory.h>
+#import <SmartDeviceLink/SDLITransport.h>
+
+@interface SDLProxy : NSObject<SDLProtocolListener, NSURLConnectionDelegate> {
+    Byte _version;
+    
+       NSObject<SDLITransport>* transport;
+       NSObject<SDLIProtocol>* protocol;
+       NSMutableArray* proxyListeners;
+    NSMutableArray* externalLibraries;
+       Byte rpcSessionID;
+       Byte bulkSessionID;
+       
+    NSTimer* handshakeTimer;
+    
+       BOOL isConnected;
+    BOOL alreadyDestructed;
+    
+    NSMutableData* httpResponseData;
+}
+
+-(id)  initWithTransport:(NSObject<SDLITransport>*) transport protocol:(NSObject<SDLIProtocol>*) protocol delegate:(NSObject<SDLProxyListener>*) delegate;
+
+-(void) dispose;
+-(void) addDelegate:(NSObject<SDLProxyListener>*) delegate;
+
+-(void) registerLibrary:(id<SDLExternalLibrary>) externalLibrary;
+
+-(void) sendRPCRequest:(SDLRPCMessage*) msg;
+-(void) handleRpcMessage:(NSDictionary*) msg;
+
+-(NSString*) getProxyVersion;
+
+-(void) destroyHandshakeTimer;
+-(void) handleProtocolMessage:(SDLProtocolMessage*) msgData;
+
++(void)enableSiphonDebug;
++(void)disableSiphonDebug;
+
+-(NSObject<SDLITransport>*)getTransport;
+-(NSObject<SDLIProtocol>*)getProtocol;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxy.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxy.m
new file mode 100644 (file)
index 0000000..4f066b5
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxy.m
@@ -0,0 +1,523 @@
+//  SDLProxy.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <ExternalAccessory/ExternalAccessory.h>
+#import <objc/runtime.h>
+
+#import <SmartDeviceLink/SDLDebugTool.h>
+#import <SmartDeviceLink/SDLEncodedSyncPData.h>
+#import <SmartDeviceLink/SDLFunctionID.h>
+#import <SmartDeviceLink/SDLJsonDecoder.h>
+#import <SmartDeviceLink/SDLJsonEncoder.h>
+#import <SmartDeviceLink/SDLLanguage.h>
+#import <SmartDeviceLink/SDLNames.h>
+#import <SmartDeviceLink/SDLSiphonServer.h>
+#import <SmartDeviceLink/SDLProxy.h>
+
+#define VERSION_STRING @"SDL-2.0.0"
+
+@interface SDLCallback : NSObject {
+       NSObject* target;
+       SEL selector;
+       NSObject* parameter;
+}
+
+@property (nonatomic, retain) NSObject* target;
+@property (nonatomic, assign) SEL selector;
+@property (nonatomic, retain) NSObject* parameter;
+
+@end
+
+@implementation SDLCallback
+@synthesize target;
+@synthesize selector;
+@synthesize parameter;
+
+-(void) dealloc {
+       [target release];
+       [parameter release];
+       
+       [super dealloc];
+}
+
+@end
+
+@interface SDLProxy ()
+
+-(void) notifyProxyClosed;
+-(void) handleProtocolMessage:(SDLProtocolMessage*) msgData;
+-(void) performCallback:(SDLCallback*) callback;
+
+@end
+
+@implementation SDLProxy
+
+const float handshakeTime = 30.0;
+const float notifyProxyClosedDelay = 0.1;
+bool httpPolicyUpdateInProgress = NO;
+
+const int POLICIES_CORRELATION_ID = 65535;
+
+- (void)handshakeTimerFired {
+    [self destroyHandshakeTimer];
+    [self performSelector:@selector(notifyProxyClosed) withObject:nil afterDelay:notifyProxyClosedDelay];
+}
+
+-(id) initWithTransport:(NSObject<SDLITransport>*) theTransport protocol:(NSObject<SDLIProtocol>*) theProtocol delegate:(NSObject<SDLProxyListener>*) theDelegate {
+       if (self = [super init]) {        
+        [[EAAccessoryManager sharedAccessoryManager] registerForLocalNotifications];
+        
+        proxyListeners = [[NSMutableArray alloc] initWithObjects:theDelegate, nil];
+        protocol = [theProtocol retain];
+        transport = [theTransport retain];
+        rpcSessionID = 0;
+        
+        alreadyDestructed = NO;
+        
+        [transport addTransportListener:protocol];
+        [protocol addProtocolListener:self];
+        protocol.transport = transport;
+        
+        [transport connect];
+        
+        return self;
+    }
+    return self;
+}
+
+-(void)destroyHandshakeTimer {
+    if (handshakeTimer != nil) {
+        [handshakeTimer invalidate];
+        [handshakeTimer release];
+        handshakeTimer = nil;
+    }
+}
+
+-(void) destructObjects {
+    if(!alreadyDestructed) {
+        [self destroyHandshakeTimer];
+        
+        [transport release];
+        transport = nil;
+        
+        [protocol release];
+        protocol = nil;
+        
+        [proxyListeners release];
+        proxyListeners = nil;
+        
+        if (externalLibraries) {
+            [externalLibraries release];
+            externalLibraries = nil;
+        }
+        
+        alreadyDestructed = YES;
+    }
+}
+
+-(void) dispose {
+    [self destructObjects];
+}
+
+-(void) dealloc {
+    [self destructObjects];
+       [super dealloc];
+}
+
+-(NSObject<SDLITransport>*)getTransport {
+    return transport;
+}
+
+-(NSObject<SDLIProtocol>*)getProtocol {
+    return protocol;
+}
+
+-(void) addDelegate:(NSObject<SDLProxyListener>*) delegate {
+       @synchronized(proxyListeners) {
+               [proxyListeners addObject:delegate];
+       }
+}
+
+-(void) registerLibrary:(id <SDLExternalLibrary>) externalLibrary {
+    if (externalLibrary) {
+        if (!externalLibraries) {
+            externalLibraries = [[NSMutableArray alloc] init];
+        }
+        [externalLibraries addObject:externalLibrary];
+    }
+}
+
+-(NSString*) getProxyVersion {
+    return VERSION_STRING;
+}
+
+-(void) sendRPCRequest:(SDLRPCMessage*) msg {
+    if ([msg isKindOfClass:SDLRPCRequest.class]) {
+        SDLRPCRequest *request = (SDLRPCRequest*)msg;
+        [self sendRPCRequestPrivate:request];
+    }
+}
+
+-(void) sendRPCRequestPrivate:(SDLRPCRequest*) msg {
+       @try {
+        SDLProtocolMessage* pm = [[SDLProtocolMessage alloc] init];
+        pm._version = _version;
+        pm._data = [[SDLJsonEncoder instance] encodeDictionary:[msg serializeAsDictionary:_version]];
+        pm._jsonSize = pm._data.length;
+        pm._sessionID = rpcSessionID;
+        pm._messageType = SDLMessageType_RPC;
+        pm._sessionType = SDLSessionType_RPC;
+        SDLFunctionID* functionID = [[SDLFunctionID alloc] init];
+        pm._functionID = [[functionID getFunctionID:[msg getFunctionName]] intValue];
+        pm._correlationID = [msg.correlationID intValue];
+        
+        if ([msg getBulkData] != nil) {
+            pm._bulkData = [msg getBulkData];
+        }
+        
+               [protocol sendData:pm];
+       } @catch (NSException * e) {
+               [SDLDebugTool logException:e withMessage:@"Proxy: Failed to send RPC request: %@", msg.name];
+       } @finally {}
+}
+
+-(void) handleProtocolSessionStarted:(SDLSessionType) sessionType sessionID:(Byte) sessionID version:(Byte) version {
+
+    if (_version <= 1) {
+        if (version == 2) {
+            _version = version;
+        }
+    }
+    
+    if (sessionType == SDLSessionType_RPC || _version == 2) {
+        rpcSessionID = sessionID;
+        
+        NSArray *localListeners = nil;
+        @synchronized (proxyListeners) {
+            localListeners = [proxyListeners copy];
+        }
+        
+        for (NSObject<SDLProxyListener> *listener in localListeners) {
+            [listener onProxyOpened];
+        }
+        
+        [localListeners release];
+    } else {
+        // Handle other protocol session types here
+    }
+}
+        
+- (void) onProtocolMessageReceived:(SDLProtocolMessage*) msgData {
+       @try {
+               [self handleProtocolMessage:msgData];
+       }
+       @catch (NSException * e) {
+               [SDLDebugTool logException:e withMessage:@"Proxy: Failed to handle protocol message"];
+       }
+       @finally {
+               
+       }
+}
+
+-(void) handleProtocolMessage:(SDLProtocolMessage*) msgData {
+    if (msgData._sessionType == SDLSessionType_RPC) {
+        if (_version == 1) {
+            if (msgData._version == 2) _version = msgData._version;
+        }
+        
+        NSMutableDictionary* msg;
+        if (_version == 2) {
+            msg = [[NSMutableDictionary alloc] init];
+            NSMutableDictionary* msgTemp = [[NSMutableDictionary alloc] init];
+            if (msgData._correlationID != 0) {
+                [msgTemp setObject:[NSNumber numberWithInt:msgData._correlationID] forKey:NAMES_correlationID];
+            }
+            if (msgData._jsonSize > 0) {
+                NSDictionary* mMsg = [[SDLJsonDecoder instance] decode:msgData._data];
+                [msgTemp setObject:mMsg forKey:NAMES_parameters];
+            }
+            SDLFunctionID* functionID = [[SDLFunctionID alloc] init];
+            [msgTemp setObject:[functionID getFunctionName:msgData._functionID] forKey:NAMES_operation_name];
+            if (msgData._rpcType == 0x00) {
+                [msg setObject:msgTemp forKey:NAMES_request];
+            } else if (msgData._rpcType == 0x01) {
+                [msg setObject:msgTemp forKey:NAMES_response];
+            } else if (msgData._rpcType == 0x02) {
+                [msg setObject:msgTemp forKey:NAMES_notification];
+            }
+            if (msgData._bulkData != nil) {
+                [msg setObject:msgData._bulkData forKey:NAMES_bulkData];
+            }
+            
+        } else {
+            msg = (NSMutableDictionary*) [[SDLJsonDecoder instance] decode:msgData._data];
+        }
+               [self handleRpcMessage:msg];
+        
+    } else if (msgData._sessionType == SDLSessionType_BulkData) {
+        bulkSessionID = msgData._sessionID;
+    }
+}
+
+-(void) neverCalled {
+       [[SDLAddCommandResponse alloc] release];
+       [[SDLAddSubMenuResponse alloc] release];
+       [[SDLAlertResponse alloc] release];
+       [[SDLCreateInteractionChoiceSetResponse alloc] release];
+       [[SDLDeleteCommandResponse alloc] release];
+       [[SDLDeleteInteractionChoiceSetResponse alloc] release];
+       [[SDLDeleteSubMenuResponse alloc] release];
+       [[SDLOnHMIStatus alloc] release];
+       [[SDLOnButtonEvent alloc] release];
+       [[SDLOnButtonPress alloc] release];
+       [[SDLOnCommand alloc] release];
+       [[SDLOnAppInterfaceUnregistered alloc] release];
+       [[SDLPerformInteractionResponse alloc] release];
+       [[SDLRegisterAppInterfaceResponse alloc] release];
+       [[SDLSetGlobalPropertiesResponse alloc] release];
+       [[SDLResetGlobalPropertiesResponse alloc] release];
+       [[SDLSetMediaClockTimerResponse alloc] release];
+       [[SDLShowResponse alloc] release];
+       [[SDLSpeakResponse alloc] release];
+       [[SDLSubscribeButtonResponse alloc] release];
+       [[SDLUnregisterAppInterfaceResponse alloc] release];
+       [[SDLUnsubscribeButtonResponse alloc] release];
+    [[SDLGenericResponse alloc] release];
+    [[SDLOnDriverDistraction alloc] release];
+    [[SDLOnTBTClientState alloc] release];
+    [[SDLSubscribeVehicleDataResponse alloc] release];
+    [[SDLUnsubscribeVehicleDataResponse alloc] release];
+    [[SDLGetVehicleDataResponse alloc] release];
+    [[SDLGetDTCsResponse alloc] release];
+    [[SDLReadDIDResponse alloc] release];
+    [[SDLOnVehicleData alloc] release];
+    [[SDLOnPermissionsChange alloc] release];
+    [[SDLSliderResponse alloc] release];
+    [[SDLPutFileResponse alloc] release];
+    [[SDLDeleteFileResponse alloc] release];
+    [[SDLListFilesResponse alloc] release];
+    [[SDLSetAppIconResponse alloc] release];
+    [[SDLPerformAudioPassThruResponse alloc] release];
+    [[SDLEndAudioPassThruResponse alloc] release];
+    [[SDLOnAudioPassThru alloc] release];
+    [[SDLScrollableMessageResponse alloc] release];
+    [[SDLShowConstantTBTResponse alloc] release];
+    [[SDLAlertManeuverResponse alloc] release];
+    [[SDLChangeRegistrationResponse alloc] release];
+    [[SDLOnLanguageChange alloc] release];
+    [[SDLSetDisplayLayout alloc] release];
+}
+
+-(void) handleRpcMessage:(NSDictionary*) msg {
+       
+    SDLRPCMessage* rpcMsg = [[SDLRPCMessage alloc] initWithDictionary:(NSMutableDictionary*) msg];
+    NSString* functionName = [rpcMsg getFunctionName];
+    NSString* messageType = [rpcMsg messageType];
+
+       if ([functionName isEqualToString:NAMES_OnAppInterfaceUnregistered]
+        || [functionName isEqualToString:NAMES_UnregisterAppInterface]) {
+               [self notifyProxyClosed];
+               return;
+       }
+    
+       if ([messageType isEqualToString:NAMES_response]) {
+               bool notGenericResponseMessage = ![functionName isEqualToString:@"GenericResponse"];
+               if(notGenericResponseMessage) functionName = [NSString stringWithFormat:@"%@Response", functionName];
+       }
+    
+    
+    if ([functionName isEqualToString:@"RegisterAppInterfaceResponse"]) {
+        // It's possible to run into a scenario in which SYNC fails to send a StartSessionACK. This issue will be caught by the timer that's waiting for a RegisterAppInterfaceResponse. If no RAIResponse is received, a call to onProxyClosed will occur.
+        
+        // Turn off the timer, the handshake has succeeded
+        [self destroyHandshakeTimer];
+        
+        //Print Proxy Version To Console
+        [SDLDebugTool logInfo:@"Framework Version: %@", [self getProxyVersion]];
+        
+        //Print external library versions to Console
+        if (externalLibraries) {
+            for (id <SDLExternalLibrary> library in externalLibraries) {
+                [SDLDebugTool logInfo:@"%@ Version: %@", [library getLibraryName], [library getVersion]];
+            }
+        }
+    }
+   
+    
+    // Intercept OnEncodedSyncPData. If URL != nil, perform HTTP Post and don't pass the notification to the ProxyListeners
+    if ([functionName isEqualToString:@"OnEncodedSyncPData"]) {
+        NSString *urlString = (NSString *)[rpcMsg getParameters:@"URL"];
+        if (urlString != nil) {
+            httpPolicyUpdateInProgress = YES;
+            NSDictionary *encodedSyncPData = (NSDictionary *)[rpcMsg getParameters:@"data"];
+            NSNumber *encodedSyncPTimeout = (NSNumber *) [rpcMsg getParameters:@"Timeout"];
+            [self sendEncodedSyncPData:encodedSyncPData toURL:urlString withTimeout:encodedSyncPTimeout];
+            return;
+        }
+    }
+    
+       NSString* functionClassName = [NSString stringWithFormat:@"SDL%@", functionName];
+       Class functionClass = objc_getClass([functionClassName cStringUsingEncoding:NSUTF8StringEncoding]);
+    
+    // functionObject doesn't leak because performSelector returns a pointer to the same instance that class_createInstance() creates
+       NSObject* functionObject = (id)class_createInstance(functionClass, 0);
+    NSObject* rpcCallbackObject = [functionObject performSelector:@selector(initWithDictionary:) withObject:msg];
+       
+       NSString* handlerName = [NSString stringWithFormat:@"on%@:", functionName];
+
+       SEL handlerSelector = NSSelectorFromString(handlerName);
+       
+       NSArray *localListeners = nil;
+       @synchronized (proxyListeners) {
+               localListeners = [proxyListeners copy];
+       }
+       
+       for (NSObject<SDLProxyListener> *listener in localListeners) {
+               if ([listener respondsToSelector:handlerSelector]) {
+                       SDLCallback* callback = [[SDLCallback alloc] init];
+                       callback.target = listener;
+                       callback.selector = handlerSelector;
+                       callback.parameter = rpcCallbackObject;
+                       [self performSelectorOnMainThread:@selector(performCallback:) withObject:callback waitUntilDone:NO];
+                       // [callback release]; Moved to performCallback to avoid thread race condition
+               } else {
+                       [SDLDebugTool logInfo:@"Proxy listener doesn't respond to selector: %@", handlerName];
+               }
+       }
+       [localListeners release];
+}
+
+-(void) performCallback:(SDLCallback*) callback {
+       @try {
+               [callback.target performSelector:callback.selector withObject:callback.parameter];
+       } @catch (NSException * e) {
+               [SDLDebugTool logException:e withMessage:@"Exception thrown during call to %@ with object %@", callback.target, callback.parameter];
+       } @finally {
+               [callback release];
+       }
+}
+
+-(void) onProtocolClosed {
+       [self notifyProxyClosed];
+}
+
+-(void) notifyProxyClosed {
+       if (isConnected) {
+               isConnected = NO;
+               NSArray *localListeners = nil;
+               @synchronized (proxyListeners) {
+                       localListeners = [proxyListeners copy];
+               }
+               
+               for (NSObject<SDLProxyListener> *listener in localListeners) {
+                       [listener performSelectorOnMainThread:@selector(onProxyClosed) withObject:nil waitUntilDone:NO];
+               }
+               [localListeners release];
+       }
+}
+
+-(void) onError:(NSString*) info exception:(NSException*) e {
+       
+       NSArray *localListeners = nil;
+       @synchronized (proxyListeners) {
+               localListeners = [proxyListeners copy];
+       }
+       
+       for (NSObject<SDLProxyListener> *listener in localListeners) {
+               [listener performSelectorOnMainThread:@selector(onError:) withObject:e waitUntilDone:NO];
+       }
+       [localListeners release];
+}
+
+
+- (void) onProtocolOpened {    
+    isConnected = YES;
+    [protocol sendStartSessionWithType:SDLSessionType_RPC];
+    
+    [self destroyHandshakeTimer];
+    handshakeTimer = [NSTimer scheduledTimerWithTimeInterval:handshakeTime target:self selector:@selector(handshakeTimerFired) userInfo:nil repeats:NO];
+    [handshakeTimer retain];
+}
+
++(void)enableSiphonDebug {
+    [SDLSiphonServer enableSiphonDebug];
+}
+
++(void)disableSiphonDebug {
+    [SDLSiphonServer disableSiphonDebug];
+}
+
+-(void)sendEncodedSyncPData:(NSDictionary*)encodedSyncPData toURL:(NSString*)urlString withTimeout:(NSNumber*) timeout{
+    
+    NSString *encodedSyncPDataString = [[NSString stringWithFormat:@"%@", encodedSyncPData] componentsSeparatedByString:@"\""][1];
+    NSString* jsonString = [NSString stringWithFormat:@"{\"data\":[\"%@\"]}", encodedSyncPDataString];
+    
+    NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
+    
+    NSURL *url = [NSURL URLWithString:urlString];
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
+    
+    request.HTTPMethod = @"POST";
+    [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
+    request.HTTPBody = jsonData;
+    request.timeoutInterval = [timeout doubleValue];
+    
+    NSURLConnection *conn = [[NSURLConnection alloc] initWithRequest:request delegate:self];
+    
+    if (conn == nil) {
+        [SDLDebugTool logInfo:@"%s: Error creating NSURLConnection", __PRETTY_FUNCTION__];
+    }
+}
+
+#pragma mark - NSURL Methods
+- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response {
+    // Can be called multiple times, such as a server redirect, so reset the data each time
+    httpResponseData = [[NSMutableData alloc] init];
+}
+
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data {
+    [httpResponseData appendData:data];
+}
+
+- (NSCachedURLResponse *)connection:(NSURLConnection *)connection
+                  willCacheResponse:(NSCachedURLResponse*)cachedResponse {
+    // Return nil to indicate not necessary to store a cached response for this connection
+    return nil;
+}
+
+-(void)connectionDidFinishLoading:(NSURLConnection *)connection {
+    
+    [connection release]; // Release the connection we allocated in sendEncodedSyncPData
+    
+    if ([httpResponseData length] == 0){
+        
+        httpPolicyUpdateInProgress = NO;
+        return;
+    }
+
+    NSString *responseString = [[NSString alloc] initWithData:httpResponseData encoding:NSUTF8StringEncoding];
+    NSData *responseData = [responseString dataUsingEncoding:NSASCIIStringEncoding];
+    
+    NSError *error = nil;
+    NSDictionary *responseDictionary = [NSJSONSerialization JSONObjectWithData:responseData options:kNilOptions error:&error];
+    NSMutableArray *encodedSyncPDataArray = [responseDictionary objectForKey:@"data"];
+    
+    SDLEncodedSyncPData *request = [[[SDLEncodedSyncPData alloc] init] autorelease];
+    request.data = encodedSyncPDataArray;
+    request.correlationID = [NSNumber numberWithInt:POLICIES_CORRELATION_ID];
+
+    httpPolicyUpdateInProgress = NO;
+    [self sendRPCRequestPrivate:request];
+}
+
+- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
+        
+    [SDLDebugTool logInfo:@"%s, Connection failed with error: %@", __PRETTY_FUNCTION__, [error localizedDescription]];
+    [connection release];
+    
+    httpPolicyUpdateInProgress = NO;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxyFactory.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxyFactory.h
similarity index 74%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxyFactory.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxyFactory.h
index ca8b114..de939b8 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxyFactory.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxyFactory.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSyncProxyFactory.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLProxy.h"
+#import <SmartDeviceLink/SDLProxy.h>
 
 @interface SDLProxyFactory : NSObject {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxyFactory.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxyFactory.m
similarity index 76%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxyFactory.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxyFactory.m
index 47ada0f..f4900b7 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxyFactory.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxyFactory.m
@@ -1,12 +1,13 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLProxyFactory.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLProxyFactory.h"
-#import "SDLIAPTransport.h"
-#import "SDLTCPTransport.h"
-#import "SDLProtocol.h"
-#import "SDLDebugTool.h"
+#import <SmartDeviceLink/SDLProxyFactory.h>
+
+#import <SmartDeviceLink/SDLDebugTool.h>
+#import <SmartDeviceLink/SDLIAPTransport.h>
+#import <SmartDeviceLink/SDLTCPTransport.h>
+#import <SmartDeviceLink/SDLProtocol.h>
 
 @implementation SDLProxyFactory
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxyListener.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxyListener.h
new file mode 100644 (file)
index 0000000..ab678bb
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLProxyListener.h
@@ -0,0 +1,111 @@
+//  SDLProxyListener.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLAddCommandResponse.h>
+#import <SmartDeviceLink/SDLAddSubMenuResponse.h>
+#import <SmartDeviceLink/SDLAlertManeuverResponse.h>
+#import <SmartDeviceLink/SDLAlertResponse.h>
+#import <SmartDeviceLink/SDLChangeRegistrationResponse.h>
+#import <SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h>
+#import <SmartDeviceLink/SDLDeleteCommandResponse.h>
+#import <SmartDeviceLink/SDLDeleteFileResponse.h>
+#import <SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h>
+#import <SmartDeviceLink/SDLDeleteSubMenuResponse.h>
+#import <SmartDeviceLink/SDLEndAudioPassThruResponse.h>
+#import <SmartDeviceLink/SDLGenericResponse.h>
+#import <SmartDeviceLink/SDLGetDTCsResponse.h>
+#import <SmartDeviceLink/SDLGetVehicleDataResponse.h>
+#import <SmartDeviceLink/SDLListFilesResponse.h>
+#import <SmartDeviceLink/SDLOnAppInterfaceUnregistered.h>
+#import <SmartDeviceLink/SDLOnAudioPassThru.h>
+#import <SmartDeviceLink/SDLOnButtonEvent.h>
+#import <SmartDeviceLink/SDLOnButtonPress.h>
+#import <SmartDeviceLink/SDLOnCommand.h>
+#import <SmartDeviceLink/SDLOnDriverDistraction.h>
+#import <SmartDeviceLink/SDLOnHMIStatus.h>
+#import <SmartDeviceLink/SDLOnLanguageChange.h>
+#import <SmartDeviceLink/SDLOnPermissionsChange.h>
+#import <SmartDeviceLink/SDLOnTBTClientState.h>
+#import <SmartDeviceLink/SDLOnVehicleData.h>
+#import <SmartDeviceLink/SDLPerformAudioPassThruResponse.h>
+#import <SmartDeviceLink/SDLPerformInteractionResponse.h>
+#import <SmartDeviceLink/SDLPutFileResponse.h>
+#import <SmartDeviceLink/SDLReadDIDResponse.h>
+#import <SmartDeviceLink/SDLRegisterAppInterfaceResponse.h>
+#import <SmartDeviceLink/SDLResetGlobalPropertiesResponse.h>
+#import <SmartDeviceLink/SDLScrollableMessageResponse.h>
+#import <SmartDeviceLink/SDLSetAppIconResponse.h>
+#import <SmartDeviceLink/SDLSetDisplayLayoutResponse.h>
+#import <SmartDeviceLink/SDLSetGlobalPropertiesResponse.h>
+#import <SmartDeviceLink/SDLSetMediaClockTimerResponse.h>
+#import <SmartDeviceLink/SDLShowConstantTBTResponse.h>
+#import <SmartDeviceLink/SDLShowResponse.h>
+#import <SmartDeviceLink/SDLSliderResponse.h>
+#import <SmartDeviceLink/SDLSpeakResponse.h>
+#import <SmartDeviceLink/SDLSubscribeButtonResponse.h>
+#import <SmartDeviceLink/SDLSubscribeVehicleDataResponse.h>
+#import <SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h>
+#import <SmartDeviceLink/SDLUnsubscribeButtonResponse.h>
+#import <SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h>
+#import <SmartDeviceLink/SDLUpdateTurnListResponse.h>
+
+@protocol SDLProxyListener
+
+-(void) onOnDriverDistraction:(SDLOnDriverDistraction*) notification;
+-(void) onOnHMIStatus:(SDLOnHMIStatus*) notification;
+-(void) onProxyClosed;
+-(void) onProxyOpened;
+
+@optional
+
+-(void) onAddCommandResponse:(SDLAddCommandResponse*) response;
+-(void) onAddSubMenuResponse:(SDLAddSubMenuResponse*) response;
+-(void) onAlertManeuverResponse:(SDLAlertManeuverResponse*) response;
+-(void) onAlertResponse:(SDLAlertResponse*) response;
+-(void) onChangeRegistrationResponse:(SDLChangeRegistrationResponse*) response;
+-(void) onCreateInteractionChoiceSetResponse:(SDLCreateInteractionChoiceSetResponse*) response;
+-(void) onDeleteCommandResponse:(SDLDeleteCommandResponse*) response;
+-(void) onDeleteFileResponse:(SDLDeleteFileResponse*) response;
+-(void) onDeleteInteractionChoiceSetResponse:(SDLDeleteInteractionChoiceSetResponse*) response;
+-(void) onDeleteSubMenuResponse:(SDLDeleteSubMenuResponse*) response;
+-(void) onEndAudioPassThruResponse:(SDLEndAudioPassThruResponse*) response;
+-(void) onError:(NSException*) e;
+-(void) onGenericResponse:(SDLGenericResponse*) response;
+-(void) onGetDTCsResponse:(SDLGetDTCsResponse*) response;
+-(void) onGetVehicleDataResponse:(SDLGetVehicleDataResponse*) response;
+-(void) onListFilesResponse:(SDLListFilesResponse*) response;
+-(void) onOnAppInterfaceUnregistered:(SDLOnAppInterfaceUnregistered*) notification;
+-(void) onOnAudioPassThru:(SDLOnAudioPassThru*) notification;
+-(void) onOnButtonEvent:(SDLOnButtonEvent*) notification;
+-(void) onOnButtonPress:(SDLOnButtonPress*) notification;
+-(void) onOnCommand:(SDLOnCommand*) notification;
+-(void) onOnLanguageChange:(SDLOnLanguageChange*) notification;
+-(void) onOnPermissionsChange:(SDLOnPermissionsChange*) notification;
+-(void) onOnTBTClientState:(SDLOnTBTClientState*) notification;
+-(void) onOnVehicleData:(SDLOnVehicleData*) notification;
+-(void) onPerformAudioPassThruResponse:(SDLPerformAudioPassThruResponse*) response;
+-(void) onPerformInteractionResponse:(SDLPerformInteractionResponse*) response;
+-(void) onPutFileResponse:(SDLPutFileResponse*) response;
+-(void) onReadDIDResponse:(SDLReadDIDResponse*) response;
+-(void) onRegisterAppInterfaceResponse:(SDLRegisterAppInterfaceResponse*) response;
+-(void) onResetGlobalPropertiesResponse:(SDLResetGlobalPropertiesResponse*) response;
+-(void) onScrollableMessageResponse:(SDLScrollableMessageResponse*) response;
+-(void) onSetAppIconResponse:(SDLSetAppIconResponse*) response;
+-(void) onSetDisplayLayoutResponse:(SDLSetDisplayLayoutResponse*) response;
+-(void) onSetGlobalPropertiesResponse:(SDLSetGlobalPropertiesResponse*) response;
+-(void) onSetMediaClockTimerResponse:(SDLSetMediaClockTimerResponse*) response;
+-(void) onShowConstantTBTResponse:(SDLShowConstantTBTResponse*) response;
+-(void) onShowResponse:(SDLShowResponse*) response;
+-(void) onSliderResponse:(SDLSliderResponse*) response;
+-(void) onSpeakResponse:(SDLSpeakResponse*) response;
+-(void) onSubscribeButtonResponse:(SDLSubscribeButtonResponse*) response;
+-(void) onSubscribeVehicleDataResponse:(SDLSubscribeVehicleDataResponse*) response;
+-(void) onUnregisterAppInterfaceResponse:(SDLUnregisterAppInterfaceResponse*) response;
+-(void) onUnsubscribeButtonResponse:(SDLUnsubscribeButtonResponse*) response;
+-(void) onUnsubscribeVehicleDataResponse:(SDLUnsubscribeVehicleDataResponse*) response;
+-(void) onUpdateTurnListResponse:(SDLUpdateTurnListResponse*) response;
+
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPutFile.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPutFile.h
new file mode 100644 (file)
index 0000000..ba3a75c
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPutFile.h
@@ -0,0 +1,19 @@
+//  SDLPutFile.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+#import <SmartDeviceLink/SDLFileType.h>
+
+@interface SDLPutFile : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSString* syncFileName;
+@property(assign) SDLFileType* fileType;
+@property(assign) NSNumber* persistentFile;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPutFile.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPutFile.m
new file mode 100644 (file)
index 0000000..3b2cb04
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPutFile.m
@@ -0,0 +1,63 @@
+//  SDLPutFile.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLPutFile.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLPutFile
+
+-(id) init {
+    if (self = [super initWithName:NAMES_PutFile]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setSyncFileName:(NSString *) syncFileName {
+    if (syncFileName != nil) {
+        [parameters setObject:syncFileName forKey:NAMES_syncFileName];
+    } else {
+        [parameters removeObjectForKey:NAMES_syncFileName];
+    }
+}
+
+-(NSString*) syncFileName {
+    return [parameters objectForKey:NAMES_syncFileName];
+}
+
+-(void) setFileType:(SDLFileType *) fileType {
+    if (fileType != nil) {
+        [parameters setObject:fileType forKey:NAMES_fileType];
+    } else {
+        [parameters removeObjectForKey:NAMES_fileType];
+    }
+}
+
+-(SDLFileType*) fileType {
+    NSObject* obj = [parameters objectForKey:NAMES_fileType];
+    if ([obj isKindOfClass:SDLFileType.class]) {
+        return (SDLFileType*)obj;
+    } else {
+        return [SDLFileType valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setPersistentFile:(NSNumber *) persistentFile {
+    if (persistentFile != nil) {
+        [parameters setObject:persistentFile forKey:NAMES_persistentFile];
+    } else {
+        [parameters removeObjectForKey:NAMES_persistentFile];
+    }
+}
+
+-(NSNumber*) persistentFile {
+    return [parameters objectForKey:NAMES_persistentFile];
+}
+
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPutFileResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPutFileResponse.h
new file mode 100644 (file)
index 0000000..ca394a1
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPutFileResponse.h
@@ -0,0 +1,15 @@
+//  SDLPutFileResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLPutFileResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* spaceAvailable;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPutFileResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPutFileResponse.m
new file mode 100644 (file)
index 0000000..b23ac6c
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLPutFileResponse.m
@@ -0,0 +1,33 @@
+//  SDLPutFileResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLPutFileResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLPutFileResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_PutFile]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setSpaceAvailable:(NSNumber *) spaceAvailable {
+    if (spaceAvailable != nil) {
+        [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable];
+    } else {
+        [parameters removeObjectForKey:NAMES_spaceAvailable];
+    }
+}
+
+-(NSNumber*) spaceAvailable {
+    return [parameters objectForKey:NAMES_spaceAvailable];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCMessage.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCMessage.h
similarity index 50%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCMessage.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCMessage.h
index f39e91d..07003db 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCMessage.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCMessage.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLRPCMessage.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLRPCStruct : NSObject {
        NSMutableDictionary* store;
@@ -12,7 +12,7 @@
 -(id) initWithDictionary:(NSMutableDictionary*) dict;
 -(id) init;
 
--(NSMutableDictionary*) serializeAsDictionary;
+-(NSMutableDictionary*) serializeAsDictionary:(Byte) version;
 
 @end
 
@@ -20,11 +20,17 @@
        NSMutableDictionary* function;
        NSMutableDictionary* parameters;
        NSString* messageType;
-       
+       NSData* _bulkData;
 }
 
 -(id) initWithName:(NSString*) name;
 -(id) initWithDictionary:(NSMutableDictionary*) dict;
+-(NSString*) getFunctionName;
+-(void) setFunctionName:(NSString*) functionName;
+-(NSObject*) getParameters:(NSString*) functionName;
+-(void) setParameters:(NSString*) functionName value:(NSObject*) value;
+-(NSData*) getBulkData;
+-(void) setBulkData:(NSData*) bulkData;
 
 @property(readonly) NSString* name;
 @property(readonly) NSString* messageType;

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCMessage.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCMessage.m
similarity index 52%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCMessage.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCMessage.m
index 9c71ca0..d6ee75a 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCMessage.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCMessage.m
@@ -1,9 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLRPCMessage.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLRPCMessage.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+#import <SmartDeviceLink/SDLDebugTool.h>
 
 @implementation SDLRPCStruct
 
@@ -21,15 +23,15 @@
        return self;
 }
 
--(NSMutableDictionary*) serializeDictionary:(NSDictionary*) dict {
+-(NSMutableDictionary*) serializeDictionary:(NSDictionary*) dict version:(Byte) version {
        
        NSMutableDictionary* ret = [NSMutableDictionary dictionaryWithCapacity:dict.count];
        for (NSString* key in [dict keyEnumerator]) {
                NSObject* value = [dict objectForKey:key];
                if ([value isKindOfClass:SDLRPCStruct.class]) {
-                       [ret setObject:[(SDLRPCStruct*)value serializeAsDictionary] forKey:key];
+                       [ret setObject:[(SDLRPCStruct*)value serializeAsDictionary:version] forKey:key];
                } else if ([value isKindOfClass:NSDictionary.class]) {
-                       [ret setObject:[self serializeDictionary:(NSDictionary*)value] forKey:key];
+                       [ret setObject:[self serializeDictionary:(NSDictionary*)value version:version] forKey:key];
                } else if ([value isKindOfClass:NSArray.class]) {
                        NSArray* arrayVal = (NSArray*) value;
                        
@@ -37,7 +39,7 @@
                                && ([[arrayVal objectAtIndex:0] isKindOfClass:SDLRPCStruct.class])) {
                                NSMutableArray* serializedList = [NSMutableArray arrayWithCapacity:arrayVal.count];
                                for (SDLRPCStruct* serializeable in arrayVal) {
-                                       [serializedList addObject:[serializeable serializeAsDictionary]];
+                                       [serializedList addObject:[serializeable serializeAsDictionary:version]];
                                }
                                [ret setObject:serializedList forKey:key];
                        } else if (arrayVal.count > 0 
@@ -59,8 +61,19 @@
        return ret;
 }
 
--(NSMutableDictionary*) serializeAsDictionary {
-       return [self serializeDictionary:store];
+-(NSMutableDictionary*) serializeAsDictionary:(Byte) version {
+    if (version == 2) {
+        NSString* messageType = [[store keyEnumerator] nextObject];
+               NSMutableDictionary* function = [[store objectForKey:messageType] retain];
+        if ([function isKindOfClass:NSMutableDictionary.class]) {
+            NSMutableDictionary* parameters = [[function objectForKey:NAMES_parameters] retain];
+            return [self serializeDictionary:parameters version:version];
+        } else {
+            return [self serializeDictionary:store version:version];
+        }
+    } else {
+        return [self serializeDictionary:store version:version];
+    }
 }
 
 -(void) dealloc {
@@ -88,7 +101,13 @@
 
 -(id) initWithDictionary:(NSMutableDictionary*) dict {
        if (self = [super initWithDictionary:dict]) {
-               messageType = [[store keyEnumerator] nextObject];
+
+        NSEnumerator *enumerator = [store keyEnumerator];
+        while (messageType = [enumerator nextObject]) {
+            if ([messageType isEqualToString:@"bulkData"] == FALSE){
+                break;
+            }
+        }
                
                function = [[store objectForKey:messageType] retain];
                parameters = [[function objectForKey:NAMES_parameters] retain];
@@ -96,9 +115,49 @@
        return self;
 }
 
+-(NSString*) getFunctionName {
+       return [function objectForKey:NAMES_operation_name];
+}
+
+-(void) setFunctionName:(NSString*) functionName {
+    if (functionName != nil) {
+        [function setObject:functionName forKey:NAMES_operation_name];
+    } else {
+        [function removeObjectForKey:NAMES_operation_name];
+    }
+}
+
+-(NSObject*) getParameters:(NSString*) functionName {
+    return [parameters objectForKey:functionName];
+}
+
+-(void) setParameters:(NSString*) functionName value:(NSObject*) value {
+    if (value != nil) {
+        [parameters setObject:value forKey:functionName];
+    } else {
+        [parameters removeObjectForKey:functionName];
+    }
+}
+
+-(NSData*) getBulkData {
+    return _bulkData;
+}
+
+-(void) setBulkData:(NSData*) bulkData {
+    if (bulkData != nil) {
+        Byte* mallocPtr = malloc(bulkData.length);
+        if (mallocPtr == nil) {
+            @throw [NSException exceptionWithName:@"OutOfMemoryException" reason:@"malloc failed" userInfo:nil];
+        }
+        _bulkData = [[NSData alloc] initWithBytesNoCopy:mallocPtr length:bulkData.length];
+        memcpy((void*)_bulkData.bytes, bulkData, bulkData.length);
+    }
+}
+
 -(void) dealloc {
        [function release];
        [parameters release];
+    [_bulkData release];
        
        [super dealloc];
 }

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCMessageType.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCMessageType.h
new file mode 100644 (file)
index 0000000..8b9cf56
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCMessageType.h
@@ -0,0 +1,17 @@
+//  SDLRPCMessageType.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLRPCMessageType : SDLEnum {}
+
++(SDLRPCMessageType*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLRPCMessageType*) request;
++(SDLRPCMessageType*) response;
++(SDLRPCMessageType*) notification;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCMessageType.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCMessageType.m
new file mode 100644 (file)
index 0000000..31c59e5
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCMessageType.m
@@ -0,0 +1,55 @@
+//  SDLRPCMessageType.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLRPCMessageType.h>
+
+SDLRPCMessageType* SDLRPCMessageType_request = nil;
+SDLRPCMessageType* SDLRPCMessageType_response = nil;
+SDLRPCMessageType* SDLRPCMessageType_notification = nil;
+
+NSMutableArray* SDLRPCMessageType_values = nil;
+@implementation SDLRPCMessageType
+
++(SDLRPCMessageType*) valueOf:(NSString*) value {
+    for (SDLRPCMessageType* item in SDLRPCMessageType.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLRPCMessageType_values == nil) {
+        SDLRPCMessageType_values = [[NSMutableArray alloc] initWithObjects:
+                SDLRPCMessageType_request,
+                SDLRPCMessageType_response,
+                SDLRPCMessageType_notification,
+                nil];
+    }
+    return SDLRPCMessageType_values;
+}
+
++(SDLRPCMessageType*) request {
+       if (SDLRPCMessageType_request == nil) {
+                       SDLRPCMessageType_request = [[SDLRPCMessageType alloc] initWithValue:@"request"];
+       }
+       return SDLRPCMessageType_request;
+}
+
++(SDLRPCMessageType*) response {
+    if (SDLRPCMessageType_response == nil) {
+        SDLRPCMessageType_response = [[SDLRPCMessageType alloc] initWithValue:@"response"];
+    }
+    return SDLRPCMessageType_response;
+}
+
++(SDLRPCMessageType*) notification {
+    if (SDLRPCMessageType_notification == nil) {
+        SDLRPCMessageType_notification = [[SDLRPCMessageType alloc] initWithValue:@"notification"];
+    }
+    return SDLRPCMessageType_notification;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCNotification.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCNotification.h
new file mode 100644 (file)
index 0000000..732b669
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCNotification.h
@@ -0,0 +1,10 @@
+//  SDLRPCNotification.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+@interface SDLRPCNotification : SDLRPCMessage {}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCNotification.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCNotification.m
new file mode 100644 (file)
index 0000000..9258dd6
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCNotification.m
@@ -0,0 +1,9 @@
+//  SDLRPCNotification.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLRPCNotification.h>
+
+@implementation SDLRPCNotification
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCRequest.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCRequest.h
similarity index 51%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCRequest.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCRequest.h
index 07cb4a3..1d14281 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCRequest.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCRequest.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLRPCRequest.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCMessage.h"
+#import <SmartDeviceLink/SDLRPCMessage.h>
 
 @interface SDLRPCRequest : SDLRPCMessage {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCRequest.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCRequest.m
similarity index 67%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCRequest.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCRequest.m
index 52ada4b..caddf5f 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCRequest.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCRequest.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLRPCRequest.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLRPCRequest.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLRPCRequest
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCRequestFactory.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCRequestFactory.h
new file mode 100644 (file)
index 0000000..3779d91
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCRequestFactory.h
@@ -0,0 +1,198 @@
+//  SDLRPCRequestFactory.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+
+#import <SmartDeviceLink/SDLAddCommand.h>
+#import <SmartDeviceLink/SDLAddSubMenu.h>
+#import <SmartDeviceLink/SDLAlert.h>
+#import <SmartDeviceLink/SDLAlertManeuver.h>
+#import <SmartDeviceLink/SDLAppHMIType.h>
+#import <SmartDeviceLink/SDLChangeRegistration.h>
+#import <SmartDeviceLink/SDLCreateInteractionChoiceSet.h>
+#import <SmartDeviceLink/SDLDeleteCommand.h>
+#import <SmartDeviceLink/SDLDeleteFile.h>
+#import <SmartDeviceLink/SDLDeleteInteractionChoiceSet.h>
+#import <SmartDeviceLink/SDLDeleteSubMenu.h>
+#import <SmartDeviceLink/SDLEndAudioPassThru.h>
+#import <SmartDeviceLink/SDLGetDTCs.h>
+#import <SmartDeviceLink/SDLGetVehicleData.h>
+#import <SmartDeviceLink/SDLListFiles.h>
+#import <SmartDeviceLink/SDLPerformAudioPassThru.h>
+#import <SmartDeviceLink/SDLPerformInteraction.h>
+#import <SmartDeviceLink/SDLPutFile.h>
+#import <SmartDeviceLink/SDLReadDID.h>
+#import <SmartDeviceLink/SDLRegisterAppInterface.h>
+#import <SmartDeviceLink/SDLResetGlobalProperties.h>
+#import <SmartDeviceLink/SDLScrollableMessage.h>
+#import <SmartDeviceLink/SDLSetAppIcon.h>
+#import <SmartDeviceLink/SDLSetDisplayLayout.h>
+#import <SmartDeviceLink/SDLSetGlobalProperties.h>
+#import <SmartDeviceLink/SDLSetMediaClockTimer.h>
+#import <SmartDeviceLink/SDLShow.h>
+#import <SmartDeviceLink/SDLShowConstantTBT.h>
+#import <SmartDeviceLink/SDLSlider.h>
+#import <SmartDeviceLink/SDLSpeak.h>
+#import <SmartDeviceLink/SDLSubscribeButton.h>
+#import <SmartDeviceLink/SDLSubscribeVehicleData.h>
+#import <SmartDeviceLink/SDLUnregisterAppInterface.h>
+#import <SmartDeviceLink/SDLUnsubscribeButton.h>
+#import <SmartDeviceLink/SDLUnsubscribeVehicleData.h>
+#import <SmartDeviceLink/SDLUpdateTurnList.h>
+
+@interface SDLRPCRequestFactory : NSObject {}
+
+//***** AddCommand *****
++(SDLAddCommand*) buildAddCommandWithID:(NSNumber*) cmdID menuName:(NSString*) menuName parentID:(NSNumber*) parentID position:(NSNumber*) position vrCommands:(NSArray*) vrCommands iconValue:(NSString*) iconValue iconType:(SDLImageType*) iconType correlationID:(NSNumber*) correlationID;
+
++(SDLAddCommand*) buildAddCommandWithID:(NSNumber*) cmdID menuName:(NSString*) menuName vrCommands:(NSArray*) vrCommands correlationID:(NSNumber*) correlationID;
+
++(SDLAddCommand*) buildAddCommandWithID:(NSNumber*) cmdID vrCommands:(NSArray*) vrCommands correlationID:(NSNumber*) correlationID;
+//*****
+
+
+//***** AddSubMenu *****
++(SDLAddSubMenu*) buildAddSubMenuWithID:(NSNumber*) menuID menuName:(NSString*) menuName position:(NSNumber*) position correlationID:(NSNumber*) correlationID;
+
++(SDLAddSubMenu*) buildAddSubMenuWithID:(NSNumber*) menuID menuName:(NSString*) menuName correlationID:(NSNumber*) correlationID;
+//*****
+
+
+//***** Alert *****
++(SDLAlert*) buildAlertWithTTS:(NSString*) ttsText alertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 alertText3:(NSString*) alertText3 playTone:(NSNumber*) playTone duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID;
+
++(SDLAlert*) buildAlertWithTTS:(NSString*) ttsText alertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 playTone:(NSNumber*) playTone duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID;
+
++(SDLAlert*) buildAlertWithTTS:(NSString*) ttsText playTone:(NSNumber*) playTone correlationID:(NSNumber*)
+correlationID;
+
+//***
++(SDLAlert*) buildAlertWithTTSChunks:(NSArray*) ttsChunks alertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 alertText3:(NSString*) alertText3 playTone:(NSNumber*) playTone duration:(NSNumber*) duration softButtons:(NSArray*) softButtons correlationID:(NSNumber*) correlationID;
+
++(SDLAlert*) buildAlertWithTTSChunks:(NSArray*) ttsChunks playTone:(NSNumber*) playTone correlationID:(NSNumber*) correlationID;
+
+//***
++(SDLAlert*) buildAlertWithAlertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 alertText3:(NSString*) alertText3 duration:(NSNumber*) duration softButtons:(NSArray*) softButtons correlationID:(NSNumber*) correlationID;
+
++(SDLAlert*) buildAlertWithAlertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 alertText3:(NSString*) alertText3 duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID;
+
++(SDLAlert*) buildAlertWithAlertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID;
+//*****
+
+
++(SDLAlertManeuver*) buildAlertManeuverWithTTSChunks:(NSArray*) ttsChunks softButtons:(NSArray*) softButtons correlationID:(NSNumber*) correlationID;
+
++(SDLChangeRegistration*) buildChangeRegistrationWithLanguage:(SDLLanguage*) language hmiDisplayLanguage:(SDLLanguage*) hmiDisplayLanguage correlationID:(NSNumber*) correlationID;
+
++(SDLCreateInteractionChoiceSet*) buildCreateInteractionChoiceSetWithID:(NSNumber*)interactionChoiceSetID choiceSet:(NSArray*) choices correlationID:(NSNumber*) correlationID;
+
++(SDLDeleteCommand*) buildDeleteCommandWithID:(NSNumber*) cmdID correlationID:(NSNumber*) correlationID;
+
++(SDLDeleteFile*) buildDeleteFileWithName:(NSString*) syncFileName correlationID:(NSNumber*) correlationID;
+
++(SDLListFiles*) buildListFilesWithCorrelationID:(NSNumber*) correlationID;
+
++(SDLDeleteInteractionChoiceSet*) buildDeleteInteractionChoiceSetWithID:(NSNumber*)interactionChoiceSetID correlationID:(NSNumber*) correlationID;
+
++(SDLDeleteSubMenu*) buildDeleteSubMenuWithID:(NSNumber*) menuID correlationID:(NSNumber*) correlationID;
+
++(SDLEndAudioPassThru*) buildEndAudioPassThruWithCorrelationID:(NSNumber*) correlationID;
+
++(SDLGetDTCs*) buildGetDTCsWithECUName:(NSNumber*) ecuName correlationID:(NSNumber*) correlationID;
+
++(SDLGetVehicleData*) buildGetVehicleDataWithGPS:(NSNumber*) gps speed:(NSNumber*) speed rpm:(NSNumber*) rpm fuelLevel:(NSNumber*) fuelLevel fuelLevelState:(NSNumber*) fuelLevelState instantFuelConsumption:(NSNumber*) instantFuelConsumption externalTemperature:(NSNumber*) externalTemperature vin:(NSNumber*) vin prndl:(NSNumber*) prndl tirePressure:(NSNumber*) tirePressure odometer:(NSNumber*) odometer beltStatus:(NSNumber*) beltStatus bodyInformation:(NSNumber*) bodyInformation deviceStatus:(NSNumber*) deviceStatus driverBraking:(NSNumber*) driverBraking wiperStatus:(NSNumber*) wiperStatus headLampStatus:(NSNumber*) headLampStatus engineTorque:(NSNumber*) engineTorque accPedalPosition:(NSNumber*) accPedalPosition steeringWheelAngle:(NSNumber*) steeringWheelAngle correlationID:(NSNumber*) correlationID;
+
++(SDLPerformAudioPassThru*) buildPerformAudioPassThruWithInitialPrompt:(NSString*) initialPrompt audioPassThruDisplayText1:(NSString*) audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString*) audioPassThruDisplayText2 samplingRate:(SDLSamplingRate*)  samplingRate maxDuration:(NSNumber*) maxDuration bitsPerSample:(SDLBitsPerSample*) bitsPerSample audioType:(SDLAudioType*) audioType muteAudio:(NSNumber*) muteAudio correlationID:(NSNumber*) correlationID;
+
+
+//***** PerformInteraction *****
++(SDLPerformInteraction*) buildPerformInteractionWithInitialChunks:(NSArray*)initialChunks initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpChunks:(NSArray*)helpChunks timeoutChunks:(NSArray*)timeoutChunks interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout vrHelp:(NSArray*) vrHelp correlationID:(NSNumber*) correlationID;
+
+//***
++(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSString*)initialPrompt initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpPrompt:(NSString*)helpPrompt timeoutPrompt:(NSString*)timeoutPrompt interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout vrHelp:(NSArray*) vrHelp correlationID:(NSNumber*) correlationID;
+
++(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSString*)initialPrompt initialText:(NSString*)initialText interactionChoiceSetID:(NSNumber*) interactionChoiceSetID vrHelp:(NSArray*) vrHelp correlationID:(NSNumber*) correlationID;
+
++(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSString*)initialPrompt initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpPrompt:(NSString*)helpPrompt timeoutPrompt:(NSString*)timeoutPrompt interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout correlationID:(NSNumber*) correlationID;
+
++(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSString*)initialPrompt initialText:(NSString*)initialText interactionChoiceSetID:(NSNumber*) interactionChoiceSetID correlationID:(NSNumber*) correlationID;
+//*****
+
+
++(SDLPutFile*) buildPutFileWithFileName:(NSString*) syncFileName fileType:(SDLFileType*) fileType persisistentFile:(NSNumber*) persistentFile correlationID:(NSNumber*) correlationID;
+
++(SDLReadDID*) buildReadDIDWithECUName:(NSNumber*) ecuName didLocation:(NSArray*) didLocation correlationID:(NSNumber*) correlationID;
+
+//***** RegisterAppInterface *****
++(SDLRegisterAppInterface*) buildRegisterAppInterfaceWithAppName:(NSString*) appName ttsName:(NSMutableArray*) ttsName vrSynonyms:(NSMutableArray*) vrSynonyms isMediaApp:(NSNumber*) isMediaApp languageDesired:(SDLLanguage*) languageDesired hmiDisplayLanguageDesired:(SDLLanguage*) hmiDisplayLanguageDesired appID:(NSString*) appID;
+
++(SDLRegisterAppInterface*) buildRegisterAppInterfaceWithAppName:(NSString*) appName isMediaApp:(NSNumber*) isMediaApp languageDesired:(SDLLanguage*) languageDesired appID:(NSString*) appID;
+
++(SDLRegisterAppInterface*) buildRegisterAppInterfaceWithAppName:(NSString*) appName languageDesired:(SDLLanguage*) laguageDesired appID:(NSString*) appID;
+//*****
+
+
++(SDLResetGlobalProperties*) buildResetGlobalPropertiesWithProperties:(NSArray*) properties correlationID:(NSNumber*) correlationID;
+
++(SDLScrollableMessage*) buildScrollableMessage:(NSString*) scrollableMessageBody timeout:(NSNumber*) timeout softButtons:(NSArray*) softButtons correlationID:(NSNumber*) correlationID;
+
++(SDLSetAppIcon*) buildSetAppIconWithFileName:(NSString*) syncFileName correlationID:(NSNumber*) correlationID;
+
++(SDLSetDisplayLayout*) buildSetDisplayLayout:(NSString*) displayLayout correlationID:(NSNumber*) correlationID;
+
+
+//***** SetGlobalProperties *****
++(SDLSetGlobalProperties*) buildSetGlobalPropertiesWithHelpText:(NSString*) helpText timeoutText:(NSString*) timeoutText vrHelpTitle:(NSString*) vrHelpTitle vrHelp:(NSArray*) vrHelp correlationID:(NSNumber*) correlationID;
+
++(SDLSetGlobalProperties*) buildSetGlobalPropertiesWithHelpText:(NSString*) helpText timeoutText:(NSString*) timeoutText correlationID:(NSNumber*) correlationID;
+//*****
+
+
+//***** SetMediaClockTimer *****
++(SDLSetMediaClockTimer*) buildSetMediaClockTimerWithHours:(NSNumber*) hours minutes:(NSNumber*) minutes seconds:(NSNumber*) seconds updateMode:(SDLUpdateMode*) updateMode correlationID:(NSNumber*) correlationID;
+
++(SDLSetMediaClockTimer*) buildSetMediaClockTimerWithUpdateMode:(SDLUpdateMode*) updateMode correlationID:(NSNumber*) correlationID;
+//*****
+
+
+//***** Show *****
++(SDLShow*) buildShowWithMainField1:(NSString*) mainField1 mainField2: (NSString*) mainField2 mainField3: (NSString*) mainField3 mainField4: (NSString*) mainField4 statusBar:(NSString*) statusBar mediaClock:(NSString*) mediaClock mediaTrack:(NSString*) mediaTrack alignment:(SDLTextAlignment*) textAlignment graphic:(SDLImage*) graphic softButtons:(NSArray*) softButtons customPresets:(NSArray*) customPresets correlationID:(NSNumber*) correlationID;
+
++(SDLShow*) buildShowWithMainField1:(NSString*) mainField1 mainField2: (NSString*) mainField2 statusBar:(NSString*) statusBar mediaClock:(NSString*) mediaClock mediaTrack:(NSString*) mediaTrack alignment:(SDLTextAlignment*) textAlignment correlationID:(NSNumber*) correlationID;
+
++(SDLShow*) buildShowWithMainField1:(NSString*) mainField1 mainField2: (NSString*) mainField2 alignment:(SDLTextAlignment*) alignment correlationID:(NSNumber*) correlationID;
+//*****
+
+
++(SDLShowConstantTBT*) buildShowConstantTBTWithNavigationText1:(NSString*) navigationText1 navigationText2:(NSString*) navigationText2 eta:(NSString*) eta totalDistance:(NSString*) totalDistance turnIcon:(SDLImage*) turnIcon distanceToManeuver:(NSNumber*) distanceToManeuver distanceToManeuverScale:(NSNumber*) distanceToManeuverScale maneuverComplete:(NSNumber*) maneuverComplete softButtons:(NSArray*) softButtons correlationID:(NSNumber*) correlationID;
+
+
+//***** Slider *****
++(SDLSlider*) buildSliderDynamicFooterWithNumTicks:(NSNumber*) numTicks position:(NSNumber*) position sliderHeader:(NSString*) sliderHeader sliderFooter:(NSArray*) sliderFooter timeout:(NSNumber*) timeout correlationID:(NSNumber*) correlationID;
+
++(SDLSlider*) buildSliderStaticFooterWithNumTicks:(NSNumber*) numTicks position:(NSNumber*) position sliderHeader:(NSString*) sliderHeader sliderFooter:(NSString*) sliderFooter timeout:(NSNumber*) timeout correlationID:(NSNumber*) correlationID;
+//*****
+
+
+//***** Speak *****
++(SDLSpeak*) buildSpeakWithTTSChunks:(NSArray*) ttsChunks correlationID:(NSNumber*) correlationID;
+
+//***
++(SDLSpeak*) buildSpeakWithTTS:(NSString*) ttsText correlationID:(NSNumber*) correlationID;
+//*****
+
+
++(SDLSubscribeButton*) buildSubscribeButtonWithName:(SDLButtonName*) buttonName correlationID:(NSNumber*) correlationID;
+
++(SDLSubscribeVehicleData*) buildSubscribeVehicleDataWithGPS:(NSNumber*) gps speed:(NSNumber*) speed rpm:(NSNumber*) rpm fuelLevel:(NSNumber*) fuelLevel fuelLevelState:(NSNumber*) fuelLevelState instantFuelConsumption:(NSNumber*) instantFuelConsumption externalTemperature:(NSNumber*) externalTemperature prndl:(NSNumber*) prndl tirePressure:(NSNumber*) tirePressure odometer:(NSNumber*) odometer beltStatus:(NSNumber*) beltStatus bodyInformation:(NSNumber*) bodyInformation deviceStatus:(NSNumber*) deviceStatus driverBraking:(NSNumber*) driverBraking wiperStatus:(NSNumber*) wiperStatus headLampStatus:(NSNumber*) headLampStatus engineTorque:(NSNumber*) engineTorque accPedalPosition:(NSNumber*) accPedalPosition steeringWheelAngle:(NSNumber*) steeringWheelAngle correlationID:(NSNumber*) correlationID;
+
++(SDLUnregisterAppInterface*) buildUnregisterAppInterfaceWithCorrelationID:(NSNumber*) correlationID;
+
++(SDLUnsubscribeButton*) buildUnsubscribeButtonWithName:(SDLButtonName*) buttonName correlationID:(NSNumber*) correlationID;
+
++(SDLUnsubscribeVehicleData*) buildUnsubscribeVehicleDataWithGPS:(NSNumber*) gps speed:(NSNumber*) speed rpm:(NSNumber*) rpm fuelLevel:(NSNumber*) fuelLevel fuelLevelState:(NSNumber*) fuelLevelState instantFuelConsumption:(NSNumber*) instantFuelConsumption externalTemperature:(NSNumber*) externalTemperature prndl:(NSNumber*) prndl tirePressure:(NSNumber*) tirePressure odometer:(NSNumber*) odometer beltStatus:(NSNumber*) beltStatus bodyInformation:(NSNumber*) bodyInformation deviceStatus:(NSNumber*) deviceStatus driverBraking:(NSNumber*) driverBraking wiperStatus:(NSNumber*) wiperStatus headLampStatus:(NSNumber*) headLampStatus engineTorque:(NSNumber*) engineTorque accPedalPosition:(NSNumber*) accPedalPosition steeringWheelAngle:(NSNumber*) steeringWheelAngle correlationID:(NSNumber*) correlationID;
+
++(SDLUpdateTurnList*) buildUpdateTurnList:(NSArray*) turnList softButtons:(NSArray*) softButtons correlationID:(NSNumber*) correlationID;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCRequestFactory.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCRequestFactory.m
new file mode 100644 (file)
index 0000000..8268bf2
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCRequestFactory.m
@@ -0,0 +1,667 @@
+//  SDLRPCRequestFactory.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLRPCRequestFactory.h>
+
+#import <SmartDeviceLink/SDLMenuParams.h>
+#import <SmartDeviceLink/SDLTTSChunkFactory.h>
+
+#define NGN_MEDIA_SCREEN_APP_NAME_MAX_LENGTH 5
+
+@implementation SDLRPCRequestFactory
+
+//***** AddCommand *****
++(SDLAddCommand*) buildAddCommandWithID:(NSNumber*) cmdID menuName:(NSString*) menuName parentID:(NSNumber*) parentID position:(NSNumber*) position vrCommands:(NSArray*) vrCommands iconValue:(NSString*) iconValue iconType:(SDLImageType*) iconType correlationID:(NSNumber*) correlationID {
+       
+    SDLAddCommand* msg = [[[SDLAddCommand alloc] init] autorelease];
+       msg.correlationID = correlationID;
+    
+       msg.cmdID = cmdID;
+    
+       if (menuName != nil || parentID != nil || position != nil) {
+               SDLMenuParams* menuParams = [[[SDLMenuParams alloc] init] autorelease];
+               menuParams.menuName = menuName;
+               menuParams.parentID = parentID;
+               menuParams.position = position;
+               msg.menuParams = menuParams;
+       }
+       msg.vrCommands = [[vrCommands mutableCopy] autorelease];
+    
+    if (iconValue != nil || iconType != nil) {
+        SDLImage* icon = [[[SDLImage alloc] init] autorelease];
+               icon.value = iconValue;
+               icon.imageType = iconType;
+               msg.cmdIcon = icon;
+    }
+    
+       return msg;
+}
+
++(SDLAddCommand*) buildAddCommandWithID:(NSNumber*) cmdID menuName:(NSString*) menuName vrCommands:(NSArray*) vrCommands correlationID:(NSNumber*) correlationID {
+       
+    return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:menuName parentID:nil position:nil vrCommands:vrCommands iconValue:nil iconType:nil correlationID:correlationID];
+}
+
++(SDLAddCommand*) buildAddCommandWithID:(NSNumber*) cmdID vrCommands:(NSArray*) vrCommands correlationID:(NSNumber*) correlationID {
+       
+    return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:nil vrCommands:vrCommands correlationID:correlationID];
+}
+//*****
+
+
+//***** AddSubMenu *****
++(SDLAddSubMenu*) buildAddSubMenuWithID:(NSNumber*) menuID menuName:(NSString*) menuName position:(NSNumber*) position correlationID:(NSNumber*) correlationID {
+       
+    SDLAddSubMenu* msg = [[[SDLAddSubMenu alloc] init] autorelease];
+       msg.correlationID = correlationID;
+       msg.menuID = menuID;
+       msg.menuName = menuName;
+       msg.position = position;
+       
+       return msg;
+}
+
++(SDLAddSubMenu*) buildAddSubMenuWithID:(NSNumber*) menuID menuName:(NSString*) menuName correlationID:(NSNumber*) correlationID  {
+       return [SDLRPCRequestFactory buildAddSubMenuWithID:menuID menuName:menuName position:nil correlationID:correlationID];
+}
+//*****
+
+
+//***** Alert *****
++(SDLAlert*) buildAlertWithTTS:(NSString*) ttsText alertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 alertText3:(NSString*) alertText3 playTone:(NSNumber*) playTone duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID {
+       
+    SDLTTSChunk* simpleChunk = [[[SDLTTSChunk alloc] init] autorelease];
+       simpleChunk.text = ttsText;
+       simpleChunk.type = SDLSpeechCapabilities.TEXT;
+       NSArray* ttsChunks = [NSArray arrayWithObject:simpleChunk];
+       
+    return [SDLRPCRequestFactory buildAlertWithTTSChunks:ttsChunks alertText1:alertText1 alertText2:alertText2 alertText3:alertText3 playTone:playTone duration:duration softButtons:nil correlationID:correlationID];
+}
+
++(SDLAlert*) buildAlertWithTTS:(NSString*) ttsText alertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 playTone:(NSNumber*) playTone duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID {
+       
+    return [SDLRPCRequestFactory buildAlertWithTTS:ttsText alertText1:alertText1 alertText2:alertText2 alertText3:nil playTone:playTone duration:duration correlationID:correlationID];
+}
+
++(SDLAlert*) buildAlertWithTTS:(NSString*) ttsText playTone:(NSNumber*) playTone correlationID:(NSNumber*)
+correlationID{
+       
+    return [SDLRPCRequestFactory buildAlertWithTTS:ttsText alertText1:nil alertText2:nil alertText3:nil playTone:playTone duration:nil correlationID:correlationID];
+}
+
+//***
++(SDLAlert*) buildAlertWithTTSChunks:(NSArray*) ttsChunks alertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 alertText3:(NSString*) alertText3 playTone:(NSNumber*) playTone duration:(NSNumber*) duration softButtons:(NSArray*) softButtons correlationID:(NSNumber*) correlationID {
+       
+    SDLAlert* msg = [[[SDLAlert alloc] init] autorelease];
+       msg.correlationID = correlationID;
+       msg.alertText1 = alertText1;
+       msg.alertText2 = alertText2;
+    msg.alertText3 = alertText3;
+       msg.ttsChunks = [[ttsChunks mutableCopy] autorelease];
+       msg.playTone = playTone;
+       msg.duration = duration;
+    msg.softButtons = [[softButtons mutableCopy] autorelease];
+       return msg;
+}
+
++(SDLAlert*) buildAlertWithTTSChunks:(NSArray*) ttsChunks playTone:(NSNumber*) playTone correlationID:(NSNumber*) correlationID  {
+       return [SDLRPCRequestFactory buildAlertWithTTSChunks:ttsChunks alertText1:nil alertText2:nil alertText3:nil playTone:playTone duration:nil softButtons:nil correlationID:correlationID];
+}
+
+//***
++(SDLAlert*) buildAlertWithAlertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 alertText3:(NSString*) alertText3 duration:(NSNumber*) duration softButtons:(NSMutableArray*) softButtons correlationID:(NSNumber*) correlationID  {
+       return [SDLRPCRequestFactory buildAlertWithTTSChunks:nil alertText1:alertText1 alertText2:alertText2 alertText3:alertText3 playTone:nil duration:duration softButtons:softButtons correlationID:correlationID];
+}
+
++(SDLAlert*) buildAlertWithAlertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 alertText3:(NSString*) alertText3 duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID  {
+       return [SDLRPCRequestFactory buildAlertWithTTSChunks:nil alertText1: alertText1 alertText2:alertText2 alertText3:alertText3 playTone:nil duration:duration softButtons:nil correlationID:correlationID];
+}
+
++(SDLAlert*) buildAlertWithAlertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID  {
+       return [SDLRPCRequestFactory buildAlertWithTTSChunks:nil alertText1: alertText1 alertText2:alertText2 alertText3:nil playTone:nil duration:duration softButtons:nil correlationID:correlationID];
+}
+//*****
+
+
++(SDLAlertManeuver*) buildAlertManeuverWithTTSChunks:(NSMutableArray*) ttsChunks softButtons:(NSMutableArray*) softButtons correlationID:(NSNumber*) correlationID {
+    
+    SDLAlertManeuver* msg = [[[SDLAlertManeuver alloc] init] autorelease];
+    msg.ttsChunks = [[ttsChunks mutableCopy] autorelease];
+    msg.softButtons = [[softButtons mutableCopy] autorelease];
+    msg.correlationID = correlationID;
+    return msg;
+}
+
++(SDLChangeRegistration*) buildChangeRegistrationWithLanguage:(SDLLanguage*) language hmiDisplayLanguage:(SDLLanguage*) hmiDisplayLanguage correlationID:(NSNumber*) correlationID {
+       
+    SDLChangeRegistration* msg = [[[SDLChangeRegistration alloc] init] autorelease];
+    msg.language = language;
+    msg.hmiDisplayLanguage = hmiDisplayLanguage;
+    msg.correlationID = correlationID;
+    
+       return msg;
+}
+
++(SDLCreateInteractionChoiceSet*) buildCreateInteractionChoiceSetWithID:(NSNumber*)interactionChoiceSetID choiceSet:(NSArray*) choices correlationID:(NSNumber*) correlationID  {
+       
+    SDLCreateInteractionChoiceSet *msg = [[[SDLCreateInteractionChoiceSet alloc] init] autorelease];
+       msg.interactionChoiceSetID = interactionChoiceSetID;
+       msg.choiceSet = [[choices mutableCopy] autorelease];
+       msg.correlationID = correlationID;
+       
+       return msg;
+}
+
++(SDLDeleteCommand*) buildDeleteCommandWithID:(NSNumber*) cmdID correlationID:(NSNumber*) correlationID  {
+       
+    SDLDeleteCommand *msg = [[[SDLDeleteCommand alloc] init] autorelease];
+       msg.cmdID = cmdID;
+       msg.correlationID = correlationID;
+       
+    return msg;
+}
+
++(SDLDeleteFile*) buildDeleteFileWithName:(NSString*) syncFileName correlationID:(NSNumber*) correlationID {
+    
+    SDLDeleteFile* msg = [[[SDLDeleteFile alloc] init] autorelease];
+    msg.syncFileName = syncFileName;
+    msg.correlationID = correlationID;
+    
+    return msg;
+}
+
++(SDLListFiles*) buildListFilesWithCorrelationID:(NSNumber*) correlationID {
+    
+    SDLListFiles* msg = [[[SDLListFiles alloc] init] autorelease];
+    msg.correlationID = correlationID;
+    
+    return msg;
+}
+
++(SDLDeleteInteractionChoiceSet*) buildDeleteInteractionChoiceSetWithID:(NSNumber*)interactionChoiceSetID correlationID:(NSNumber*) correlationID  {
+       
+    SDLDeleteInteractionChoiceSet *msg = [[[SDLDeleteInteractionChoiceSet alloc] init] autorelease];
+       msg.interactionChoiceSetID = interactionChoiceSetID;
+       msg.correlationID = correlationID;
+       
+       return msg;
+}
+
++(SDLDeleteSubMenu*) buildDeleteSubMenuWithID:(NSNumber*) menuID correlationID:(NSNumber*) correlationID {
+       
+    SDLDeleteSubMenu *msg = [[[SDLDeleteSubMenu alloc] init] autorelease];
+       msg.menuID = menuID;
+       msg.correlationID = correlationID;
+    
+       return msg;
+}
+
++(SDLEndAudioPassThru*) buildEndAudioPassThruWithCorrelationID:(NSNumber*) correlationID {
+    
+    SDLEndAudioPassThru* msg = [[[SDLEndAudioPassThru alloc] init] autorelease];
+    msg.correlationID = correlationID;
+    
+       return msg;
+}
+
++(SDLGetDTCs*) buildGetDTCsWithECUName:(NSNumber*) ecuName correlationID:(NSNumber*) correlationID {
+       
+    SDLGetDTCs* msg = [[[SDLGetDTCs alloc] init] autorelease];
+    msg.ecuName = ecuName;
+       msg.correlationID = correlationID;
+    
+       return msg;
+}
+
++(SDLGetVehicleData*) buildGetVehicleDataWithGPS:(NSNumber*) gps speed:(NSNumber*) speed rpm:(NSNumber*) rpm fuelLevel:(NSNumber*) fuelLevel fuelLevelState:(NSNumber*) fuelLevelState instantFuelConsumption:(NSNumber*) instantFuelConsumption externalTemperature:(NSNumber*) externalTemperature vin:(NSNumber*) vin prndl:(NSNumber*) prndl tirePressure:(NSNumber*) tirePressure odometer:(NSNumber*) odometer beltStatus:(NSNumber*) beltStatus bodyInformation:(NSNumber*) bodyInformation deviceStatus:(NSNumber*) deviceStatus driverBraking:(NSNumber*) driverBraking wiperStatus:(NSNumber*) wiperStatus headLampStatus:(NSNumber*) headLampStatus engineTorque:(NSNumber*) engineTorque accPedalPosition:(NSNumber*) accPedalPosition steeringWheelAngle:(NSNumber*) steeringWheelAngle correlationID:(NSNumber*) correlationID {
+       
+    SDLGetVehicleData* msg = [[[SDLGetVehicleData alloc] init] autorelease];
+    msg.gps = gps;
+       msg.speed = speed;
+       msg.rpm = rpm;
+       msg.fuelLevel = fuelLevel;
+       msg.fuelLevelState = fuelLevelState;
+       msg.instantFuelConsumption = instantFuelConsumption;
+       msg.externalTemperature = externalTemperature;
+       msg.vin = vin;
+       msg.prndl = prndl;
+       msg.tirePressure = tirePressure;
+       msg.odometer = odometer;
+       msg.beltStatus = beltStatus;
+       msg.bodyInformation = bodyInformation;
+       msg.deviceStatus = deviceStatus;
+    msg.driverBraking = driverBraking;
+    msg.wiperStatus = wiperStatus;
+    msg.headLampStatus = headLampStatus;
+    msg.engineTorque = engineTorque;
+    msg.accPedalPosition = accPedalPosition;
+    msg.steeringWheelAngle = steeringWheelAngle;
+       msg.correlationID = correlationID;
+       
+       return msg;
+}
+
++(SDLPerformAudioPassThru*) buildPerformAudioPassThruWithInitialPrompt:(NSString*) initialPrompt audioPassThruDisplayText1:(NSString*) audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString*) audioPassThruDisplayText2 samplingRate:(SDLSamplingRate*)  samplingRate maxDuration:(NSNumber*) maxDuration bitsPerSample:(SDLBitsPerSample*) bitsPerSample audioType:(SDLAudioType*) audioType muteAudio:(NSNumber*) muteAudio correlationID:(NSNumber*) correlationID {
+    
+    NSArray* initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt];
+    
+    SDLPerformAudioPassThru* msg = [[[SDLPerformAudioPassThru alloc] init] autorelease];
+       msg.initialPrompt = [[initialChunks mutableCopy] autorelease];
+       msg.audioPassThruDisplayText1 = audioPassThruDisplayText1;
+       msg.audioPassThruDisplayText2 = audioPassThruDisplayText2;
+       msg.samplingRate = samplingRate;
+    msg.maxDuration = maxDuration;
+    msg.bitsPerSample = bitsPerSample;
+    msg.audioType = audioType;
+    msg.muteAudio = muteAudio;
+    
+    return msg;
+}
+
+
+//***** PerformInteraction *****
++(SDLPerformInteraction*) buildPerformInteractionWithInitialChunks:(NSArray*)initialChunks initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpChunks:(NSArray*)helpChunks timeoutChunks:(NSArray*)timeoutChunks interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout vrHelp:(NSArray*) vrHelp correlationID:(NSNumber*) correlationID  {
+       
+    SDLPerformInteraction *msg = [[[SDLPerformInteraction alloc] init] autorelease];
+       msg.initialPrompt = [[initialChunks mutableCopy] autorelease];
+       msg.initialText = initialText;
+       msg.interactionChoiceSetIDList = [[interactionChoiceSetIDList mutableCopy] autorelease];
+       msg.helpPrompt = [[helpChunks mutableCopy] autorelease];
+       msg.timeoutPrompt = [[timeoutChunks mutableCopy] autorelease];
+       msg.interactionMode = interactionMode;
+       msg.timeout = timeout;
+    msg.vrHelp = [[vrHelp mutableCopy] autorelease];
+       msg.correlationID = correlationID;
+       
+       return msg;
+}
+
+//***
++(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSString*)initialPrompt initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpPrompt:(NSString*)helpPrompt timeoutPrompt:(NSString*)timeoutPrompt interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout vrHelp:(NSArray*) vrHelp correlationID:(NSNumber*) correlationID  {
+       
+    NSArray* initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt];
+       NSArray* helpChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpPrompt];
+       NSArray* timeoutChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutPrompt];
+       
+       return [SDLRPCRequestFactory buildPerformInteractionWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:interactionMode timeout:timeout vrHelp:vrHelp correlationID:correlationID];
+}
+
++(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSString*)initialPrompt initialText:(NSString*)initialText interactionChoiceSetID:(NSNumber*) interactionChoiceSetID vrHelp:(NSArray*) vrHelp correlationID:(NSNumber*) correlationID  {
+       
+    NSArray *interactionChoiceSetIDList = [NSArray arrayWithObject:interactionChoiceSetID];
+       NSArray* initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt];
+       
+       return [SDLRPCRequestFactory buildPerformInteractionWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:nil timeoutChunks:nil interactionMode:SDLInteractionMode.BOTH timeout:nil vrHelp:vrHelp correlationID:correlationID];
+}
+
++(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSString*)initialPrompt initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpPrompt:(NSString*)helpPrompt timeoutPrompt:(NSString*)timeoutPrompt interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout correlationID:(NSNumber*) correlationID  {
+    
+       return [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:initialPrompt initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpPrompt:helpPrompt timeoutPrompt:timeoutPrompt interactionMode:interactionMode timeout:timeout vrHelp:nil correlationID:(NSNumber*) correlationID];
+}
+
++(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSString*)initialPrompt initialText:(NSString*)initialText interactionChoiceSetID:(NSNumber*) interactionChoiceSetID correlationID:(NSNumber*) correlationID  {
+    
+       return [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:initialPrompt initialText:initialText interactionChoiceSetID:interactionChoiceSetID vrHelp:nil correlationID:correlationID];
+}
+//*****
+
+
++(SDLPutFile*) buildPutFileWithFileName:(NSString*) syncFileName fileType:(SDLFileType*) fileType persisistentFile:(NSNumber*) persistentFile correlationID:(NSNumber*) correlationID {
+    
+    SDLPutFile* msg = [[[SDLPutFile alloc] init] autorelease];
+    msg.syncFileName = syncFileName;
+    
+    msg.fileType = [[fileType mutableCopy] autorelease];
+    msg.persistentFile = persistentFile;
+    
+    msg.correlationID = correlationID;
+    
+    return msg;
+}
+
++(SDLReadDID*) buildReadDIDWithECUName:(NSNumber*) ecuName didLocation:(NSArray*) didLocation correlationID:(NSNumber*) correlationID {
+       
+    SDLReadDID* msg = [[[SDLReadDID alloc] init] autorelease];
+    msg.ecuName = ecuName;
+       msg.didLocation = [[didLocation mutableCopy] autorelease];
+       msg.correlationID = correlationID;
+       
+       return msg;
+}
+
+//***** RegisterAppInterface *****
++(SDLRegisterAppInterface*) buildRegisterAppInterfaceWithAppName:(NSString*) appName ttsName:(NSMutableArray*) ttsName vrSynonyms:(NSMutableArray*) vrSynonyms isMediaApp:(NSNumber*) isMediaApp languageDesired:(SDLLanguage*) languageDesired hmiDisplayLanguageDesired:(SDLLanguage*) hmiDisplayLanguageDesired appID:(NSString*) appID {
+    
+    SDLRegisterAppInterface* msg = [[[SDLRegisterAppInterface alloc] init] autorelease];
+    SDLSyncMsgVersion* version = [[[SDLSyncMsgVersion alloc] init] autorelease];
+       version.majorVersion = [NSNumber numberWithInt:1];
+       version.minorVersion = [NSNumber numberWithInt:0];
+    msg.syncMsgVersion = version;
+       msg.appName = appName;
+    msg.ttsName = ttsName;
+       NSString* ngnMediaAppName = [[appName copy] autorelease];
+       if (ngnMediaAppName.length > NGN_MEDIA_SCREEN_APP_NAME_MAX_LENGTH) {
+               ngnMediaAppName = [ngnMediaAppName substringToIndex:NGN_MEDIA_SCREEN_APP_NAME_MAX_LENGTH];
+       }
+       msg.ngnMediaScreenAppName = ngnMediaAppName;
+       msg.vrSynonyms = vrSynonyms;
+       msg.isMediaApplication = isMediaApp;
+    msg.languageDesired = languageDesired;
+    msg.hmiDisplayLanguageDesired = hmiDisplayLanguageDesired;
+    msg.appID = appID;
+    
+    msg.correlationID = [NSNumber numberWithInt:1];
+    
+       return msg;
+}
+
++(SDLRegisterAppInterface*) buildRegisterAppInterfaceWithAppName:(NSString*) appName isMediaApp:(NSNumber*) isMediaApp languageDesired:(SDLLanguage*) languageDesired appID:(NSString*) appID {
+    
+       NSMutableArray* syns = [NSMutableArray arrayWithObject:appName];
+    
+    return [SDLRPCRequestFactory buildRegisterAppInterfaceWithAppName:appName ttsName:nil vrSynonyms:syns isMediaApp:isMediaApp languageDesired:languageDesired hmiDisplayLanguageDesired:languageDesired appID:appID];
+}
+
++(SDLRegisterAppInterface*) buildRegisterAppInterfaceWithAppName:(NSString*) appName languageDesired:(SDLLanguage*) languageDesired appID:(NSString*) appID{
+    
+    return [SDLRPCRequestFactory buildRegisterAppInterfaceWithAppName:appName isMediaApp:[NSNumber numberWithBool:NO] languageDesired:languageDesired appID: appID];
+}
+//*****
+
+
++(SDLResetGlobalProperties*) buildResetGlobalPropertiesWithProperties:(NSArray*) properties correlationID:(NSNumber*) correlationID {
+       
+    SDLResetGlobalProperties* msg = [[[SDLResetGlobalProperties alloc] init] autorelease];
+       msg.properties = [[properties mutableCopy] autorelease];
+       msg.correlationID = correlationID;
+       
+       return msg;
+}
+
++(SDLScrollableMessage*) buildScrollableMessage:(NSString*) scrollableMessageBody timeout:(NSNumber*) timeout softButtons:(NSArray*) softButtons correlationID:(NSNumber*) correlationID {
+       
+    SDLScrollableMessage* msg = [[[SDLScrollableMessage alloc] init] autorelease];
+    msg.scrollableMessageBody = scrollableMessageBody;
+    msg.timeout = timeout;
+    msg.softButtons = [[softButtons mutableCopy] autorelease];
+       msg.correlationID = correlationID;
+       
+       return msg;
+}
+
++(SDLSetAppIcon*) buildSetAppIconWithFileName:(NSString*) syncFileName correlationID:(NSNumber*) correlationID {
+    
+    SDLSetAppIcon* msg = [[[SDLSetAppIcon alloc] init] autorelease];
+    msg.syncFileName = syncFileName;
+    msg.correlationID = correlationID;
+    
+    return msg;
+}
+
++(SDLSetDisplayLayout*) buildSetDisplayLayout:(NSString*) displayLayout correlationID:(NSNumber*) correlationID {
+    
+    SDLSetDisplayLayout* msg = [[[SDLSetDisplayLayout alloc] init] autorelease];
+    msg.displayLayout = displayLayout;
+    msg.correlationID = correlationID;
+    
+       return msg;
+}
+
+
+//***** SetGlobalProperties *****
++(SDLSetGlobalProperties*) buildSetGlobalPropertiesWithHelpText:(NSString*) helpText timeoutText:(NSString*) timeoutText vrHelpTitle:(NSString*) vrHelpTitle vrHelp:(NSArray*) vrHelp correlationID:(NSNumber*) correlationID {
+    
+       SDLSetGlobalProperties* msg = [[[SDLSetGlobalProperties alloc] init] autorelease];
+       msg.helpPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpText];
+       msg.timeoutPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutText];
+    msg.vrHelpTitle = vrHelpTitle;
+    msg.vrHelp = [[vrHelp mutableCopy] autorelease];
+    msg.correlationID = correlationID;
+       
+       return msg;
+}
+
++(SDLSetGlobalProperties*) buildSetGlobalPropertiesWithHelpText:(NSString*) helpText timeoutText:(NSString*) timeoutText correlationID:(NSNumber*) correlationID {
+       
+    SDLSetGlobalProperties* msg = [[[SDLSetGlobalProperties alloc] init] autorelease];
+       msg.helpPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpText];
+       msg.timeoutPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutText];
+       msg.correlationID = correlationID;
+       
+       return msg;
+}
+//*****
+
+
+//***** SetMediaClockTimer *****
++(SDLSetMediaClockTimer*) buildSetMediaClockTimerWithHours:(NSNumber*) hours minutes:(NSNumber*) minutes seconds:(NSNumber*) seconds updateMode:(SDLUpdateMode*) updateMode correlationID:(NSNumber*) correlationID  {
+       
+    SDLSetMediaClockTimer* msg = [[[SDLSetMediaClockTimer alloc] init] autorelease];
+       SDLStartTime* startTime = [[[SDLStartTime alloc] init] autorelease];
+       startTime.hours = hours;
+       startTime.minutes = minutes;
+       startTime.seconds = seconds;
+       msg.startTime = startTime;
+       msg.updateMode = updateMode;
+       msg.correlationID = correlationID;
+       
+       return msg;
+}
+
++(SDLSetMediaClockTimer*) buildSetMediaClockTimerWithUpdateMode:(SDLUpdateMode*) updateMode correlationID:(NSNumber*) correlationID  {
+       
+    SDLSetMediaClockTimer* msg = [[[SDLSetMediaClockTimer alloc] init] autorelease];
+       msg.updateMode = updateMode;
+       msg.correlationID = correlationID;
+       
+       return msg;
+}
+//*****
+
+
+//***** Show *****
++(SDLShow*) buildShowWithMainField1:(NSString*) mainField1 mainField2: (NSString*) mainField2 mainField3: (NSString*) mainField3 mainField4: (NSString*) mainField4 statusBar:(NSString*) statusBar mediaClock:(NSString*) mediaClock mediaTrack:(NSString*) mediaTrack alignment:(SDLTextAlignment*) textAlignment graphic:(SDLImage*) graphic softButtons:(NSArray*) softButtons customPresets:(NSArray*) customPresets correlationID:(NSNumber*) correlationID {
+       
+    SDLShow* msg = [[[SDLShow alloc] init] autorelease];
+       msg.correlationID = correlationID;
+       msg.mainField1 = mainField1;
+       msg.mainField2 = mainField2;
+    msg.mainField3 = mainField3;
+       msg.mainField4 = mainField4;
+       msg.statusBar = statusBar;
+       msg.mediaClock = mediaClock;
+       msg.mediaTrack = mediaTrack;
+       msg.alignment = textAlignment;
+    msg.graphic = graphic;
+    msg.softButtons = [[softButtons mutableCopy] autorelease];
+    msg.customPresets = [[customPresets mutableCopy] autorelease];
+    
+       return msg;
+}
+
++(SDLShow*) buildShowWithMainField1:(NSString*) mainField1 mainField2: (NSString*) mainField2 statusBar:(NSString*) statusBar mediaClock:(NSString*) mediaClock mediaTrack:(NSString*) mediaTrack alignment:(SDLTextAlignment*) textAlignment correlationID:(NSNumber*) correlationID  {
+       
+    SDLShow* msg = [[[SDLShow alloc] init] autorelease];
+       msg.correlationID = correlationID;
+       msg.mainField1 = mainField1;
+       msg.mainField2 = mainField2;
+       msg.statusBar = statusBar;
+       msg.mediaClock = mediaClock;
+       msg.mediaTrack = mediaTrack;
+       msg.alignment = textAlignment;
+       
+       return msg;
+}
+
++(SDLShow*) buildShowWithMainField1:(NSString*) mainField1 mainField2: (NSString*) mainField2 alignment:(SDLTextAlignment*) alignment correlationID:(NSNumber*) correlationID  {
+       
+    return [SDLRPCRequestFactory buildShowWithMainField1:mainField1 mainField2:mainField2 statusBar:nil mediaClock:nil mediaTrack:nil alignment:alignment correlationID:correlationID];
+}
+//*****
+
+
++(SDLShowConstantTBT*) buildShowConstantTBTWithNavigationText1:(NSString*) navigationText1 navigationText2:(NSString*) navigationText2 eta:(NSString*) eta totalDistance:(NSString*) totalDistance turnIcon:(SDLImage*) turnIcon distanceToManeuver:(NSNumber*) distanceToManeuver distanceToManeuverScale:(NSNumber*) distanceToManeuverScale maneuverComplete:(NSNumber*) maneuverComplete softButtons:(NSArray*) softButtons correlationID:(NSNumber*) correlationID {
+    
+    SDLShowConstantTBT* msg = [[[SDLShowConstantTBT alloc] init] autorelease];
+    
+    msg.navigationText1 = navigationText1;
+    msg.navigationText2 = navigationText2;
+    msg.eta = eta;
+    msg.totalDistance = totalDistance;
+    
+    msg.turnIcon = [[turnIcon mutableCopy] autorelease];
+       
+    msg.distanceToManeuver = distanceToManeuver;
+    msg.distanceToManeuverScale = distanceToManeuverScale;
+    msg.maneuverComplete = maneuverComplete;
+    
+    msg.softButtons = [[softButtons mutableCopy] autorelease];
+    
+    msg.correlationID = correlationID;
+    
+    return msg;
+}
+
+
+//***** Slider *****
++(SDLSlider*) buildSliderDynamicFooterWithNumTicks:(NSNumber*) numTicks position:(NSNumber*) position sliderHeader:(NSString*) sliderHeader sliderFooter:(NSArray*) sliderFooter timeout:(NSNumber*) timeout correlationID:(NSNumber*) correlationID { SDLSlider* msg = [[[SDLSlider alloc] init] autorelease];
+       msg.correlationID = correlationID;
+    msg.numTicks = numTicks;
+    msg.position = position;
+    msg.sliderHeader = sliderHeader;
+    msg.sliderFooter = [[sliderFooter mutableCopy] autorelease];
+       msg.timeout = timeout;
+    
+    return msg;
+}
+
++(SDLSlider*) buildSliderStaticFooterWithNumTicks:(NSNumber*) numTicks position:(NSNumber*) position sliderHeader:(NSString*) sliderHeader sliderFooter:(NSString*) sliderFooter timeout:(NSNumber*) timeout correlationID:(NSNumber*) correlationID {
+       
+       NSArray* sliderFooters = [NSArray arrayWithObject:sliderFooter];
+    
+    // Populates array with the same footer value for each position
+    for (UInt32 i = 1; i < numTicks.unsignedIntegerValue; i++) {
+        sliderFooters = [sliderFooters arrayByAddingObject:sliderFooter];
+       }
+    
+    return [SDLRPCRequestFactory buildSliderDynamicFooterWithNumTicks:numTicks position:position sliderHeader:sliderHeader sliderFooter:sliderFooters timeout:timeout correlationID:correlationID];
+}
+//*****
+
+
+//***** Speak *****
++(SDLSpeak*) buildSpeakWithTTSChunks:(NSArray*) ttsChunks correlationID:(NSNumber*) correlationID  {
+       
+    SDLSpeak* msg = [[[SDLSpeak alloc] init] autorelease];
+       msg.correlationID = correlationID;
+       msg.ttsChunks = [[ttsChunks mutableCopy] autorelease];
+       
+       return msg;
+}
+
+//***
++(SDLSpeak*) buildSpeakWithTTS:(NSString*) ttsText correlationID:(NSNumber*) correlationID  {
+       
+    SDLTTSChunk* simpleChunk = [[[SDLTTSChunk alloc] init] autorelease];
+       simpleChunk.text = ttsText;
+       simpleChunk.type = SDLSpeechCapabilities.TEXT;
+       NSArray* ttsChunks = [NSMutableArray arrayWithObject:simpleChunk];
+       
+    return [SDLRPCRequestFactory buildSpeakWithTTSChunks:ttsChunks correlationID:correlationID];
+       
+}
+//*****
+
+
++(SDLSubscribeButton*) buildSubscribeButtonWithName:(SDLButtonName*) buttonName correlationID:(NSNumber*) correlationID {
+       
+    SDLSubscribeButton* msg = [[[SDLSubscribeButton alloc] init] autorelease];
+       msg.correlationID = correlationID;
+       msg.buttonName = buttonName;
+       
+       return msg;
+}
+
++(SDLSubscribeVehicleData*) buildSubscribeVehicleDataWithGPS:(NSNumber*) gps speed:(NSNumber*) speed rpm:(NSNumber*) rpm fuelLevel:(NSNumber*) fuelLevel fuelLevelState:(NSNumber*) fuelLevelState instantFuelConsumption:(NSNumber*) instantFuelConsumption externalTemperature:(NSNumber*) externalTemperature prndl:(NSNumber*) prndl tirePressure:(NSNumber*) tirePressure odometer:(NSNumber*) odometer beltStatus:(NSNumber*) beltStatus bodyInformation:(NSNumber*) bodyInformation deviceStatus:(NSNumber*) deviceStatus driverBraking:(NSNumber*) driverBraking wiperStatus:(NSNumber*) wiperStatus headLampStatus:(NSNumber*) headLampStatus engineTorque:(NSNumber*) engineTorque accPedalPosition:(NSNumber*) accPedalPosition steeringWheelAngle:(NSNumber*) steeringWheelAngle correlationID:(NSNumber*) correlationID {
+       
+    SDLSubscribeVehicleData* msg = [[[SDLSubscribeVehicleData alloc] init] autorelease];
+    msg.gps = gps;
+       msg.speed = speed;
+       msg.rpm = rpm;
+       msg.fuelLevel = fuelLevel;
+       msg.fuelLevelState = fuelLevelState;
+       msg.instantFuelConsumption = instantFuelConsumption;
+       msg.externalTemperature = externalTemperature;
+       msg.prndl = prndl;
+       msg.tirePressure = tirePressure;
+       msg.odometer = odometer;
+       msg.beltStatus = beltStatus;
+       msg.bodyInformation = bodyInformation;
+       msg.deviceStatus = deviceStatus;
+    msg.driverBraking = driverBraking;
+    msg.wiperStatus = wiperStatus;
+    msg.headLampStatus = headLampStatus;
+    msg.engineTorque = engineTorque;
+    msg.accPedalPosition = accPedalPosition;
+    msg.steeringWheelAngle = steeringWheelAngle;
+       msg.correlationID = correlationID;
+       
+       return msg;
+}
+
++(SDLUnregisterAppInterface*) buildUnregisterAppInterfaceWithCorrelationID:(NSNumber*) correlationID  {
+       
+    SDLUnregisterAppInterface* msg = [[[SDLUnregisterAppInterface alloc] init] autorelease];
+       msg.correlationID = correlationID;
+       
+    return msg;
+}
+
++(SDLUnsubscribeButton*) buildUnsubscribeButtonWithName:(SDLButtonName*) buttonName correlationID:(NSNumber*) correlationID {
+       
+    SDLUnsubscribeButton *msg = [[[SDLUnsubscribeButton alloc] init] autorelease];
+       msg.buttonName = buttonName;
+       msg.correlationID = correlationID;
+       
+       return msg;
+}
+
++(SDLUnsubscribeVehicleData*) buildUnsubscribeVehicleDataWithGPS:(NSNumber*) gps speed:(NSNumber*) speed rpm:(NSNumber*) rpm fuelLevel:(NSNumber*) fuelLevel fuelLevelState:(NSNumber*) fuelLevelState instantFuelConsumption:(NSNumber*) instantFuelConsumption externalTemperature:(NSNumber*) externalTemperature prndl:(NSNumber*) prndl tirePressure:(NSNumber*) tirePressure odometer:(NSNumber*) odometer beltStatus:(NSNumber*) beltStatus bodyInformation:(NSNumber*) bodyInformation deviceStatus:(NSNumber*) deviceStatus driverBraking:(NSNumber*) driverBraking wiperStatus:(NSNumber*) wiperStatus headLampStatus:(NSNumber*) headLampStatus engineTorque:(NSNumber*) engineTorque accPedalPosition:(NSNumber*) accPedalPosition steeringWheelAngle:(NSNumber*) steeringWheelAngle correlationID:(NSNumber*) correlationID {
+       
+    SDLUnsubscribeVehicleData* msg = [[[SDLUnsubscribeVehicleData alloc] init] autorelease];
+    msg.gps = gps;
+       msg.speed = speed;
+       msg.rpm = rpm;
+       msg.fuelLevel = fuelLevel;
+       msg.fuelLevelState = fuelLevelState;
+       msg.instantFuelConsumption = instantFuelConsumption;
+       msg.externalTemperature = externalTemperature;
+       msg.prndl = prndl;
+       msg.tirePressure = tirePressure;
+       msg.odometer = odometer;
+       msg.beltStatus = beltStatus;
+       msg.bodyInformation = bodyInformation;
+       msg.deviceStatus = deviceStatus;
+    msg.driverBraking = driverBraking;
+    msg.wiperStatus = wiperStatus;
+    msg.headLampStatus = headLampStatus;
+    msg.engineTorque = engineTorque;
+    msg.accPedalPosition = accPedalPosition;
+    msg.steeringWheelAngle = steeringWheelAngle;
+       msg.correlationID = correlationID;
+       
+       return msg;
+}
+
++(SDLUpdateTurnList*) buildUpdateTurnList:(NSArray*) turnList softButtons:(NSArray*) softButtons correlationID:(NSNumber*) correlationID {
+    
+    SDLUpdateTurnList* msg = [[[SDLUpdateTurnList alloc] init] autorelease];
+    msg.turnList = [[turnList mutableCopy] autorelease];
+    msg.softButtons = [[softButtons mutableCopy] autorelease];
+    msg.correlationID = correlationID;
+    
+    return msg;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCResponse.h
similarity index 59%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCResponse.h
index 7f7f94c..7998fd7 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCResponse.h
@@ -1,10 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLRPCResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCMessage.h"
-#import "RPC/SDLResult.h"
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLResult.h>
 
 @interface SDLRPCResponse : SDLRPCMessage {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCResponse.m
similarity index 89%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCResponse.m
index a02b74b..73fea5e 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRPCResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLRPCResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLRPCResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLRPCResponse
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLReadDID.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLReadDID.h
new file mode 100644 (file)
index 0000000..8810490
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLReadDID.h
@@ -0,0 +1,16 @@
+//  SDLReadDID.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+@interface SDLReadDID : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* ecuName;
+@property(assign) NSMutableArray* didLocation;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLReadDID.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLReadDID.m
new file mode 100644 (file)
index 0000000..f6db3ed
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLReadDID.m
@@ -0,0 +1,55 @@
+//  SDLReadDID.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLReadDID.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLReadDID
+
+-(id) init {
+    if (self = [super initWithName:NAMES_ReadDID]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setEcuName:(NSNumber *) ecuName {
+    if (ecuName != nil) {
+        [parameters setObject:ecuName forKey:NAMES_ecuName];
+    } else {
+        [parameters removeObjectForKey:NAMES_ecuName];
+    }
+}
+
+-(NSNumber*) ecuName {
+    return [parameters objectForKey:NAMES_ecuName];
+}
+
+-(void) setDidLocation:(NSMutableArray*) didLocation {
+    if (didLocation != nil) {
+        [parameters setObject:didLocation forKey:NAMES_didLocation];
+    } else {
+        [parameters removeObjectForKey:NAMES_didLocation];
+    }
+}
+
+-(NSMutableArray*) didLocation {
+    NSMutableArray* array = [parameters objectForKey:NAMES_didLocation];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:NSNumber.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSNumber* enumNumber in array) {
+            [newList addObject:enumNumber];
+        }
+        return newList;
+    }
+}
+
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLReadDIDResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLReadDIDResponse.h
new file mode 100644 (file)
index 0000000..04bf83d
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLReadDIDResponse.h
@@ -0,0 +1,17 @@
+//  SDLReadDIDResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+#import <SmartDeviceLink/SDLDIDResult.h>
+
+@interface SDLReadDIDResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLDIDResult* didResult;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLReadDIDResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLReadDIDResponse.m
new file mode 100644 (file)
index 0000000..0c81776
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLReadDIDResponse.m
@@ -0,0 +1,43 @@
+//  SDLReadDIDResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLReadDIDResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLReadDIDResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_ReadDID]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setDidResult:(NSMutableArray*) didResult {
+    if (didResult != nil) {
+        [parameters setObject:didResult forKey:NAMES_didResult];
+    } else {
+        [parameters removeObjectForKey:NAMES_didResult];
+    }
+}
+
+-(NSMutableArray*) didResult {
+    NSMutableArray* array = [parameters objectForKey:NAMES_didResult];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLDIDResult.class]) {
+        return array;
+    } else { 
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSString* enumString in array) {
+            [newList addObject:enumString];
+        }
+        return newList;
+    }
+}
+
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRegisterAppInterface.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRegisterAppInterface.h
new file mode 100644 (file)
index 0000000..b8bf574
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRegisterAppInterface.h
@@ -0,0 +1,27 @@
+//  SDLRegisterAppInterface.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+#import <SmartDeviceLink/SDLLanguage.h>
+#import <SmartDeviceLink/SDLSyncMsgVersion.h>
+
+@interface SDLRegisterAppInterface : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLSyncMsgVersion* syncMsgVersion;
+@property(assign) NSString* appName;
+@property(assign) NSMutableArray* ttsName;
+@property(assign) NSString* ngnMediaScreenAppName;
+@property(assign) NSMutableArray* vrSynonyms;
+@property(assign) NSNumber* isMediaApplication;
+@property(assign) SDLLanguage* languageDesired;
+@property(assign) SDLLanguage* hmiDisplayLanguageDesired;
+@property(assign) NSMutableArray* appHMIType;
+@property(assign) NSString* appID;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRegisterAppInterface.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRegisterAppInterface.m
new file mode 100644 (file)
index 0000000..027bc36
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRegisterAppInterface.m
@@ -0,0 +1,176 @@
+//  SDLRegisterAppInterface.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLRegisterAppInterface.h>
+
+#import <SmartDeviceLink/SDLAppHMIType.h>
+#import <SmartDeviceLink/SDLNames.h>
+#import <SmartDeviceLink/SDLTTSChunk.h>
+
+@implementation SDLRegisterAppInterface
+
+-(id) init {
+    if (self = [super initWithName:NAMES_RegisterAppInterface]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setSyncMsgVersion:(SDLSyncMsgVersion*) syncMsgVersion {
+    if (syncMsgVersion != nil) {
+        [parameters setObject:syncMsgVersion forKey:NAMES_syncMsgVersion];
+    } else {
+        [parameters removeObjectForKey:NAMES_syncMsgVersion];
+    }
+}
+
+-(SDLSyncMsgVersion*) syncMsgVersion {
+    NSObject* obj = [parameters objectForKey:NAMES_syncMsgVersion];
+    if ([obj isKindOfClass:SDLSyncMsgVersion.class]) {
+        return (SDLSyncMsgVersion*)obj;
+    } else {
+        return [[[SDLSyncMsgVersion alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setAppName:(NSString*) appName {
+    if (appName != nil) {
+        [parameters setObject:appName forKey:NAMES_appName];
+    } else {
+        [parameters removeObjectForKey:NAMES_appName];
+    }
+}
+
+-(NSString*) appName {
+    return [parameters objectForKey:NAMES_appName];
+}
+
+-(void) setTtsName:(NSMutableArray *) ttsName {
+    if (ttsName != nil) {
+        [parameters setObject:ttsName forKey:NAMES_ttsName];
+    } else {
+        [parameters removeObjectForKey:NAMES_ttsName];
+    }
+}
+
+-(NSMutableArray*) ttsName {
+    NSMutableArray* array = [parameters objectForKey:NAMES_ttsName];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
+-(void) setNgnMediaScreenAppName:(NSString*) ngnMediaScreenAppName {
+    if (ngnMediaScreenAppName != nil) {
+        [parameters setObject:ngnMediaScreenAppName forKey:NAMES_ngnMediaScreenAppName];
+    } else {
+        [parameters removeObjectForKey:NAMES_ngnMediaScreenAppName];
+    }
+}
+
+-(NSString*) ngnMediaScreenAppName {
+    return [parameters objectForKey:NAMES_ngnMediaScreenAppName];
+}
+
+-(void) setVrSynonyms:(NSMutableArray*) vrSynonyms {
+    if (vrSynonyms != nil) {
+        [parameters setObject:vrSynonyms forKey:NAMES_vrSynonyms];
+    } else {
+        [parameters removeObjectForKey:NAMES_vrSynonyms];
+    }
+}
+
+-(NSMutableArray*) vrSynonyms { 
+    return [parameters objectForKey:NAMES_vrSynonyms];
+}
+
+-(void) setIsMediaApplication:(NSNumber*) isMediaApplication {
+    if (isMediaApplication != nil) {
+        [parameters setObject:isMediaApplication forKey:NAMES_isMediaApplication];
+    } else {
+        [parameters removeObjectForKey:NAMES_isMediaApplication];
+    }
+}
+
+-(NSNumber*) isMediaApplication {
+    return [parameters objectForKey:NAMES_isMediaApplication];
+}
+
+-(void) setLanguageDesired:(SDLLanguage*) languageDesired {
+    if (languageDesired != nil) {
+        [parameters setObject:languageDesired forKey:NAMES_languageDesired];
+    } else {
+        [parameters removeObjectForKey:NAMES_languageDesired];
+    }
+}
+
+-(SDLLanguage*) languageDesired {
+    NSObject* obj = [parameters objectForKey:NAMES_languageDesired];
+    if ([obj isKindOfClass:SDLLanguage.class]) {
+        return (SDLLanguage*)obj;
+    } else { 
+        return [SDLLanguage valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setHmiDisplayLanguageDesired:(SDLLanguage*) hmiDisplayLanguageDesired {
+    if (hmiDisplayLanguageDesired != nil) {
+        [parameters setObject:hmiDisplayLanguageDesired forKey:NAMES_hmiDisplayLanguageDesired];
+    } else {
+        [parameters removeObjectForKey:NAMES_hmiDisplayLanguageDesired];
+    }
+}
+
+-(SDLLanguage*) hmiDisplayLanguageDesired {
+    NSObject* obj = [parameters objectForKey:NAMES_hmiDisplayLanguageDesired];
+    if ([obj isKindOfClass:SDLLanguage.class]) {
+        return (SDLLanguage*)obj;
+    } else {
+        return [SDLLanguage valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setAppHMIType:(NSMutableArray *) appHMIType {
+    if (appHMIType != nil) {
+        [parameters setObject:appHMIType forKey:NAMES_appHMIType];
+    } else {
+        [parameters removeObjectForKey:NAMES_appHMIType];
+    }
+}
+
+-(NSMutableArray*) appHMIType {
+    NSMutableArray* array = [parameters objectForKey:NAMES_appHMIType];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLAppHMIType.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSString* enumString in array) {
+            [newList addObject:[SDLAppHMIType valueOf:enumString]];
+        }
+        return newList;
+    }
+}
+
+-(void) setAppID:(NSString*) appID {
+    if (appID != nil) {
+        [parameters setObject:appID forKey:NAMES_appID];
+    } else {
+        [parameters removeObjectForKey:NAMES_appID];
+    }
+}
+
+-(NSString*) appID {
+    return [parameters objectForKey:NAMES_appID];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h
new file mode 100644 (file)
index 0000000..efea1a1
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h
@@ -0,0 +1,33 @@
+//  SDLRegisterAppInterfaceResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+#import <SmartDeviceLink/SDLDisplayCapabilities.h>
+#import <SmartDeviceLink/SDLLanguage.h>
+#import <SmartDeviceLink/SDLPresetBankCapabilities.h>
+#import <SmartDeviceLink/SDLSyncMsgVersion.h>
+#import <SmartDeviceLink/SDLVehicleType.h>
+
+@interface SDLRegisterAppInterfaceResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLSyncMsgVersion* syncMsgVersion;
+@property(assign) SDLLanguage* language;
+@property(assign) SDLLanguage* hmiDisplayLanguage;
+@property(assign) SDLDisplayCapabilities* displayCapabilities;
+@property(assign) NSMutableArray* buttonCapabilities;
+@property(assign) NSMutableArray* softButtonCapabilities;
+@property(assign) SDLPresetBankCapabilities* presetBankCapabilities;
+@property(assign) NSMutableArray* hmiZoneCapabilities;
+@property(assign) NSMutableArray* speechCapabilities;
+@property(assign) NSMutableArray* vrCapabilities;
+@property(assign) NSMutableArray* audioPassThruCapabilities;
+@property(assign) SDLVehicleType* vehicleType;
+
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLRegisterAppInterfaceResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
similarity index 52%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLRegisterAppInterfaceResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
index 9a6d640..8587ea9 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLRegisterAppInterfaceResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
@@ -1,9 +1,16 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLRegisterAppInterfaceResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLRegisterAppInterfaceResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLRegisterAppInterfaceResponse.h>
+
+#import <SmartDeviceLink/SDLAudioPassThruCapabilities.h>
+#import <SmartDeviceLink/SDLButtonCapabilities.h>
+#import <SmartDeviceLink/SDLHMIZoneCapabilities.h>
+#import <SmartDeviceLink/SDLNames.h>
+#import <SmartDeviceLink/SDLSpeechCapabilities.h>
+#import <SmartDeviceLink/SDLSoftButtonCapabilities.h>
+#import <SmartDeviceLink/SDLVrCapabilities.h>
 
 @implementation SDLRegisterAppInterfaceResponse
 
@@ -17,7 +24,7 @@
     return self;
 }
 
--(void) setSyncMsgVersion:(SDLMsgVersion*) syncMsgVersion {
+-(void) setSyncMsgVersion:(SDLSyncMsgVersion*) syncMsgVersion {
     if (syncMsgVersion != nil) {
         [parameters setObject:syncMsgVersion forKey:NAMES_syncMsgVersion];
     } else {
@@ -25,27 +32,15 @@
     }
 }
 
--(SDLMsgVersion*) syncMsgVersion {
+-(SDLSyncMsgVersion*) syncMsgVersion {
     NSObject* obj = [parameters objectForKey:NAMES_syncMsgVersion];
-    if ([obj isKindOfClass:SDLMsgVersion.class]) {
-        return (SDLMsgVersion*)obj;
+    if ([obj isKindOfClass:SDLSyncMsgVersion.class]) {
+        return (SDLSyncMsgVersion*)obj;
     } else {
-        return [[[SDLMsgVersion alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+        return [[[SDLSyncMsgVersion alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
     }
 }
 
--(void) setAutoActivateID:(NSString*) autoActivateID {
-    if (autoActivateID != nil) {
-        [parameters setObject:autoActivateID forKey:NAMES_autoActivateID];
-    } else {
-        [parameters removeObjectForKey:NAMES_autoActivateID];
-    }
-}
-
--(NSString*) autoActivateID {
-    return [parameters objectForKey:NAMES_autoActivateID];
-}
-
 -(void) setLanguage:(SDLLanguage*) language {
     if (language != nil) {
         [parameters setObject:language forKey:NAMES_language];
@@ -63,6 +58,23 @@
     }
 }
 
+-(void) setHmiDisplayLanguage:(SDLLanguage*) hmiDisplayLanguage {
+    if (hmiDisplayLanguage != nil) {
+        [parameters setObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage];
+    } else {
+        [parameters removeObjectForKey:NAMES_hmiDisplayLanguage];
+    }
+}
+
+-(SDLLanguage*) hmiDisplayLanguage {
+    NSObject* obj = [parameters objectForKey:NAMES_hmiDisplayLanguage];
+    if ([obj isKindOfClass:SDLLanguage.class]) {
+        return (SDLLanguage*)obj;
+    } else {
+        return [SDLLanguage valueOf:(NSString*)obj];
+    }
+}
+
 -(void) setDisplayCapabilities:(SDLDisplayCapabilities*) displayCapabilities {
     if (displayCapabilities != nil) {
         [parameters setObject:displayCapabilities forKey:NAMES_displayCapabilities];
@@ -101,6 +113,44 @@
     }
 }
 
+-(void) setSoftButtonCapabilities:(NSMutableArray*) softButtonCapabilities {
+    if (softButtonCapabilities != nil) {
+        [parameters setObject:softButtonCapabilities forKey:NAMES_softButtonCapabilities];
+    } else {
+        [parameters removeObjectForKey:NAMES_softButtonCapabilities];
+    }
+}
+
+-(NSMutableArray*) softButtonCapabilities {
+    NSMutableArray* array = [parameters objectForKey:NAMES_softButtonCapabilities];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButtonCapabilities.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLSoftButtonCapabilities alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
+-(void) setPresetBankCapabilities:(SDLPresetBankCapabilities*) presetBankCapabilities {
+    if (presetBankCapabilities != nil) {
+        [parameters setObject:presetBankCapabilities forKey:NAMES_presetBankCapabilities];
+    } else {
+        [parameters removeObjectForKey:NAMES_presetBankCapabilities];
+    }
+}
+
+-(SDLPresetBankCapabilities*) presetBankCapabilities {
+    NSObject* obj = [parameters objectForKey:NAMES_presetBankCapabilities];
+    if ([obj isKindOfClass:SDLPresetBankCapabilities.class]) {
+        return (SDLPresetBankCapabilities*)obj;
+    } else {
+        return [[[SDLPresetBankCapabilities alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
 -(void) setHmiZoneCapabilities:(NSMutableArray*) hmiZoneCapabilities {
     if (hmiZoneCapabilities != nil) {
         [parameters setObject:hmiZoneCapabilities forKey:NAMES_hmiZoneCapabilities];
@@ -153,15 +203,49 @@
 
 -(NSMutableArray*) vrCapabilities {
     NSMutableArray* array = [parameters objectForKey:NAMES_vrCapabilities];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRCapabilities.class]) {
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVrCapabilities.class]) {
         return array;
     } else { 
         NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
         for (NSString* enumString in array) {
-            [newList addObject:[SDLVRCapabilities valueOf:enumString]];
+            [newList addObject:[SDLVrCapabilities valueOf:enumString]];
         }
         return newList;
     }
 }
 
+-(void) setAudioPassThruCapabilities:(NSMutableArray *) audioPassThruCapabilities {
+    if (audioPassThruCapabilities != nil) {
+        [parameters setObject:audioPassThruCapabilities forKey:NAMES_audioPassThruCapabilities];
+    } else {
+        [parameters removeObjectForKey:NAMES_audioPassThruCapabilities];
+    }
+}
+
+-(SDLAudioPassThruCapabilities*) audioPassThruCapabilities {
+    NSObject* obj = [parameters objectForKey:NAMES_audioPassThruCapabilities];
+    if ([obj isKindOfClass:SDLAudioPassThruCapabilities.class]) {
+        return (SDLAudioPassThruCapabilities*)obj;
+    } else {
+        return [[[SDLAudioPassThruCapabilities alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setVehicleType:(SDLVehicleType *) vehicleType {
+    if (vehicleType != nil) {
+        [parameters setObject:vehicleType forKey:NAMES_vehicleType];
+    } else {
+        [parameters removeObjectForKey:NAMES_vehicleType];
+    }
+}
+
+-(SDLVehicleType*) vehicleType {
+    NSObject* obj = [parameters objectForKey:NAMES_vehicleType];
+    if ([obj isKindOfClass:SDLVehicleType.class]) {
+        return (SDLVehicleType*)obj;
+    } else {
+        return [[[SDLVehicleType alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResetGlobalProperties.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResetGlobalProperties.h
similarity index 53%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResetGlobalProperties.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResetGlobalProperties.h
index 2a542be..185d95e 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResetGlobalProperties.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResetGlobalProperties.h
@@ -1,11 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLResetGlobalProperties.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
-#import "SDLGlobalProperty.h"
+#import <SmartDeviceLink/SDLGlobalProperty.h>
 
 @interface SDLResetGlobalProperties : SDLRPCRequest {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResetGlobalProperties.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResetGlobalProperties.m
similarity index 84%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResetGlobalProperties.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResetGlobalProperties.m
index fa4757d..36e9154 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResetGlobalProperties.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResetGlobalProperties.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLResetGlobalProperties.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLResetGlobalProperties.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLResetGlobalProperties.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLResetGlobalProperties
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResetGlobalPropertiesResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResetGlobalPropertiesResponse.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResetGlobalPropertiesResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResetGlobalPropertiesResponse.h
index a714fd5..dbb54da 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResetGlobalPropertiesResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResetGlobalPropertiesResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLResetGlobalPropertiesResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLResetGlobalPropertiesResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResetGlobalPropertiesResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
similarity index 58%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResetGlobalPropertiesResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
index 8cf3e30..41d14cc 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResetGlobalPropertiesResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLResetGlobalPropertiesResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLResetGlobalPropertiesResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLResetGlobalPropertiesResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLResetGlobalPropertiesResponse
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResult.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResult.h
similarity index 69%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResult.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResult.h
index 8c357e2..6ade634 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResult.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResult.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLResult.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLResult : SDLEnum {}
 
@@ -23,14 +23,20 @@
 +(SDLResult*) WRONG_LANGUAGE;
 +(SDLResult*) APPLICATION_NOT_REGISTERED;
 +(SDLResult*) IN_USE;
-+(SDLResult*) SUBSCRIBED_ALREADY;
 +(SDLResult*) VEHICLE_DATA_NOT_ALLOWED;
 +(SDLResult*) VEHICLE_DATA_NOT_AVAILABLE;
 +(SDLResult*) REJECTED;
 +(SDLResult*) ABORTED;
 +(SDLResult*) IGNORED;
-+(SDLResult*) UNSUPPORTED_BUTTON;
++(SDLResult*) UNSUPPORTED_RESOURCE;
 +(SDLResult*) FILE_NOT_FOUND;
 +(SDLResult*) GENERIC_ERROR;
++(SDLResult*) DISALLOWED;
++(SDLResult*) USER_DISALLOWED;
++(SDLResult*) TIMED_OUT;
++(SDLResult*) CANCEL_ROUTE;
++(SDLResult*) TRUNCATED_DATA;
++(SDLResult*) RETRY;
++(SDLResult*) WARNINGS;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResult.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResult.m
similarity index 74%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResult.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResult.m
index 0957964..ec869cf 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLResult.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLResult.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLResult.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLResult.h>
 
 SDLResult* SDLResult_SUCCESS = nil;
 SDLResult* SDLResult_INVALID_DATA = nil;
@@ -17,15 +17,21 @@ SDLResult* SDLResult_UNSUPPORTED_VERSION = nil;
 SDLResult* SDLResult_WRONG_LANGUAGE = nil;
 SDLResult* SDLResult_APPLICATION_NOT_REGISTERED = nil;
 SDLResult* SDLResult_IN_USE = nil;
-SDLResult* SDLResult_SUBSCRIBED_ALREADY = nil;
 SDLResult* SDLResult_VEHICLE_DATA_NOT_ALLOWED = nil;
 SDLResult* SDLResult_VEHICLE_DATA_NOT_AVAILABLE = nil;
 SDLResult* SDLResult_REJECTED = nil;
 SDLResult* SDLResult_ABORTED = nil;
 SDLResult* SDLResult_IGNORED = nil;
-SDLResult* SDLResult_UNSUPPORTED_BUTTON = nil;
+SDLResult* SDLResult_UNSUPPORTED_RESOURCE = nil;
 SDLResult* SDLResult_FILE_NOT_FOUND = nil;
 SDLResult* SDLResult_GENERIC_ERROR = nil;
+SDLResult* SDLResult_DISALLOWED = nil;
+SDLResult* SDLResult_USER_DISALLOWED = nil;
+SDLResult* SDLResult_TIMED_OUT = nil;
+SDLResult* SDLResult_CANCEL_ROUTE = nil;
+SDLResult* SDLResult_TRUNCATED_DATA = nil;
+SDLResult* SDLResult_RETRY = nil;
+SDLResult* SDLResult_WARNINGS = nil;
 
 NSMutableArray* SDLResult_values = nil;
 @implementation SDLResult
@@ -55,15 +61,21 @@ NSMutableArray* SDLResult_values = nil;
                 SDLResult.WRONG_LANGUAGE,
                 SDLResult.APPLICATION_NOT_REGISTERED,
                 SDLResult.IN_USE,
-                SDLResult.SUBSCRIBED_ALREADY,
                 SDLResult.VEHICLE_DATA_NOT_ALLOWED,
                 SDLResult.VEHICLE_DATA_NOT_AVAILABLE,
                 SDLResult.REJECTED,
                 SDLResult.ABORTED,
                 SDLResult.IGNORED,
-                SDLResult.UNSUPPORTED_BUTTON,
+                SDLResult.UNSUPPORTED_RESOURCE,
                 SDLResult.FILE_NOT_FOUND,
                 SDLResult.GENERIC_ERROR,
+                SDLResult.DISALLOWED,
+                SDLResult.USER_DISALLOWED,
+                SDLResult.TIMED_OUT,
+                SDLResult.CANCEL_ROUTE,
+                SDLResult.TRUNCATED_DATA,
+                SDLResult.RETRY,
+                SDLResult.WARNINGS,
                 nil];
     }
     return SDLResult_values;
@@ -160,13 +172,6 @@ NSMutableArray* SDLResult_values = nil;
        return SDLResult_IN_USE;
 }
 
-+(SDLResult*) SUBSCRIBED_ALREADY {
-       if (SDLResult_SUBSCRIBED_ALREADY == nil) {
-                       SDLResult_SUBSCRIBED_ALREADY = [[SDLResult alloc] initWithValue:@"SUBSCRIBED_ALREADY"];
-       }
-       return SDLResult_SUBSCRIBED_ALREADY;
-}
-
 +(SDLResult*) VEHICLE_DATA_NOT_ALLOWED {
        if (SDLResult_VEHICLE_DATA_NOT_ALLOWED == nil) {
                        SDLResult_VEHICLE_DATA_NOT_ALLOWED = [[SDLResult alloc] initWithValue:@"VEHICLE_DATA_NOT_ALLOWED"];
@@ -202,11 +207,11 @@ NSMutableArray* SDLResult_values = nil;
        return SDLResult_IGNORED;
 }
 
-+(SDLResult*) UNSUPPORTED_BUTTON {
-       if (SDLResult_UNSUPPORTED_BUTTON == nil) {
-                       SDLResult_UNSUPPORTED_BUTTON = [[SDLResult alloc] initWithValue:@"UNSUPPORTED_BUTTON"];
++(SDLResult*) UNSUPPORTED_RESOURCE {
+       if (SDLResult_UNSUPPORTED_RESOURCE == nil) {
+                       SDLResult_UNSUPPORTED_RESOURCE = [[SDLResult alloc] initWithValue:@"UNSUPPORTED_RESOURCE"];
        }
-       return SDLResult_UNSUPPORTED_BUTTON;
+       return SDLResult_UNSUPPORTED_RESOURCE;
 }
 
 +(SDLResult*) FILE_NOT_FOUND {
@@ -223,4 +228,53 @@ NSMutableArray* SDLResult_values = nil;
        return SDLResult_GENERIC_ERROR;
 }
 
++(SDLResult*) DISALLOWED {
+    if (SDLResult_DISALLOWED == nil) {
+        SDLResult_DISALLOWED = [[SDLResult alloc] initWithValue:@"DISALLOWED"];
+    }
+    return SDLResult_DISALLOWED;
+}
+
++(SDLResult*) USER_DISALLOWED {
+    if (SDLResult_USER_DISALLOWED == nil) {
+        SDLResult_USER_DISALLOWED = [[SDLResult alloc] initWithValue:@"USER_DISALLOWED"];
+    }
+    return SDLResult_USER_DISALLOWED;
+}
+
++(SDLResult*) TIMED_OUT {
+    if (SDLResult_TIMED_OUT == nil) {
+        SDLResult_TIMED_OUT = [[SDLResult alloc] initWithValue:@"TIMED_OUT"];
+    }
+    return SDLResult_TIMED_OUT;
+}
+
++(SDLResult*) CANCEL_ROUTE {
+    if (SDLResult_CANCEL_ROUTE == nil) {
+        SDLResult_CANCEL_ROUTE = [[SDLResult alloc] initWithValue:@"CANCEL_ROUTE"];
+    }
+    return SDLResult_CANCEL_ROUTE;
+}
+
++(SDLResult*) TRUNCATED_DATA {
+    if (SDLResult_TRUNCATED_DATA == nil) {
+        SDLResult_TRUNCATED_DATA = [[SDLResult alloc] initWithValue:@"TRUNCATED_DATA"];
+    }
+    return SDLResult_TRUNCATED_DATA;
+}
+
++(SDLResult*) RETRY {
+    if (SDLResult_RETRY == nil) {
+        SDLResult_RETRY = [[SDLResult alloc] initWithValue:@"RETRY"];
+    }
+    return SDLResult_RETRY;
+}
+
++(SDLResult*) WARNINGS {
+    if (SDLResult_WARNINGS == nil) {
+        SDLResult_WARNINGS = [[SDLResult alloc] initWithValue:@"WARNINGS"];
+    }
+    return SDLResult_WARNINGS;
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSamplingRate.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSamplingRate.h
new file mode 100644 (file)
index 0000000..847ae68
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSamplingRate.h
@@ -0,0 +1,18 @@
+//  SDLSamplingRate.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLSamplingRate : SDLEnum {}
+
++(SDLSamplingRate*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLSamplingRate*) _8KHZ;
++(SDLSamplingRate*) _16KHZ;
++(SDLSamplingRate*) _22KHZ;
++(SDLSamplingRate*) _44KHZ;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSamplingRate.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSamplingRate.m
new file mode 100644 (file)
index 0000000..3e972ec
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSamplingRate.m
@@ -0,0 +1,64 @@
+//  SDLSamplingRate.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSamplingRate.h>
+
+SDLSamplingRate* SDLSamplingRate_8KHZ = nil;
+SDLSamplingRate* SDLSamplingRate_16KHZ = nil;
+SDLSamplingRate* SDLSamplingRate_22KHZ = nil;
+SDLSamplingRate* SDLSamplingRate_44KHZ = nil;
+
+NSMutableArray* SDLSamplingRate_values = nil;
+@implementation SDLSamplingRate
+
++(SDLSamplingRate*) valueOf:(NSString*) value {
+    for (SDLSamplingRate* item in SDLSamplingRate.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLSamplingRate_values == nil) {
+        SDLSamplingRate_values = [[NSMutableArray alloc] initWithObjects:
+                SDLSamplingRate._8KHZ,
+                SDLSamplingRate._16KHZ,
+                SDLSamplingRate._22KHZ,
+                SDLSamplingRate._44KHZ,
+                nil];
+    }
+    return SDLSamplingRate_values;
+}
+
++(SDLSamplingRate*) _8KHZ {
+       if (SDLSamplingRate_8KHZ == nil) {
+                       SDLSamplingRate_8KHZ = [[SDLSamplingRate alloc] initWithValue:@"8KHZ"];
+       }
+       return SDLSamplingRate_8KHZ;
+}
+
++(SDLSamplingRate*) _16KHZ {
+    if (SDLSamplingRate_16KHZ == nil) {
+        SDLSamplingRate_16KHZ = [[SDLSamplingRate alloc] initWithValue:@"16KHZ"];
+    }
+    return SDLSamplingRate_16KHZ;
+}
+
++(SDLSamplingRate*) _22KHZ {
+    if (SDLSamplingRate_22KHZ == nil) {
+        SDLSamplingRate_22KHZ = [[SDLSamplingRate alloc] initWithValue:@"22KHZ"];
+    }
+    return SDLSamplingRate_22KHZ;
+}
+
++(SDLSamplingRate*) _44KHZ {
+    if (SDLSamplingRate_44KHZ == nil) {
+        SDLSamplingRate_44KHZ = [[SDLSamplingRate alloc] initWithValue:@"44KHZ"];
+    }
+    return SDLSamplingRate_44KHZ;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLScrollableMessage.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLScrollableMessage.h
new file mode 100644 (file)
index 0000000..ff2a248
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLScrollableMessage.h
@@ -0,0 +1,17 @@
+//  SDLScrollableMessage.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+@interface SDLScrollableMessage : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSString* scrollableMessageBody;
+@property(assign) NSNumber* timeout;
+@property(assign) NSMutableArray* softButtons;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLScrollableMessage.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLScrollableMessage.m
new file mode 100644 (file)
index 0000000..321cff3
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLScrollableMessage.m
@@ -0,0 +1,67 @@
+//  SDLScrollableMessage.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLScrollableMessage.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+#import <SmartDeviceLink/SDLSoftButton.h>
+
+@implementation SDLScrollableMessage
+
+-(id) init {
+    if (self = [super initWithName:NAMES_ScrollableMessage]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setScrollableMessageBody:(NSString *) scrollableMessageBody {
+    if (scrollableMessageBody != nil) {
+        [parameters setObject:scrollableMessageBody forKey:NAMES_scrollableMessageBody];
+    } else {
+        [parameters removeObjectForKey:NAMES_scrollableMessageBody];
+    }
+}
+
+-(NSString*) scrollableMessageBody {
+    return [parameters objectForKey:NAMES_scrollableMessageBody];
+}
+
+-(void) setTimeout:(NSNumber *) timeout {
+    if (timeout != nil) {
+        [parameters setObject:timeout forKey:NAMES_timeout];
+    } else {
+        [parameters removeObjectForKey:NAMES_timeout];
+    }
+}
+
+-(NSNumber*) timeout {
+    return [parameters objectForKey:NAMES_timeout];
+}
+
+-(void) setSoftButtons:(NSMutableArray *) softButtons {
+    if (softButtons != nil) {
+        [parameters setObject:softButtons forKey:NAMES_softButtons];
+    } else {
+        [parameters removeObjectForKey:NAMES_softButtons];
+    }
+}
+
+-(NSMutableArray*) softButtons {
+    NSMutableArray* array = [parameters objectForKey:NAMES_softButtons];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLScrollableMessageResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLScrollableMessageResponse.h
new file mode 100644 (file)
index 0000000..c814b07
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLScrollableMessageResponse.h
@@ -0,0 +1,13 @@
+//  SDLScrollableMessageResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLScrollableMessageResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLScrollableMessageResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLScrollableMessageResponse.m
new file mode 100644 (file)
index 0000000..a97947f
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLScrollableMessageResponse.m
@@ -0,0 +1,21 @@
+//  SDLScrollableMessageResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLScrollableMessageResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLScrollableMessageResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_ScrollableMessage]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetAppIcon.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetAppIcon.h
new file mode 100644 (file)
index 0000000..b4e2583
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetAppIcon.h
@@ -0,0 +1,15 @@
+//  SDLSetAppIcon.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+@interface SDLSetAppIcon : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSString* syncFileName;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetAppIcon.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetAppIcon.m
new file mode 100644 (file)
index 0000000..7163e59
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetAppIcon.m
@@ -0,0 +1,33 @@
+//  SDLSetAppIcon.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSetAppIcon.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSetAppIcon
+
+-(id) init {
+    if (self = [super initWithName:NAMES_SetAppIcon]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setSyncFileName:(NSString *) syncFileName {
+    if (syncFileName != nil) {
+        [parameters setObject:syncFileName forKey:NAMES_syncFileName];
+    } else {
+        [parameters removeObjectForKey:NAMES_syncFileName];
+    }
+}
+
+-(NSString*) syncFileName {
+    return [parameters objectForKey:NAMES_syncFileName];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetAppIconResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetAppIconResponse.h
new file mode 100644 (file)
index 0000000..ca9284e
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetAppIconResponse.h
@@ -0,0 +1,13 @@
+//  SDLSetAppIconResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLSetAppIconResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetAppIconResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetAppIconResponse.m
new file mode 100644 (file)
index 0000000..a92d8b9
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetAppIconResponse.m
@@ -0,0 +1,21 @@
+//  SDLSetAppIconResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSetAppIconResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSetAppIconResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_SetAppIcon]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetDisplayLayout.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetDisplayLayout.h
new file mode 100644 (file)
index 0000000..454dfd1
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetDisplayLayout.h
@@ -0,0 +1,15 @@
+//  SDLSetDisplayLayout.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+@interface SDLSetDisplayLayout : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSString* displayLayout;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetDisplayLayout.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetDisplayLayout.m
new file mode 100644 (file)
index 0000000..6224649
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetDisplayLayout.m
@@ -0,0 +1,33 @@
+//  SDLSetDisplayLayout.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSetDisplayLayout.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSetDisplayLayout
+
+-(id) init {
+    if (self = [super initWithName:NAMES_SetDisplayLayout]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setDisplayLayout:(NSString *) displayLayout {
+    if (displayLayout != nil) {
+        [parameters setObject:displayLayout forKey:NAMES_displayLayout];
+    } else {
+        [parameters removeObjectForKey:NAMES_displayLayout];
+    }
+}
+
+-(NSString*) displayLayout {
+    return [parameters objectForKey:NAMES_displayLayout];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetDisplayLayoutResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetDisplayLayoutResponse.h
new file mode 100644 (file)
index 0000000..3fd0459
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetDisplayLayoutResponse.h
@@ -0,0 +1,13 @@
+//  SDLSetDisplayLayoutResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLSetDisplayLayoutResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetDisplayLayoutResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
new file mode 100644 (file)
index 0000000..0ad95b9
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
@@ -0,0 +1,21 @@
+//  SDLSetDisplayLayoutResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSetDisplayLayoutResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSetDisplayLayoutResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_SetDisplayLayout]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetGlobalProperties.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetGlobalProperties.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetGlobalProperties.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetGlobalProperties.h
index 0f2455d..80e51c3 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetGlobalProperties.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetGlobalProperties.h
@@ -1,12 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSetGlobalProperties.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
-
-#import "SDLTTSChunk.h"
-#import "SDLTTSChunk.h"
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
 @interface SDLSetGlobalProperties : SDLRPCRequest {}
 
@@ -15,5 +12,7 @@
 
 @property(assign) NSMutableArray* helpPrompt;
 @property(assign) NSMutableArray* timeoutPrompt;
+@property(assign) NSString* vrHelpTitle;
+@property(assign) NSMutableArray* vrHelp;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetGlobalProperties.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetGlobalProperties.m
similarity index 57%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetGlobalProperties.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetGlobalProperties.m
index 3f55d02..4b2f6ef 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetGlobalProperties.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetGlobalProperties.m
@@ -1,9 +1,12 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSetGlobalProperties.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLSetGlobalProperties.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLSetGlobalProperties.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+#import <SmartDeviceLink/SDLTTSChunk.h>
+#import <SmartDeviceLink/SDLVrHelpItem.h>
 
 @implementation SDLSetGlobalProperties
 
@@ -59,4 +62,37 @@
     }
 }
 
+-(void) setVrHelpTitle:(NSString *) vrHelpTitle {
+    if (vrHelpTitle != nil) {
+        [parameters setObject:vrHelpTitle forKey:NAMES_vrHelpTitle];
+    } else {
+        [parameters removeObjectForKey:NAMES_vrHelpTitle];
+    }
+}
+
+-(NSString*) vrHelpTitle {
+    return [parameters objectForKey:NAMES_vrHelpTitle];
+}
+
+-(void) setVrHelp:(NSMutableArray *) vrHelp {
+    if (vrHelp != nil) {
+        [parameters setObject:vrHelp forKey:NAMES_vrHelp];
+    } else {
+        [parameters removeObjectForKey:NAMES_vrHelp];
+    }
+}
+
+-(NSMutableArray*) vrHelp {
+    NSMutableArray* array = [parameters objectForKey:NAMES_vrHelp];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVrHelpItem.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLVrHelpItem alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetGlobalPropertiesResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetGlobalPropertiesResponse.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetGlobalPropertiesResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetGlobalPropertiesResponse.h
index 07e3b6a..58eedcf 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetGlobalPropertiesResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetGlobalPropertiesResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSetGlobalPropertiesResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLSetGlobalPropertiesResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetGlobalPropertiesResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
similarity index 58%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetGlobalPropertiesResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
index 92ab8d2..f6e4a16 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetGlobalPropertiesResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSetGlobalPropertiesResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLSetGlobalPropertiesResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLSetGlobalPropertiesResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLSetGlobalPropertiesResponse
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetMediaClockTimer.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetMediaClockTimer.h
similarity index 53%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetMediaClockTimer.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetMediaClockTimer.h
index 9c3d19f..228b91c 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetMediaClockTimer.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetMediaClockTimer.h
@@ -1,12 +1,12 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSetMediaClockTimer.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
-#import "SDLStartTime.h"
-#import "SDLUpdateMode.h"
+#import <SmartDeviceLink/SDLStartTime.h>
+#import <SmartDeviceLink/SDLUpdateMode.h>
 
 @interface SDLSetMediaClockTimer : SDLRPCRequest {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetMediaClockTimer.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetMediaClockTimer.m
similarity index 87%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetMediaClockTimer.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetMediaClockTimer.m
index d845699..e311199 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetMediaClockTimer.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetMediaClockTimer.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSetMediaClockTimer.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLSetMediaClockTimer.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLSetMediaClockTimer.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLSetMediaClockTimer
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetMediaClockTimerResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetMediaClockTimerResponse.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetMediaClockTimerResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetMediaClockTimerResponse.h
index c5531dc..f0ba661 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetMediaClockTimerResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetMediaClockTimerResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSetMediaClockTimerResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLSetMediaClockTimerResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetMediaClockTimerResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
similarity index 58%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetMediaClockTimerResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
index 0989bd1..8230e55 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSetMediaClockTimerResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSetMediaClockTimerResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLSetMediaClockTimerResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLSetMediaClockTimerResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLSetMediaClockTimerResponse
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShow.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShow.h
new file mode 100644 (file)
index 0000000..63386a1
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShow.h
@@ -0,0 +1,29 @@
+//  SDLShow.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+#import <SmartDeviceLink/SDLImage.h>
+#import <SmartDeviceLink/SDLSoftButton.h>
+#import <SmartDeviceLink/SDLTextAlignment.h>
+
+@interface SDLShow : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSString* mainField1;
+@property(assign) NSString* mainField2;
+@property(assign) NSString* mainField3;
+@property(assign) NSString* mainField4;
+@property(assign) SDLTextAlignment* alignment;
+@property(assign) NSString* statusBar;
+@property(assign) NSString* mediaClock;
+@property(assign) NSString* mediaTrack;
+@property(assign) SDLImage* graphic;
+@property(assign) SDLSoftButton* softButtons;
+@property(assign) NSMutableArray* customPresets;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShow.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShow.m
new file mode 100644 (file)
index 0000000..b694488
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShow.m
@@ -0,0 +1,172 @@
+//  SDLShow.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLShow.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLShow
+
+-(id) init {
+    if (self = [super initWithName:NAMES_Show]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setMainField1:(NSString*) mainField1 {
+    if (mainField1 != nil) {
+        [parameters setObject:mainField1 forKey:NAMES_mainField1];
+    } else {
+        [parameters removeObjectForKey:NAMES_mainField1];
+    }
+}
+
+-(NSString*) mainField1 {
+    return [parameters objectForKey:NAMES_mainField1];
+}
+
+-(void) setMainField2:(NSString*) mainField2 {
+    if (mainField2 != nil) {
+        [parameters setObject:mainField2 forKey:NAMES_mainField2];
+    } else {
+        [parameters removeObjectForKey:NAMES_mainField2];
+    }
+}
+
+-(NSString*) mainField2 {
+    return [parameters objectForKey:NAMES_mainField2];
+}
+
+-(void) setMainField3:(NSString*) mainField3 {
+    if (mainField3 != nil) {
+        [parameters setObject:mainField3 forKey:NAMES_mainField3];
+    } else {
+        [parameters removeObjectForKey:NAMES_mainField3];
+    }
+}
+
+-(NSString*) mainField3 {
+    return [parameters objectForKey:NAMES_mainField3];
+}
+
+-(void) setMainField4:(NSString*) mainField4 {
+    if (mainField4 != nil) {
+        [parameters setObject:mainField4 forKey:NAMES_mainField4];
+    } else {
+        [parameters removeObjectForKey:NAMES_mainField4];
+    }
+}
+
+-(NSString*) mainField4 {
+    return [parameters objectForKey:NAMES_mainField4];
+}
+
+-(void) setAlignment:(SDLTextAlignment*) alignment {
+    if (alignment != nil) {
+        [parameters setObject:alignment forKey:NAMES_alignment];
+    } else {
+        [parameters removeObjectForKey:NAMES_alignment];
+    }
+}
+
+-(SDLTextAlignment*) alignment {
+    NSObject* obj = [parameters objectForKey:NAMES_alignment];
+    if ([obj isKindOfClass:SDLTextAlignment.class]) {
+        return (SDLTextAlignment*)obj;
+    } else { 
+        return [SDLTextAlignment valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setStatusBar:(NSString*) statusBar {
+    if (statusBar != nil) {
+        [parameters setObject:statusBar forKey:NAMES_statusBar];
+    } else {
+        [parameters removeObjectForKey:NAMES_statusBar];
+    }
+}
+
+-(NSString*) statusBar {
+    return [parameters objectForKey:NAMES_statusBar];
+}
+
+-(void) setMediaClock:(NSString*) mediaClock {
+    if (mediaClock != nil) {
+        [parameters setObject:mediaClock forKey:NAMES_mediaClock];
+    } else {
+        [parameters removeObjectForKey:NAMES_mediaClock];
+    }
+}
+
+-(NSString*) mediaClock {
+    return [parameters objectForKey:NAMES_mediaClock];
+}
+
+-(void) setMediaTrack:(NSString*) mediaTrack {
+    if (mediaTrack != nil) {
+        [parameters setObject:mediaTrack forKey:NAMES_mediaTrack];
+    } else {
+        [parameters removeObjectForKey:NAMES_mediaTrack];
+    }
+}
+
+-(NSString*) mediaTrack {
+    return [parameters objectForKey:NAMES_mediaTrack];
+}
+
+-(void) setGraphic:(SDLImage*) graphic {
+    if (graphic != nil) {
+        [parameters setObject:graphic forKey:NAMES_graphic];
+    } else {
+        [parameters removeObjectForKey:NAMES_graphic];
+    }
+}
+
+-(SDLImage*) graphic {
+    NSObject* obj = [parameters objectForKey:NAMES_graphic];
+    if ([obj isKindOfClass:SDLImage.class]) {
+        return (SDLImage*)obj;
+    } else {
+        return [[[SDLImage alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setSoftButtons:(NSMutableArray *) softButtons {
+    if (softButtons != nil) {
+        [parameters setObject:softButtons forKey:NAMES_softButtons];
+    } else {
+        [parameters removeObjectForKey:NAMES_softButtons];
+    }
+}
+
+-(NSMutableArray*) softButtons {
+    NSMutableArray* array = [parameters objectForKey:NAMES_softButtons];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
+-(void) setCustomPresets:(NSMutableArray*) customPresets {
+    if (customPresets != nil) {
+        [parameters setObject:customPresets forKey:NAMES_customPresets];
+    } else {
+        [parameters removeObjectForKey:NAMES_customPresets];
+    }
+}
+
+-(NSMutableArray*) customPresets {
+    return [parameters objectForKey:NAMES_customPresets];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowConstantTBT.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowConstantTBT.h
new file mode 100644 (file)
index 0000000..feaff3a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowConstantTBT.h
@@ -0,0 +1,25 @@
+//  SDLShowConstantTBT.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+#import <SmartDeviceLink/SDLImage.h>
+
+@interface SDLShowConstantTBT : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSString* navigationText1;
+@property(assign) NSString* navigationText2;
+@property(assign) NSString* eta;
+@property(assign) NSString* totalDistance;
+@property(assign) SDLImage* turnIcon;
+@property(assign) NSNumber* distanceToManeuver;
+@property(assign) NSNumber* distanceToManeuverScale;
+@property(assign) NSNumber* maneuverComplete;
+@property(assign) NSMutableArray* softButtons;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowConstantTBT.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowConstantTBT.m
new file mode 100644 (file)
index 0000000..86e4a11
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowConstantTBT.m
@@ -0,0 +1,144 @@
+//  SDLShowConstantTBT.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLShowConstantTBT.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+#import <SmartDeviceLink/SDLSoftButton.h>
+
+@implementation SDLShowConstantTBT
+
+-(id) init {
+    if (self = [super initWithName:NAMES_ShowConstantTBT]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setNavigationText1:(NSString *) navigationText1 {
+    if (navigationText1 != nil) {
+        [parameters setObject:navigationText1 forKey:NAMES_navigationText1];
+    } else {
+        [parameters removeObjectForKey:NAMES_navigationText1];
+    }
+}
+
+-(NSString*) navigationText1 {
+    return [parameters objectForKey:NAMES_navigationText1];
+}
+
+-(void) setNavigationText2:(NSString *) navigationText2 {
+    if (navigationText2 != nil) {
+        [parameters setObject:navigationText2 forKey:NAMES_navigationText2];
+    } else {
+        [parameters removeObjectForKey:NAMES_navigationText2];
+    }
+}
+
+-(NSString*) navigationText2 {
+    return [parameters objectForKey:NAMES_navigationText2];
+}
+
+-(void) setEta:(NSString *) eta {
+    if (eta != nil) {
+        [parameters setObject:eta forKey:NAMES_eta];
+    } else {
+        [parameters removeObjectForKey:NAMES_eta];
+    }
+}
+
+-(NSString*) eta {
+    return [parameters objectForKey:NAMES_eta];
+}
+
+-(void) setTotalDistance:(NSString *) totalDistance {
+    if (totalDistance != nil) {
+        [parameters setObject:totalDistance forKey:NAMES_totalDistance];
+    } else {
+        [parameters removeObjectForKey:NAMES_totalDistance];
+    }
+}
+
+-(NSString*) totalDistance {
+    return [parameters objectForKey:NAMES_totalDistance];
+}
+
+-(void) setTurnIcon:(SDLImage *) turnIcon {
+    if (turnIcon != nil) {
+        [parameters setObject:turnIcon forKey:NAMES_turnIcon];
+    } else {
+        [parameters removeObjectForKey:NAMES_turnIcon];
+    }
+}
+
+-(SDLImage*) turnIcon {
+    NSObject* obj = [parameters objectForKey:NAMES_turnIcon];
+    if ([obj isKindOfClass:SDLImage.class]) {
+        return (SDLImage*)obj;
+    } else {
+        return [[[SDLImage alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setDistanceToManeuver:(NSNumber *) distanceToManeuver {
+    if (distanceToManeuver != nil) {
+        [parameters setObject:distanceToManeuver forKey:NAMES_distanceToManeuver];
+    } else {
+        [parameters removeObjectForKey:NAMES_distanceToManeuver];
+    }
+}
+
+-(NSNumber*) distanceToManeuver {
+    return [parameters objectForKey:NAMES_distanceToManeuver];
+}
+
+-(void) setDistanceToManeuverScale:(NSNumber *) distanceToManeuverScale {
+    if (distanceToManeuverScale != nil) {
+        [parameters setObject:distanceToManeuverScale forKey:NAMES_distanceToManeuverScale];
+    } else {
+        [parameters removeObjectForKey:NAMES_distanceToManeuverScale];
+    }
+}
+
+-(NSNumber*) distanceToManeuverScale {
+    return [parameters objectForKey:NAMES_distanceToManeuverScale];
+}
+
+-(void) setManeuverComplete:(NSNumber *) maneuverComplete {
+    if (maneuverComplete != nil) {
+        [parameters setObject:maneuverComplete forKey:NAMES_maneuverComplete];
+    } else {
+        [parameters removeObjectForKey:NAMES_maneuverComplete];
+    }
+}
+
+-(NSNumber*) maneuverComplete {
+    return [parameters objectForKey:NAMES_maneuverComplete];
+}
+
+-(void) setSoftButtons:(NSMutableArray *) softButtons {
+    if (softButtons != nil) {
+        [parameters setObject:softButtons forKey:NAMES_softButtons];
+    } else {
+        [parameters removeObjectForKey:NAMES_softButtons];
+    }
+}
+
+-(NSMutableArray*) softButtons {
+    NSMutableArray* array = [parameters objectForKey:NAMES_softButtons];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowConstantTBTResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowConstantTBTResponse.h
new file mode 100644 (file)
index 0000000..f6cacc0
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowConstantTBTResponse.h
@@ -0,0 +1,13 @@
+//  SDLShowConstantTBTResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLShowConstantTBTResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowConstantTBTResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowConstantTBTResponse.m
new file mode 100644 (file)
index 0000000..70f6442
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowConstantTBTResponse.m
@@ -0,0 +1,21 @@
+//  SDLShowConstantTBTResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLShowConstantTBTResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLShowConstantTBTResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_ShowConstantTBT]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLShowResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowResponse.h
similarity index 55%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLShowResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowResponse.h
index 982f0cc..6937b0f 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLShowResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLShowResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLShowResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLShowResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowResponse.m
similarity index 60%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLShowResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowResponse.m
index 3286ce2..54b2b37 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLShowResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLShowResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLShowResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLShowResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLShowResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLShowResponse
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSingleTireStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSingleTireStatus.h
new file mode 100644 (file)
index 0000000..3f07c8c
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSingleTireStatus.h
@@ -0,0 +1,17 @@
+//  SDLSingleTireStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLComponentVolumeStatus.h>
+
+@interface SDLSingleTireStatus : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLComponentVolumeStatus* status;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSingleTireStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSingleTireStatus.m
new file mode 100644 (file)
index 0000000..feb83c7
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSingleTireStatus.m
@@ -0,0 +1,33 @@
+//  SDLSingleTireStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSingleTireStatus.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSingleTireStatus
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setStatus:(SDLComponentVolumeStatus*) status {
+    if (status != nil) {
+        [store setObject:status forKey:NAMES_status];
+    } else {
+        [store removeObjectForKey:NAMES_status];
+    }
+}
+
+-(NSNumber*) status {
+    return [store objectForKey:NAMES_status];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLSiphonServer.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSiphonServer.h
similarity index 86%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLSiphonServer.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSiphonServer.h
index 5fda733..c302184 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLSiphonServer.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSiphonServer.h
@@ -1,6 +1,6 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSiphonServer.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLSiphonServer.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSiphonServer.m
similarity index 98%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLSiphonServer.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSiphonServer.m
index a93ec25..0565a49 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLSiphonServer.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSiphonServer.m
@@ -1,20 +1,19 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSiphonServer.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
 /*******************************
- * 
  * Description:
  * This class opens a socket on port 7474.
  * The 'sendSiphonData' Function will
- * write to the socket that the Relay Sniffer is
+ * write to the socket that the Sync Relay Sniffer is
  * listening on.
- *
  ******************************/
 
 //#define ZERO_CONFIG //Uncomment when implementing zero-config.
 //#define DEBUG //Uncomment to have output to NSLog.
 
-#import "SDLSiphonServer.h"
+#import <SmartDeviceLink/SDLSiphonServer.h>
 #include <UIKit/UIKit.h>
 #include <CFNetwork/CFNetwork.h>
 #include <Foundation/Foundation.h>
@@ -23,7 +22,7 @@
 #include <sys/types.h>
 #include <string.h>
 #include <unistd.h>
-#import "SDLDebugTool.h"
+#import <SmartDeviceLink/SDLDebugTool.h>
 
 typedef enum {
     fromApp = 0x01

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSlider.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSlider.h
new file mode 100644 (file)
index 0000000..c791723
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSlider.h
@@ -0,0 +1,19 @@
+//  SDLSlider.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+@interface SDLSlider : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* numTicks;
+@property(assign) NSNumber* position;
+@property(assign) NSString* sliderHeader;
+@property(assign) NSMutableArray* sliderFooter;
+@property(assign) NSNumber* timeout;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSlider.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSlider.m
new file mode 100644 (file)
index 0000000..7e602d4
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSlider.m
@@ -0,0 +1,81 @@
+//  SDLSlider.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSlider.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSlider
+
+-(id) init {
+    if (self = [super initWithName:NAMES_Slider]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setNumTicks:(NSNumber*) numTicks {
+    if (numTicks != nil) {
+        [parameters setObject:numTicks forKey:NAMES_numTicks];
+    } else {
+        [parameters removeObjectForKey:NAMES_numTicks];
+    }
+}
+
+-(NSNumber*) numTicks {
+    return [parameters objectForKey:NAMES_numTicks];
+}
+
+-(void) setPosition:(NSNumber*) position {
+    if (position != nil) {
+        [parameters setObject:position forKey:NAMES_position];
+    } else {
+        [parameters removeObjectForKey:NAMES_position];
+    }
+}
+
+-(NSNumber*) position {
+    return [parameters objectForKey:NAMES_position];
+}
+
+-(void) setSliderHeader:(NSString*) sliderHeader {
+    if (sliderHeader != nil) {
+        [parameters setObject:sliderHeader forKey:NAMES_sliderHeader];
+    } else {
+        [parameters removeObjectForKey:NAMES_sliderHeader];
+    }
+}
+
+-(NSString*) sliderHeader {
+    return [parameters objectForKey:NAMES_sliderHeader];
+}
+
+-(void) setSliderFooter:(NSMutableArray*) sliderFooter {
+    if (sliderFooter != nil) {
+        [parameters setObject:sliderFooter forKey:NAMES_sliderFooter];
+    } else {
+        [parameters removeObjectForKey:NAMES_sliderFooter];
+    }
+}
+
+-(NSMutableArray*) sliderFooter {
+    return [parameters objectForKey:NAMES_sliderFooter];
+}
+
+-(void) setTimeout:(NSNumber*) timeout {
+    if (timeout != nil) {
+        [parameters setObject:timeout forKey:NAMES_timeout];
+    } else {
+        [parameters removeObjectForKey:NAMES_timeout];
+    }
+}
+
+-(NSNumber*) timeout {
+    return [parameters objectForKey:NAMES_timeout];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSliderResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSliderResponse.h
new file mode 100644 (file)
index 0000000..f12c612
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSliderResponse.h
@@ -0,0 +1,13 @@
+//  SDLSliderResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLSliderResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSliderResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSliderResponse.m
new file mode 100644 (file)
index 0000000..76133d6
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSliderResponse.m
@@ -0,0 +1,21 @@
+//  SDLSliderResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSliderResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSliderResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_Slider]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButton.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButton.h
new file mode 100644 (file)
index 0000000..fd077c3
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButton.h
@@ -0,0 +1,24 @@
+//  SDLSoftButton.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLSoftButtonType.h>
+#import <SmartDeviceLink/SDLImage.h>
+#import <SmartDeviceLink/SDLSystemAction.h>
+
+@interface SDLSoftButton : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLSoftButtonType* type;
+@property(assign) NSString* text;
+@property(assign) SDLImage* image;
+@property(assign) NSNumber* isHighlighted;
+@property(assign) NSNumber* softButtonID;
+@property(assign) SDLSystemAction* systemAction;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButton.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButton.m
new file mode 100644 (file)
index 0000000..039162f
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButton.m
@@ -0,0 +1,108 @@
+//  SDLSoftButton.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSoftButton.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSoftButton
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setType:(SDLSoftButtonType*) type {
+    if (type != nil) {
+        [store setObject:type forKey:NAMES_type];
+    } else {
+        [store removeObjectForKey:NAMES_type];
+    }
+}
+
+-(SDLSoftButtonType*) type {
+    NSObject* obj = [store objectForKey:NAMES_type];
+    if ([obj isKindOfClass:SDLSoftButtonType.class]) {
+        return (SDLSoftButtonType*)obj;
+    } else { 
+        return [SDLSoftButtonType valueOf:(NSString*)obj];
+    }
+}
+
+-(void) setText:(NSString *) text {
+    if (text != nil) {
+        [store setObject:text forKey:NAMES_text];
+    } else {
+        [store removeObjectForKey:NAMES_text];
+    }
+}
+
+-(NSString*) text {
+    return [store objectForKey:NAMES_text];
+}
+
+-(void) setImage:(SDLImage*) image {
+    if (image != nil) {
+        [store setObject:image forKey:NAMES_image];
+    } else {
+        [store removeObjectForKey:NAMES_image];
+    }
+}
+
+-(SDLImage*) image {
+    NSObject* obj = [store objectForKey:NAMES_image];
+    if ([obj isKindOfClass:SDLImage.class]) {
+        return (SDLImage*)obj;
+    } else {
+        return [[[SDLImage alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setIsHighlighted:(NSNumber *) isHighlighted {
+    if (isHighlighted != nil) {
+        [store setObject:isHighlighted forKey:NAMES_isHighlighted];
+    } else {
+        [store removeObjectForKey:NAMES_isHighlighted];
+    }
+}
+
+-(NSNumber*) isHighlighted {
+    return [store objectForKey:NAMES_isHighlighted];
+}
+
+-(void) setSoftButtonID:(NSNumber *) softButtonID {
+    if (softButtonID != nil) {
+        [store setObject:softButtonID forKey:NAMES_softButtonID];
+    } else {
+        [store removeObjectForKey:NAMES_softButtonID];
+    }
+}
+
+-(NSNumber*) softButtonID {
+    return [store objectForKey:NAMES_softButtonID];
+}
+
+-(void) setSystemAction:(SDLSystemAction*) systemAction {
+    if (systemAction != nil) {
+        [store setObject:systemAction forKey:NAMES_systemAction];
+    } else {
+        [store removeObjectForKey:NAMES_systemAction];
+    }
+}
+
+-(SDLSystemAction*) systemAction {
+    NSObject* obj = [store objectForKey:NAMES_systemAction];
+    if ([obj isKindOfClass:SDLSystemAction.class]) {
+        return (SDLSystemAction*)obj;
+    } else {
+        return [SDLSystemAction valueOf:(NSString*)obj];
+    }
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButtonCapabilities.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButtonCapabilities.h
new file mode 100644 (file)
index 0000000..de9eb2e
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButtonCapabilities.h
@@ -0,0 +1,18 @@
+//  SDLSoftButtonCapabilities.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+@interface SDLSoftButtonCapabilities : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* shortPressAvailable;
+@property(assign) NSNumber* longPressAvailable;
+@property(assign) NSNumber* upDownAvailable;
+@property(assign) NSNumber* imageSupported;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButtonCapabilities.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButtonCapabilities.m
new file mode 100644 (file)
index 0000000..1d5dd1f
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButtonCapabilities.m
@@ -0,0 +1,69 @@
+//  SDLSoftButtonCapabilities.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSoftButtonCapabilities.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSoftButtonCapabilities
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setShortPressAvailable:(NSNumber*) shortPressAvailable {
+    if (shortPressAvailable != nil) {
+        [store setObject:shortPressAvailable forKey:NAMES_shortPressAvailable];
+    } else {
+        [store removeObjectForKey:NAMES_shortPressAvailable];
+    }
+}
+
+-(NSNumber*) shortPressAvailable {
+    return [store objectForKey:NAMES_shortPressAvailable];
+}
+
+-(void) setLongPressAvailable:(NSNumber*) longPressAvailable {
+    if (longPressAvailable != nil) {
+        [store setObject:longPressAvailable forKey:NAMES_longPressAvailable];
+    } else {
+        [store removeObjectForKey:NAMES_longPressAvailable];
+    }
+}
+
+-(NSNumber*) longPressAvailable {
+    return [store objectForKey:NAMES_longPressAvailable];
+}
+
+-(void) setUpDownAvailable:(NSNumber*) upDownAvailable {
+    if (upDownAvailable != nil) {
+        [store setObject:upDownAvailable forKey:NAMES_upDownAvailable];
+    } else {
+        [store removeObjectForKey:NAMES_upDownAvailable];
+    }
+}
+
+-(NSNumber*) upDownAvailable {
+    return [store objectForKey:NAMES_upDownAvailable];
+}
+
+-(void) setImageSupported:(NSNumber*) imageSupported {
+    if (imageSupported != nil) {
+        [store setObject:imageSupported forKey:NAMES_imageSupported];
+    } else {
+        [store removeObjectForKey:NAMES_imageSupported];
+    }
+}
+
+-(NSNumber*) imageSupported {
+    return [store objectForKey:NAMES_imageSupported];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButtonType.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButtonType.h
new file mode 100644 (file)
index 0000000..a038599
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButtonType.h
@@ -0,0 +1,17 @@
+//  SDLSoftButtonType.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLSoftButtonType : SDLEnum {}
+
++(SDLSoftButtonType*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLSoftButtonType*) TEXT;
++(SDLSoftButtonType*) IMAGE;
++(SDLSoftButtonType*) BOTH;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButtonType.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButtonType.m
new file mode 100644 (file)
index 0000000..3daeee4
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSoftButtonType.m
@@ -0,0 +1,55 @@
+//  SDLSoftButtonType.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSoftButtonType.h>
+
+SDLSoftButtonType* SDLSoftButtonType_TEXT = nil;
+SDLSoftButtonType* SDLSoftButtonType_IMAGE = nil;
+SDLSoftButtonType* SDLSoftButtonType_BOTH = nil;
+
+NSMutableArray* SDLSoftButtonType_values = nil;
+@implementation SDLSoftButtonType
+
++(SDLSoftButtonType*) valueOf:(NSString*) value {
+    for (SDLSoftButtonType* item in SDLSoftButtonType.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLSoftButtonType_values == nil) {
+        SDLSoftButtonType_values = [[NSMutableArray alloc] initWithObjects:
+                SDLSoftButtonType.TEXT,
+                SDLSoftButtonType.IMAGE,
+                SDLSoftButtonType.BOTH,
+                nil];
+    }
+    return SDLSoftButtonType_values;
+}
+
++(SDLSoftButtonType*) TEXT {
+       if (SDLSoftButtonType_TEXT == nil) {
+                       SDLSoftButtonType_TEXT = [[SDLSoftButtonType alloc] initWithValue:@"TEXT"];
+       }
+       return SDLSoftButtonType_TEXT;
+}
+
++(SDLSoftButtonType*) IMAGE {
+       if (SDLSoftButtonType_IMAGE == nil) {
+                       SDLSoftButtonType_IMAGE = [[SDLSoftButtonType alloc] initWithValue:@"IMAGE"];
+       }
+       return SDLSoftButtonType_IMAGE;
+}
+
++(SDLSoftButtonType*) BOTH {
+    if (SDLSoftButtonType_BOTH == nil) {
+        SDLSoftButtonType_BOTH = [[SDLSoftButtonType alloc] initWithValue:@"BOTH"];
+    }
+    return SDLSoftButtonType_BOTH;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeak.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeak.h
similarity index 61%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeak.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeak.h
index 1a83261..4827938 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeak.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeak.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSpeak.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
-
-#import "SDLTTSChunk.h"
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
 @interface SDLSpeak : SDLRPCRequest {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeak.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeak.m
similarity index 83%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeak.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeak.m
index 8cc3f0a..8443683 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeak.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeak.m
@@ -1,9 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSpeak.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLSpeak.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLSpeak.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+#import <SmartDeviceLink/SDLTTSChunk.h>
 
 @implementation SDLSpeak
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeakResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeakResponse.h
similarity index 55%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeakResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeakResponse.h
index f354d69..c975229 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeakResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeakResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSpeakResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLSpeakResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeakResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeakResponse.m
similarity index 60%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeakResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeakResponse.m
index cac9da1..557ef5b 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeakResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeakResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSpeakResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLSpeakResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLSpeakResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLSpeakResponse
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeechCapabilities.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeechCapabilities.h
similarity index 74%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeechCapabilities.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeechCapabilities.h
index 20af2a3..434a8e6 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeechCapabilities.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeechCapabilities.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSpeechCapabilities.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLSpeechCapabilities : SDLEnum {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeechCapabilities.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeechCapabilities.m
similarity index 94%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeechCapabilities.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeechCapabilities.m
index cfa0366..0449a36 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSpeechCapabilities.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSpeechCapabilities.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSpeechCapabilities.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLSpeechCapabilities.h"
+#import <SmartDeviceLink/SDLSpeechCapabilities.h>
 
 SDLSpeechCapabilities* SDLSpeechCapabilities_TEXT = nil;
 SDLSpeechCapabilities* SDLSpeechCapabilities_SAPI_PHONEMES = nil;

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLStartTime.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLStartTime.h
similarity index 67%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLStartTime.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLStartTime.h
index 30c7c75..9cedf88 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLStartTime.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLStartTime.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLStartTime.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCMessage.h"
+#import <SmartDeviceLink/SDLRPCMessage.h>
 
 @interface SDLStartTime : SDLRPCStruct {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLStartTime.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLStartTime.m
similarity index 86%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLStartTime.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLStartTime.m
index 78d8265..0422869 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLStartTime.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLStartTime.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLStartTime.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLStartTime.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLStartTime.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLStartTime
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSubscribeButton.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeButton.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSubscribeButton.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeButton.h
index 2446300..53fb53b 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSubscribeButton.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeButton.h
@@ -1,11 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSubscribeButton.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
-#import "SDLButtonName.h"
+#import <SmartDeviceLink/SDLButtonName.h>
 
 @interface SDLSubscribeButton : SDLRPCRequest {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSubscribeButton.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeButton.m
similarity index 81%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSubscribeButton.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeButton.m
index fa9fdf8..82ad8c5 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSubscribeButton.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeButton.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSubscribeButton.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLSubscribeButton.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLSubscribeButton.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLSubscribeButton
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSubscribeButtonResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeButtonResponse.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSubscribeButtonResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeButtonResponse.h
index 1fc3d2b..ab3267a 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSubscribeButtonResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeButtonResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSubscribeButtonResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLSubscribeButtonResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSubscribeButtonResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeButtonResponse.m
similarity index 59%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSubscribeButtonResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeButtonResponse.m
index ebeb318..4421206 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSubscribeButtonResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeButtonResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSubscribeButtonResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLSubscribeButtonResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLSubscribeButtonResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLSubscribeButtonResponse
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeVehicleData.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeVehicleData.h
new file mode 100644 (file)
index 0000000..6039293
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeVehicleData.h
@@ -0,0 +1,35 @@
+//  SDLSubscribeVehicleData.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+#import <SmartDeviceLink/SDLVehicleDataType.h>
+
+@interface SDLSubscribeVehicleData : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* gps;
+@property(assign) NSNumber* speed;
+@property(assign) NSNumber* rpm;
+@property(assign) NSNumber* fuelLevel;
+@property(assign) NSNumber* fuelLevelState;
+@property(assign) NSNumber* instantFuelConsumption;
+@property(assign) NSNumber* externalTemperature;
+@property(assign) NSNumber* prndl;
+@property(assign) NSNumber* tirePressure;
+@property(assign) NSNumber* odometer;
+@property(assign) NSNumber* beltStatus;
+@property(assign) NSNumber* bodyInformation;
+@property(assign) NSNumber* deviceStatus;
+@property(assign) NSNumber* driverBraking;
+@property(assign) NSNumber* wiperStatus;
+@property(assign) NSNumber* headLampStatus;
+@property(assign) NSNumber* engineTorque;
+@property(assign) NSNumber* accPedalPosition;
+@property(assign) NSNumber* steeringWheelAngle;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeVehicleData.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeVehicleData.m
new file mode 100644 (file)
index 0000000..b373b5e
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeVehicleData.m
@@ -0,0 +1,249 @@
+//  SDLSubscribeVehicleData.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSubscribeVehicleData.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSubscribeVehicleData
+
+-(id) init {
+    if (self = [super initWithName:NAMES_SubscribeVehicleData]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setGps:(NSNumber *) gps {
+    if (gps != nil) {
+        [parameters setObject:gps forKey:NAMES_gps];
+    } else {
+        [parameters removeObjectForKey:NAMES_gps];
+    }
+}
+
+-(NSNumber*) gps {
+    return [parameters objectForKey:NAMES_gps];
+}
+
+-(void) setSpeed:(NSNumber *) speed {
+    if (speed != nil) {
+        [parameters setObject:speed forKey:NAMES_speed];
+    } else {
+        [parameters removeObjectForKey:NAMES_speed];
+    }
+}
+
+-(NSNumber*) speed {
+    return [parameters objectForKey:NAMES_speed];
+}
+
+-(void) setRpm:(NSNumber *) rpm {
+    if (rpm != nil) {
+        [parameters setObject:rpm forKey:NAMES_rpm];
+    } else {
+        [parameters removeObjectForKey:NAMES_rpm];
+    }
+}
+
+-(NSNumber*) rpm {
+    return [parameters objectForKey:NAMES_rpm];
+}
+
+-(void) setFuelLevel:(NSNumber *) fuelLevel {
+    if (fuelLevel != nil) {
+        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevel];
+    }
+}
+
+-(NSNumber*) fuelLevel {
+    return [parameters objectForKey:NAMES_fuelLevel];
+}
+
+-(void) setFuelLevelState:(NSNumber *) fuelLevelState {
+    if (fuelLevelState != nil) {
+        [parameters setObject:fuelLevelState forKey:NAMES_fuelLevelState];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevelState];
+    }
+}
+
+-(NSNumber*) fuelLevelState {
+    return [parameters objectForKey:NAMES_fuelLevelState];
+}
+
+-(void) setInstantFuelConsumption:(NSNumber *) instantFuelConsumption {
+    if (instantFuelConsumption != nil) {
+        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+    } else {
+        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+    }
+}
+
+-(NSNumber*) instantFuelConsumption {
+    return [parameters objectForKey:NAMES_instantFuelConsumption];
+}
+
+-(void) setExternalTemperature:(NSNumber *) externalTemperature {
+    if (externalTemperature != nil) {
+        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+    } else {
+        [parameters removeObjectForKey:NAMES_externalTemperature];
+    }
+}
+
+-(NSNumber*) externalTemperature {
+    return [parameters objectForKey:NAMES_externalTemperature];
+}
+
+-(void) setPrndl:(NSNumber *) prndl {
+    if (prndl != nil) {
+        [parameters setObject:prndl forKey:NAMES_prndl];
+    } else {
+        [parameters removeObjectForKey:NAMES_prndl];
+    }
+}
+
+-(NSNumber*) prndl {
+    return [parameters objectForKey:NAMES_prndl];
+}
+
+-(void) setTirePressure:(NSNumber *) tirePressure {
+    if (tirePressure != nil) {
+        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+    } else {
+        [parameters removeObjectForKey:NAMES_tirePressure];
+    }
+}
+
+-(NSNumber*) tirePressure {
+    return [parameters objectForKey:NAMES_tirePressure];
+}
+
+-(void) setOdometer:(NSNumber *) odometer {
+    if (odometer != nil) {
+        [parameters setObject:odometer forKey:NAMES_odometer];
+    } else {
+        [parameters removeObjectForKey:NAMES_odometer];
+    }
+}
+
+-(NSNumber*) odometer {
+    return [parameters objectForKey:NAMES_odometer];
+}
+
+-(void) setBeltStatus:(NSNumber *) beltStatus {
+    if (beltStatus != nil) {
+        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_beltStatus];
+    }
+}
+
+-(NSNumber*) beltStatus {
+    return [parameters objectForKey:NAMES_beltStatus];
+}
+
+-(void) setBodyInformation:(NSNumber *) bodyInformation {
+    if (bodyInformation != nil) {
+        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+    } else {
+        [parameters removeObjectForKey:NAMES_bodyInformation];
+    }
+}
+
+-(NSNumber*) bodyInformation {
+    return [parameters objectForKey:NAMES_bodyInformation];
+}
+
+-(void) setDeviceStatus:(NSNumber *) deviceStatus {
+    if (deviceStatus != nil) {
+        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_deviceStatus];
+    }
+}
+
+-(NSNumber*) deviceStatus {
+    return [parameters objectForKey:NAMES_deviceStatus];
+}
+
+-(void) setDriverBraking:(NSNumber *) driverBraking {
+    if (driverBraking != nil) {
+        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+    } else {
+        [parameters removeObjectForKey:NAMES_driverBraking];
+    }
+}
+
+-(NSNumber*) driverBraking {
+    return [parameters objectForKey:NAMES_driverBraking];
+}
+
+-(void) setWiperStatus:(NSNumber *) wiperStatus {
+    if (wiperStatus != nil) {
+        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_wiperStatus];
+    }
+}
+
+-(NSNumber*) wiperStatus {
+    return [parameters objectForKey:NAMES_wiperStatus];
+}
+
+-(void) setHeadLampStatus:(NSNumber *) headLampStatus {
+    if (headLampStatus != nil) {
+        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_headLampStatus];
+    }
+}
+
+-(NSNumber*) headLampStatus {
+    return [parameters objectForKey:NAMES_headLampStatus];
+}
+
+-(void) setEngineTorque:(NSNumber *) engineTorque {
+    if (engineTorque != nil) {
+        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+    } else {
+        [parameters removeObjectForKey:NAMES_engineTorque];
+    }
+}
+
+-(NSNumber*) engineTorque {
+    return [parameters objectForKey:NAMES_engineTorque];
+}
+
+-(void) setAccPedalPosition:(NSNumber *) accPedalPosition {
+    if (accPedalPosition != nil) {
+        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+    } else {
+        [parameters removeObjectForKey:NAMES_accPedalPosition];
+    }
+}
+
+-(NSNumber*) accPedalPosition {
+    return [parameters objectForKey:NAMES_accPedalPosition];
+}
+
+-(void) setSteeringWheelAngle:(NSNumber *) steeringWheelAngle {
+    if (steeringWheelAngle != nil) {
+        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+    } else {
+        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+    }
+}
+
+-(NSNumber*) steeringWheelAngle {
+    return [parameters objectForKey:NAMES_steeringWheelAngle];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h
new file mode 100644 (file)
index 0000000..dd8cea6
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h
@@ -0,0 +1,35 @@
+//  SDLSubscribeVehicleDataResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+#import <SmartDeviceLink/SDLVehicleDataResult.h>
+
+@interface SDLSubscribeVehicleDataResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLVehicleDataResult* gps;
+@property(assign) SDLVehicleDataResult* speed;
+@property(assign) SDLVehicleDataResult* rpm;
+@property(assign) SDLVehicleDataResult* fuelLevel;
+@property(assign) SDLVehicleDataResult* fuelLevelState;
+@property(assign) SDLVehicleDataResult* instantFuelConsumption;
+@property(assign) SDLVehicleDataResult* externalTemperature;
+@property(assign) SDLVehicleDataResult* prndl;
+@property(assign) SDLVehicleDataResult* tirePressure;
+@property(assign) SDLVehicleDataResult* odometer;
+@property(assign) SDLVehicleDataResult* beltStatus;
+@property(assign) SDLVehicleDataResult* bodyInformation;
+@property(assign) SDLVehicleDataResult* deviceStatus;
+@property(assign) SDLVehicleDataResult* driverBraking;
+@property(assign) SDLVehicleDataResult* wiperStatus;
+@property(assign) SDLVehicleDataResult* headLampStatus;
+@property(assign) SDLVehicleDataResult* engineTorque;
+@property(assign) SDLVehicleDataResult* accPedalPosition;
+@property(assign) SDLVehicleDataResult* steeringWheelAngle;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
new file mode 100644 (file)
index 0000000..6b8bdc4
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
@@ -0,0 +1,344 @@
+//  SDLSubscribeVehicleDataResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSubscribeVehicleDataResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSubscribeVehicleDataResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_SubscribeVehicleData]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setGps:(SDLVehicleDataResult *)gps {
+    if (gps != nil) {
+        [parameters setObject:gps forKey:NAMES_gps];
+    } else {
+        [parameters removeObjectForKey:NAMES_gps];
+    }
+}
+
+-(SDLVehicleDataResult*) gps {
+    NSObject* obj = [parameters objectForKey:NAMES_gps];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setSpeed:(SDLVehicleDataResult*) speed {
+    if (speed != nil) {
+        [parameters setObject:speed forKey:NAMES_speed];
+    } else {
+        [parameters removeObjectForKey:NAMES_speed];
+    }
+}
+
+-(SDLVehicleDataResult*) speed {
+    NSObject* obj = [parameters objectForKey:NAMES_speed];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setRpm:(SDLVehicleDataResult*) rpm {
+    if (rpm != nil) {
+        [parameters setObject:rpm forKey:NAMES_rpm];
+    } else {
+        [parameters removeObjectForKey:NAMES_rpm];
+    }
+}
+
+-(SDLVehicleDataResult*) rpm {
+    NSObject* obj = [parameters objectForKey:NAMES_rpm];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setFuelLevel:(SDLVehicleDataResult*) fuelLevel {
+    if (fuelLevel != nil) {
+        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevel];
+    }
+}
+
+-(SDLVehicleDataResult*) fuelLevel {
+    NSObject* obj = [parameters objectForKey:NAMES_fuelLevel];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setFuelLevelState:(SDLVehicleDataResult*) fuelLevelState {
+    if (fuelLevelState != nil) {
+        [parameters setObject:fuelLevelState forKey:NAMES_fuelLevelState];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevelState];
+    }
+}
+
+-(SDLVehicleDataResult*) fuelLevelState {
+    NSObject* obj = [parameters objectForKey:NAMES_fuelLevelState];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setInstantFuelConsumption:(SDLVehicleDataResult*) instantFuelConsumption {
+    if (instantFuelConsumption != nil) {
+        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+    } else {
+        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+    }
+}
+
+-(SDLVehicleDataResult*) instantFuelConsumption {
+    NSObject* obj = [parameters objectForKey:NAMES_instantFuelConsumption];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setExternalTemperature:(SDLVehicleDataResult*) externalTemperature {
+    if (externalTemperature != nil) {
+        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+    } else {
+        [parameters removeObjectForKey:NAMES_externalTemperature];
+    }
+}
+
+-(SDLVehicleDataResult*) externalTemperature {
+    NSObject* obj = [parameters objectForKey:NAMES_externalTemperature];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setPrndl:(SDLVehicleDataResult*) prndl {
+    if (prndl != nil) {
+        [parameters setObject:prndl forKey:NAMES_prndl];
+    } else {
+        [parameters removeObjectForKey:NAMES_prndl];
+    }
+}
+
+-(SDLVehicleDataResult*) prndl {
+    NSObject* obj = [parameters objectForKey:NAMES_prndl];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setTirePressure:(SDLVehicleDataResult*) tirePressure {
+    if (tirePressure != nil) {
+        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+    } else {
+        [parameters removeObjectForKey:NAMES_tirePressure];
+    }
+}
+
+-(SDLVehicleDataResult*) tirePressure {
+    NSObject* obj = [parameters objectForKey:NAMES_tirePressure];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setOdometer:(SDLVehicleDataResult*) odometer {
+    if (odometer != nil) {
+        [parameters setObject:odometer forKey:NAMES_odometer];
+    } else {
+        [parameters removeObjectForKey:NAMES_odometer];
+    }
+}
+
+-(SDLVehicleDataResult*) odometer {
+    NSObject* obj = [parameters objectForKey:NAMES_odometer];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setBeltStatus:(SDLVehicleDataResult*) beltStatus {
+    if (beltStatus != nil) {
+        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_beltStatus];
+    }
+}
+
+-(SDLVehicleDataResult*) beltStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_beltStatus];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setBodyInformation:(SDLVehicleDataResult*) bodyInformation {
+    if (bodyInformation != nil) {
+        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+    } else {
+        [parameters removeObjectForKey:NAMES_bodyInformation];
+    }
+}
+
+-(SDLVehicleDataResult*) bodyInformation {
+    NSObject* obj = [parameters objectForKey:NAMES_bodyInformation];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setDeviceStatus:(SDLVehicleDataResult*) deviceStatus {
+    if (deviceStatus != nil) {
+        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_deviceStatus];
+    }
+}
+
+-(SDLVehicleDataResult*) deviceStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_deviceStatus];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setDriverBraking:(SDLVehicleDataResult*) driverBraking {
+    if (driverBraking != nil) {
+        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+    } else {
+        [parameters removeObjectForKey:NAMES_driverBraking];
+    }
+}
+
+-(SDLVehicleDataResult*) driverBraking {
+    NSObject* obj = [parameters objectForKey:NAMES_driverBraking];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setWiperStatus:(SDLVehicleDataResult*) wiperStatus {
+    if (wiperStatus != nil) {
+        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_wiperStatus];
+    }
+}
+
+-(SDLVehicleDataResult*) wiperStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_wiperStatus];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setHeadLampStatus:(SDLVehicleDataResult*) headLampStatus {
+    if (headLampStatus != nil) {
+        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_headLampStatus];
+    }
+}
+
+-(SDLVehicleDataResult*) headLampStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_headLampStatus];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setEngineTorque:(SDLVehicleDataResult*) engineTorque {
+    if (engineTorque != nil) {
+        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+    } else {
+        [parameters removeObjectForKey:NAMES_engineTorque];
+    }
+}
+
+-(SDLVehicleDataResult*) engineTorque {
+    NSObject* obj = [parameters objectForKey:NAMES_engineTorque];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setAccPedalPosition:(SDLVehicleDataResult*) accPedalPosition {
+    if (accPedalPosition != nil) {
+        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+    } else {
+        [parameters removeObjectForKey:NAMES_accPedalPosition];
+    }
+}
+
+-(SDLVehicleDataResult*) accPedalPosition {
+    NSObject* obj = [parameters objectForKey:NAMES_accPedalPosition];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setSteeringWheelAngle:(SDLVehicleDataResult*) steeringWheelAngle {
+    if (steeringWheelAngle != nil) {
+        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+    } else {
+        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+    }
+}
+
+-(SDLVehicleDataResult*) steeringWheelAngle {
+    NSObject* obj = [parameters objectForKey:NAMES_steeringWheelAngle];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMsgVersion.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncMsgVersion.h
similarity index 52%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMsgVersion.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncMsgVersion.h
index 96f591f..1ac8b3c 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMsgVersion.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncMsgVersion.h
@@ -1,12 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSyncMsgVersion.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCMessage.h"
+#import <SmartDeviceLink/SDLRPCMessage.h>
 
-
-@interface SDLMsgVersion : SDLRPCStruct {}
+@interface SDLSyncMsgVersion : SDLRPCStruct {}
 
 -(id) init;
 -(id) initWithDictionary:(NSMutableDictionary*) dict;

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMsgVersion.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncMsgVersion.m
similarity index 79%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMsgVersion.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncMsgVersion.m
index fe88d07..2b15514 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMsgVersion.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncMsgVersion.m
@@ -1,11 +1,12 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLSyncMsgVersion.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLMsgVersion.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLSyncMsgVersion.h>
 
-@implementation SDLMsgVersion
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSyncMsgVersion
 
 -(id) init {
     if (self = [super init]) {}

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncPData.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncPData.h
new file mode 100644 (file)
index 0000000..b33d7b5
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncPData.h
@@ -0,0 +1,13 @@
+//  SDLSyncPData.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+@interface SDLSyncPData: SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncPData.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncPData.m
new file mode 100644 (file)
index 0000000..8445ee9
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncPData.m
@@ -0,0 +1,22 @@
+//  SDLSyncPData.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSyncPData.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSyncPData
+
+-(id) init {
+    if (self = [super initWithName:NAMES_SyncPData]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncPDataResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncPDataResponse.h
new file mode 100644 (file)
index 0000000..478c94e
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncPDataResponse.h
@@ -0,0 +1,13 @@
+//  SDLSyncPDataResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLSyncPDataResponse: SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncPDataResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncPDataResponse.m
new file mode 100644 (file)
index 0000000..c4303e2
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSyncPDataResponse.m
@@ -0,0 +1,21 @@
+//  SDLSyncPDataResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSyncPDataResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLSyncPDataResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_SyncPData]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSystemAction.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSystemAction.h
new file mode 100644 (file)
index 0000000..44ad900
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSystemAction.h
@@ -0,0 +1,17 @@
+//  SDLSystemAction.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLSystemAction : SDLEnum {}
+
++(SDLSystemAction*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLSystemAction*) DEFAULT_ACTION;
++(SDLSystemAction*) STEAL_FOCUS;
++(SDLSystemAction*) KEEP_CONTEXT;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSystemAction.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSystemAction.m
new file mode 100644 (file)
index 0000000..63f53bc
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSystemAction.m
@@ -0,0 +1,55 @@
+//  SDLSystemAction.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSystemAction.h>
+
+SDLSystemAction* SDLSystemAction_DEFAULT_ACTION = nil;
+SDLSystemAction* SDLSystemAction_STEAL_FOCUS = nil;
+SDLSystemAction* SDLSystemAction_KEEP_CONTEXT = nil;
+
+NSMutableArray* SDLSystemAction_values = nil;
+@implementation SDLSystemAction
+
++(SDLSystemAction*) valueOf:(NSString*) value {
+    for (SDLSystemAction* item in SDLSystemAction.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLSystemAction_values == nil) {
+        SDLSystemAction_values = [[NSMutableArray alloc] initWithObjects:
+                SDLSystemAction.DEFAULT_ACTION,
+                SDLSystemAction.STEAL_FOCUS,
+                SDLSystemAction.KEEP_CONTEXT,
+                nil];
+    }
+    return SDLSystemAction_values;
+}
+
++(SDLSystemAction*) DEFAULT_ACTION {
+       if (SDLSystemAction_DEFAULT_ACTION == nil) {
+                       SDLSystemAction_DEFAULT_ACTION = [[SDLSystemAction alloc] initWithValue:@"DEFAULT_ACTION"];
+       }
+       return SDLSystemAction_DEFAULT_ACTION;
+}
+
++(SDLSystemAction*) STEAL_FOCUS {
+       if (SDLSystemAction_STEAL_FOCUS == nil) {
+                       SDLSystemAction_STEAL_FOCUS = [[SDLSystemAction alloc] initWithValue:@"STEAL_FOCUS"];
+       }
+       return SDLSystemAction_STEAL_FOCUS;
+}
+
++(SDLSystemAction*) KEEP_CONTEXT {
+       if (SDLSystemAction_KEEP_CONTEXT == nil) {
+                       SDLSystemAction_KEEP_CONTEXT = [[SDLSystemAction alloc] initWithValue:@"KEEP_CONTEXT"];
+       }
+       return SDLSystemAction_KEEP_CONTEXT;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSystemContext.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSystemContext.h
new file mode 100644 (file)
index 0000000..029ff0f
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSystemContext.h
@@ -0,0 +1,19 @@
+//  SDLSystemContext.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLSystemContext : SDLEnum {}
+
++(SDLSystemContext*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLSystemContext*) MAIN;
++(SDLSystemContext*) VRSESSION;
++(SDLSystemContext*) MENU;
++(SDLSystemContext*) HMI_OBSCURED;
++(SDLSystemContext*) ALERT;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSystemContext.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSystemContext.m
new file mode 100644 (file)
index 0000000..c98d4b4
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLSystemContext.m
@@ -0,0 +1,73 @@
+//  SDLSystemContext.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLSystemContext.h>
+
+SDLSystemContext* SDLSystemContext_MAIN = nil;
+SDLSystemContext* SDLSystemContext_VRSESSION = nil;
+SDLSystemContext* SDLSystemContext_MENU = nil;
+SDLSystemContext* SDLSystemContext_HMI_OBSCURED = nil;
+SDLSystemContext* SDLSystemContext_ALERT = nil;
+
+NSMutableArray* SDLSystemContext_values = nil;
+@implementation SDLSystemContext
+
++(SDLSystemContext*) valueOf:(NSString*) value {
+    for (SDLSystemContext* item in SDLSystemContext.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLSystemContext_values == nil) {
+        SDLSystemContext_values = [[NSMutableArray alloc] initWithObjects:
+                SDLSystemContext.MAIN,
+                SDLSystemContext.VRSESSION,
+                SDLSystemContext.MENU,
+                SDLSystemContext.HMI_OBSCURED,
+                SDLSystemContext.ALERT,
+                nil];
+    }
+    return SDLSystemContext_values;
+}
+
++(SDLSystemContext*) MAIN {
+       if (SDLSystemContext_MAIN == nil) {
+                       SDLSystemContext_MAIN = [[SDLSystemContext alloc] initWithValue:@"MAIN"];
+       }
+       return SDLSystemContext_MAIN;
+}
+
++(SDLSystemContext*) VRSESSION {
+       if (SDLSystemContext_VRSESSION == nil) {
+                       SDLSystemContext_VRSESSION = [[SDLSystemContext alloc] initWithValue:@"VRSESSION"];
+       }
+       return SDLSystemContext_VRSESSION;
+}
+
++(SDLSystemContext*) MENU {
+       if (SDLSystemContext_MENU == nil) {
+                       SDLSystemContext_MENU = [[SDLSystemContext alloc] initWithValue:@"MENU"];
+       }
+       return SDLSystemContext_MENU;
+}
+
++(SDLSystemContext*) HMI_OBSCURED {
+    if (SDLSystemContext_HMI_OBSCURED == nil) {
+        SDLSystemContext_HMI_OBSCURED = [[SDLSystemContext alloc] initWithValue:@"HMI_OBSCURED"];
+    }
+    return SDLSystemContext_HMI_OBSCURED;
+}
+
++(SDLSystemContext*) ALERT {
+    if (SDLSystemContext_ALERT == nil) {
+        SDLSystemContext_ALERT = [[SDLSystemContext alloc] initWithValue:@"ALERT"];
+    }
+    return SDLSystemContext_ALERT;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTBTState.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTBTState.h
new file mode 100644 (file)
index 0000000..ee0e1f9
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTBTState.h
@@ -0,0 +1,26 @@
+//  SDLTBTState.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLTBTState : SDLEnum {}
+
++(SDLTBTState*) valueOf:(NSString*) value;
++(NSMutableArray*) values;                                 
+
++(SDLTBTState*) ROUTE_UPDATE_REQUEST; 
++(SDLTBTState*) ROUTE_ACCEPTED;
++(SDLTBTState*) ROUTE_REFUSED; 
++(SDLTBTState*) ROUTE_CANCELLED;
++(SDLTBTState*) ETA_REQUEST;
++(SDLTBTState*) NEXT_TURN_REQUEST;
++(SDLTBTState*) ROUTE_STATUS_REQUEST;
++(SDLTBTState*) ROUTE_SUMMARY_REQUEST;
++(SDLTBTState*) TRIP_STATUS_REQUEST;
++(SDLTBTState*) ROUTE_UPDATE_REQUEST_TIMEOUT;
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTBTState.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTBTState.m
new file mode 100644 (file)
index 0000000..ac40b91
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTBTState.m
@@ -0,0 +1,115 @@
+//  SDLTBTState.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLTBTState.h>   
+
+SDLTBTState* SDLTBTState_ROUTE_UPDATE_REQUEST = nil;    
+SDLTBTState* SDLTBTState_ROUTE_ACCEPTED = nil;
+SDLTBTState* SDLTBTState_ROUTE_REFUSED = nil;    
+SDLTBTState* SDLTBTState_ROUTE_CANCELLED = nil;
+SDLTBTState* SDLTBTState_ETA_REQUEST = nil;
+SDLTBTState* SDLTBTState_NEXT_TURN_REQUEST = nil;
+SDLTBTState* SDLTBTState_ROUTE_STATUS_REQUEST = nil;
+SDLTBTState* SDLTBTState_ROUTE_SUMMARY_REQUEST = nil;
+SDLTBTState* SDLTBTState_TRIP_STATUS_REQUEST = nil;
+SDLTBTState* SDLTBTState_ROUTE_UPDATE_REQUEST_TIMEOUT = nil;
+NSMutableArray* SDLTBTState_values = nil; 
+
+@implementation SDLTBTState
+
++(SDLTBTState*) valueOf:(NSString*) value {                       
+       for (SDLTBTState* item in SDLTBTState.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLTBTState_values == nil) {                               
+               SDLTBTState_values = [[NSMutableArray alloc] initWithObjects: 
+                                                                       SDLTBTState.ROUTE_UPDATE_REQUEST,   
+                                                                       SDLTBTState.ROUTE_ACCEPTED, 
+                                                                       SDLTBTState.ROUTE_REFUSED,     
+                                                                       SDLTBTState.ROUTE_CANCELLED, 
+                                    SDLTBTState_ETA_REQUEST,
+                                    SDLTBTState_NEXT_TURN_REQUEST,
+                                    SDLTBTState_ROUTE_STATUS_REQUEST,
+                                    SDLTBTState_ROUTE_SUMMARY_REQUEST,
+                                    SDLTBTState_TRIP_STATUS_REQUEST,
+                                    SDLTBTState_ROUTE_UPDATE_REQUEST_TIMEOUT,
+                                                                       nil];                        
+       } 
+       return SDLTBTState_values; 
+}
+
++(SDLTBTState*) ROUTE_UPDATE_REQUEST {                                                                         
+       if (SDLTBTState_ROUTE_UPDATE_REQUEST == nil) {
+               SDLTBTState_ROUTE_UPDATE_REQUEST = [[SDLTBTState alloc] initWithValue:@"ROUTE_UPDATE_REQUEST"];
+       } 
+       return SDLTBTState_ROUTE_UPDATE_REQUEST;  
+}
+
++(SDLTBTState*) ROUTE_ACCEPTED {                                                                               
+       if (SDLTBTState_ROUTE_ACCEPTED == nil) {  
+               SDLTBTState_ROUTE_ACCEPTED = [[SDLTBTState alloc] initWithValue:@"ROUTE_ACCEPTED"]; 
+       } 
+       return SDLTBTState_ROUTE_ACCEPTED;    
+}
+
++(SDLTBTState*) ROUTE_REFUSED {                                                                                
+       if (SDLTBTState_ROUTE_REFUSED == nil) {   
+               SDLTBTState_ROUTE_REFUSED = [[SDLTBTState alloc] initWithValue:@"ROUTE_REFUSED"];
+       } 
+       return SDLTBTState_ROUTE_REFUSED;
+}
+
++(SDLTBTState*) ROUTE_CANCELLED {                                                                              
+       if (SDLTBTState_ROUTE_CANCELLED  == nil) {
+               SDLTBTState_ROUTE_CANCELLED  = [[SDLTBTState alloc] initWithValue:@"ROUTE_CANCELLED "];
+       } 
+       return SDLTBTState_ROUTE_CANCELLED;  
+}
+
++(SDLTBTState*) ETA_REQUEST {
+       if (SDLTBTState_ETA_REQUEST  == nil) {
+               SDLTBTState_ETA_REQUEST  = [[SDLTBTState alloc] initWithValue:@"ETA_REQUEST "];
+       }
+       return SDLTBTState_ETA_REQUEST;
+}
++(SDLTBTState*) NEXT_TURN_REQUEST {
+       if (SDLTBTState_NEXT_TURN_REQUEST  == nil) {
+               SDLTBTState_NEXT_TURN_REQUEST  = [[SDLTBTState alloc] initWithValue:@"NEXT_TURN_REQUEST "];
+       }
+       return SDLTBTState_NEXT_TURN_REQUEST;
+}
++(SDLTBTState*) ROUTE_STATUS_REQUEST {
+       if (SDLTBTState_ROUTE_STATUS_REQUEST  == nil) {
+               SDLTBTState_ROUTE_STATUS_REQUEST  = [[SDLTBTState alloc] initWithValue:@"ROUTE_STATUS_REQUEST "];
+       }
+       return SDLTBTState_ROUTE_STATUS_REQUEST;
+}
++(SDLTBTState*) ROUTE_SUMMARY_REQUEST {
+       if (SDLTBTState_ROUTE_SUMMARY_REQUEST  == nil) {
+               SDLTBTState_ROUTE_SUMMARY_REQUEST  = [[SDLTBTState alloc] initWithValue:@"ROUTE_SUMMARY_REQUEST "];
+       }
+       return SDLTBTState_ROUTE_SUMMARY_REQUEST;
+}
++(SDLTBTState*) TRIP_STATUS_REQUEST {
+       if (SDLTBTState_TRIP_STATUS_REQUEST  == nil) {
+               SDLTBTState_TRIP_STATUS_REQUEST  = [[SDLTBTState alloc] initWithValue:@"TRIP_STATUS_REQUEST "];
+       }
+       return SDLTBTState_TRIP_STATUS_REQUEST;
+}
++(SDLTBTState*) ROUTE_UPDATE_REQUEST_TIMEOUT {
+       if (SDLTBTState_ROUTE_UPDATE_REQUEST_TIMEOUT  == nil) {
+               SDLTBTState_ROUTE_UPDATE_REQUEST_TIMEOUT  = [[SDLTBTState alloc] initWithValue:@"ROUTE_UPDATE_REQUEST_TIMEOUT "];
+       }
+       return SDLTBTState_ROUTE_UPDATE_REQUEST_TIMEOUT;
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTCPTransport.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTCPTransport.h
new file mode 100644 (file)
index 0000000..b3ad55c
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTCPTransport.h
@@ -0,0 +1,12 @@
+//  SDLTCPTransport.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLAbstractTransport.h>
+
+@interface SDLTCPTransport : SDLAbstractTransport {
+       CFSocketRef socket;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTCPTransport.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTCPTransport.m
similarity index 78%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTCPTransport.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTCPTransport.m
index 191a752..d38c97e 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTCPTransport.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTCPTransport.m
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLTCPTransport.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLTCPTransport.h"
-#import "SDLDebugTool.h"
+#import <SmartDeviceLink/SDLTCPTransport.h>
+#import <SmartDeviceLink/SDLDebugTool.h>
 #import <errno.h>
 #import <signal.h>
 #import <stdio.h>
@@ -71,9 +71,16 @@ static void TCPCallback(CFSocketRef socket, CFSocketCallBackType type, CFDataRef
 }
 
 - (bool) connect {
-       int sock_fd = call_socket([endpointName UTF8String], [endpointParam UTF8String]);
+    
+    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"consoleLog" object:@"TCP Init"]];
+    [SDLDebugTool logInfo:@"TCP Init"];
+    
+    int sock_fd = call_socket([endpointName UTF8String], [endpointParam UTF8String]);
        if (sock_fd < 0) {
-               [SDLDebugTool logInfo:@"Failed to connect to remote"];
+        
+        [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"consoleLog" object:@"Server Not Ready, Connection Failed"]];
+               [SDLDebugTool logInfo:@"Server Not Ready, Connection Failed"];
+        
                return NO;
        }
        
@@ -96,8 +103,8 @@ static void TCPCallback(CFSocketRef socket, CFSocketCallBackType type, CFDataRef
 }
 
 - (bool) sendBytes:(NSData*) msgBytes {
-       NSString* byteStr = [self getHexString:msgBytes];
-       [SDLDebugTool logInfo:@"Sending %i bytes: %@", msgBytes.length, byteStr];
+//     NSString* byteStr = [self getHexString:msgBytes];
+//     [SDLDebugTool logInfo:@"Sending %i bytes: %@", msgBytes.length, byteStr];
        
        CFSocketError e = CFSocketSendData(socket, NULL, (CFDataRef)msgBytes, 10000);
        return e==0;

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTTSChunk.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTTSChunk.h
similarity index 57%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTTSChunk.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTTSChunk.h
index 1b209f5..0ca8821 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTTSChunk.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTTSChunk.h
@@ -1,11 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLTTSChunk.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCMessage.h"
+#import <SmartDeviceLink/SDLRPCMessage.h>
 
-#import "SDLSpeechCapabilities.h"
+#import <SmartDeviceLink/SDLSpeechCapabilities.h>
 
 @interface SDLTTSChunk : SDLRPCStruct {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTTSChunk.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTTSChunk.m
similarity index 85%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTTSChunk.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTTSChunk.m
index 072e08c..7895504 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTTSChunk.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTTSChunk.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLTTSChunk.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLTTSChunk.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLTTSChunk.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLTTSChunk
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTTSChunkFactory.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTTSChunkFactory.h
similarity index 59%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTTSChunkFactory.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTTSChunkFactory.h
index 9972bb7..3534930 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTTSChunkFactory.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTTSChunkFactory.h
@@ -1,10 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLTTSChunkFactory.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "RPC/SDLTTSChunk.h"
-#import "SDLJingle.h"
+
+#import <SmartDeviceLink/SDLJingle.h>
+#import <SmartDeviceLink/SDLTTSChunk.h>
 
 @interface SDLTTSChunkFactory : NSObject {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTTSChunkFactory.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTTSChunkFactory.m
similarity index 78%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTTSChunkFactory.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTTSChunkFactory.m
index fc1ded4..55d6110 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTTSChunkFactory.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTTSChunkFactory.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLTTSChunkFactory.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLTTSChunkFactory.h"
+#import <SmartDeviceLink/SDLTTSChunkFactory.h>
 
 @implementation SDLTTSChunkFactory
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextAlignment.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextAlignment.h
similarity index 68%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextAlignment.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextAlignment.h
index 4a26037..bad12c5 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextAlignment.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextAlignment.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLTextAlignment.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLTextAlignment : SDLEnum {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextAlignment.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextAlignment.m
similarity index 92%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextAlignment.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextAlignment.m
index ae34bd6..b9d3165 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextAlignment.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextAlignment.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLTextAlignment.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLTextAlignment.h"
+#import <SmartDeviceLink/SDLTextAlignment.h>
 
 SDLTextAlignment* SDLTextAlignment_LEFT_ALIGNED = nil;
 SDLTextAlignment* SDLTextAlignment_RIGHT_ALIGNED = nil;

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextField.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextField.h
similarity index 59%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextField.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextField.h
index 3359d9b..6475ec8 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextField.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextField.h
@@ -1,12 +1,12 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLTextField.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCMessage.h"
+#import <SmartDeviceLink/SDLRPCMessage.h>
 
-#import "SDLTextFieldName.h"
-#import "SDLCharacterSet.h"
+#import <SmartDeviceLink/SDLCharacterSet.h>
+#import <SmartDeviceLink/SDLTextFieldName.h>
 
 @interface SDLTextField : SDLRPCStruct {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextField.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextField.m
similarity index 91%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextField.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextField.m
index a21bb96..b1d1ea4 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextField.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextField.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLTextField.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLTextField.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLTextField.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLTextField
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextFieldName.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextFieldName.h
new file mode 100644 (file)
index 0000000..775a6b8
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextFieldName.h
@@ -0,0 +1,34 @@
+//  SDLTextFieldName.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLTextFieldName : SDLEnum {}
+
++(SDLTextFieldName*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLTextFieldName*) mainField1;
++(SDLTextFieldName*) mainField2;
++(SDLTextFieldName*) mainField3;
++(SDLTextFieldName*) mainField4;
++(SDLTextFieldName*) statusBar;
++(SDLTextFieldName*) mediaClock;
++(SDLTextFieldName*) mediaTrack;
++(SDLTextFieldName*) alertText1;
++(SDLTextFieldName*) alertText2;
++(SDLTextFieldName*) alertText3;
++(SDLTextFieldName*) scrollableMessageBody;
++(SDLTextFieldName*) initialInteractionText;
++(SDLTextFieldName*) navigationText1;
++(SDLTextFieldName*) navigationText2;
++(SDLTextFieldName*) ETA;
++(SDLTextFieldName*) totalDistance;
++(SDLTextFieldName*) audioPassThruDisplayText1;
++(SDLTextFieldName*) audioPassThruDisplayText2;
++(SDLTextFieldName*) sliderHeader;
++(SDLTextFieldName*) sliderFooter;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextFieldName.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextFieldName.m
new file mode 100644 (file)
index 0000000..f430529
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTextFieldName.m
@@ -0,0 +1,208 @@
+//  SDLTextFieldName.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLTextFieldName.h>
+
+SDLTextFieldName* SDLTextFieldName_mainField1 = nil;
+SDLTextFieldName* SDLTextFieldName_mainField2 = nil;
+SDLTextFieldName* SDLTextFieldName_mainField3 = nil;
+SDLTextFieldName* SDLTextFieldName_mainField4 = nil;
+SDLTextFieldName* SDLTextFieldName_statusBar = nil;
+SDLTextFieldName* SDLTextFieldName_mediaClock = nil;
+SDLTextFieldName* SDLTextFieldName_mediaTrack = nil;
+SDLTextFieldName* SDLTextFieldName_alertText1 = nil;
+SDLTextFieldName* SDLTextFieldName_alertText2 = nil;
+SDLTextFieldName* SDLTextFieldName_alertText3 = nil;
+SDLTextFieldName* SDLTextFieldName_scrollableMessageBody = nil;
+SDLTextFieldName* SDLTextFieldName_initialInteractionText = nil;
+SDLTextFieldName* SDLTextFieldName_navigationText1 = nil;
+SDLTextFieldName* SDLTextFieldName_navigationText2 = nil;
+SDLTextFieldName* SDLTextFieldName_ETA = nil;
+SDLTextFieldName* SDLTextFieldName_totalDistance = nil;
+SDLTextFieldName* SDLTextFieldName_audioPassThruDisplayText1 = nil;
+SDLTextFieldName* SDLTextFieldName_audioPassThruDisplayText2 = nil;
+SDLTextFieldName* SDLTextFieldName_sliderHeader = nil;
+SDLTextFieldName* SDLTextFieldName_sliderFooter = nil;
+
+NSMutableArray* SDLTextFieldName_values = nil;
+@implementation SDLTextFieldName
+
++(SDLTextFieldName*) valueOf:(NSString*) value {
+    for (SDLTextFieldName* item in SDLTextFieldName.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLTextFieldName_values == nil) {
+        SDLTextFieldName_values = [[NSMutableArray alloc] initWithObjects:
+                SDLTextFieldName.mainField1,
+                SDLTextFieldName.mainField2,
+                SDLTextFieldName.mainField3,
+                SDLTextFieldName.mainField4,
+                SDLTextFieldName.statusBar,
+                SDLTextFieldName.mediaClock,
+                SDLTextFieldName.mediaTrack,
+                SDLTextFieldName.alertText1,
+                SDLTextFieldName.alertText2,
+                SDLTextFieldName.alertText3,
+                SDLTextFieldName.scrollableMessageBody,
+                SDLTextFieldName.initialInteractionText,
+                SDLTextFieldName.navigationText1,
+                SDLTextFieldName.navigationText2,
+                SDLTextFieldName.ETA,
+                SDLTextFieldName.totalDistance,
+                SDLTextFieldName.audioPassThruDisplayText1,
+                SDLTextFieldName.audioPassThruDisplayText2,
+                SDLTextFieldName.sliderHeader,
+                SDLTextFieldName.sliderFooter,
+                nil];
+    }
+    return SDLTextFieldName_values;
+}
+
++(SDLTextFieldName*) mainField1 {
+       if (SDLTextFieldName_mainField1 == nil) {
+                       SDLTextFieldName_mainField1 = [[SDLTextFieldName alloc] initWithValue:@"mainField1"];
+       }
+       return SDLTextFieldName_mainField1;
+}
+
++(SDLTextFieldName*) mainField2 {
+       if (SDLTextFieldName_mainField2 == nil) {
+                       SDLTextFieldName_mainField2 = [[SDLTextFieldName alloc] initWithValue:@"mainField2"];
+       }
+       return SDLTextFieldName_mainField2;
+}
+
++(SDLTextFieldName*) mainField3 {
+    if (SDLTextFieldName_mainField3 == nil) {
+        SDLTextFieldName_mainField3 = [[SDLTextFieldName alloc] initWithValue:@"mainField3"];
+    }
+    return SDLTextFieldName_mainField3;
+}
+
++(SDLTextFieldName*) mainField4 {
+    if (SDLTextFieldName_mainField4 == nil) {
+        SDLTextFieldName_mainField4 = [[SDLTextFieldName alloc] initWithValue:@"mainField4"];
+    }
+    return SDLTextFieldName_mainField4;
+}
+
++(SDLTextFieldName*) statusBar {
+       if (SDLTextFieldName_statusBar == nil) {
+                       SDLTextFieldName_statusBar = [[SDLTextFieldName alloc] initWithValue:@"statusBar"];
+       }
+       return SDLTextFieldName_statusBar;
+}
+
++(SDLTextFieldName*) mediaClock {
+       if (SDLTextFieldName_mediaClock == nil) {
+                       SDLTextFieldName_mediaClock = [[SDLTextFieldName alloc] initWithValue:@"mediaClock"];
+       }
+       return SDLTextFieldName_mediaClock;
+}
+
++(SDLTextFieldName*) mediaTrack {
+       if (SDLTextFieldName_mediaTrack == nil) {
+                       SDLTextFieldName_mediaTrack = [[SDLTextFieldName alloc] initWithValue:@"mediaTrack"];
+       }
+       return SDLTextFieldName_mediaTrack;
+}
+
++(SDLTextFieldName*) alertText1 {
+       if (SDLTextFieldName_alertText1 == nil) {
+                       SDLTextFieldName_alertText1 = [[SDLTextFieldName alloc] initWithValue:@"alertText1"];
+       }
+       return SDLTextFieldName_alertText1;
+}
+
++(SDLTextFieldName*) alertText2 {
+       if (SDLTextFieldName_alertText2 == nil) {
+                       SDLTextFieldName_alertText2 = [[SDLTextFieldName alloc] initWithValue:@"alertText2"];
+       }
+       return SDLTextFieldName_alertText2;
+}
+
++(SDLTextFieldName*) alertText3 {
+    if (SDLTextFieldName_alertText3 == nil) {
+        SDLTextFieldName_alertText3 = [[SDLTextFieldName alloc] initWithValue:@"alertText3"];
+    }
+    return SDLTextFieldName_alertText3;
+}
+
++(SDLTextFieldName*) scrollableMessageBody {
+    if (SDLTextFieldName_scrollableMessageBody == nil) {
+        SDLTextFieldName_scrollableMessageBody = [[SDLTextFieldName alloc] initWithValue:@"scrollableMessageBody"];
+    }
+    return SDLTextFieldName_scrollableMessageBody;
+}
+
++(SDLTextFieldName*) initialInteractionText {
+    if (SDLTextFieldName_initialInteractionText == nil) {
+        SDLTextFieldName_initialInteractionText = [[SDLTextFieldName alloc] initWithValue:@"initialInteractionText"];
+    }
+    return SDLTextFieldName_initialInteractionText;
+}
+
++(SDLTextFieldName*) navigationText1 {
+    if (SDLTextFieldName_navigationText1 == nil) {
+        SDLTextFieldName_navigationText1 = [[SDLTextFieldName alloc] initWithValue:@"navigationText1"];
+    }
+    return SDLTextFieldName_navigationText1;
+}
+
++(SDLTextFieldName*) navigationText2 {
+    if (SDLTextFieldName_navigationText2 == nil) {
+        SDLTextFieldName_navigationText2 = [[SDLTextFieldName alloc] initWithValue:@"navigationText2"];
+    }
+    return SDLTextFieldName_navigationText2;
+}
+
++(SDLTextFieldName*) ETA {
+    if (SDLTextFieldName_ETA == nil) {
+        SDLTextFieldName_ETA = [[SDLTextFieldName alloc] initWithValue:@"ETA"];
+    }
+    return SDLTextFieldName_ETA;
+}
+
++(SDLTextFieldName*) totalDistance {
+    if (SDLTextFieldName_totalDistance == nil) {
+        SDLTextFieldName_totalDistance = [[SDLTextFieldName alloc] initWithValue:@"totalDistance"];
+    }
+    return SDLTextFieldName_totalDistance;
+}
+
++(SDLTextFieldName*) audioPassThruDisplayText1 {
+    if (SDLTextFieldName_audioPassThruDisplayText1 == nil) {
+        SDLTextFieldName_audioPassThruDisplayText1 = [[SDLTextFieldName alloc] initWithValue:@"audioPassThruDisplayText1"];
+    }
+    return SDLTextFieldName_audioPassThruDisplayText1;
+}
+
++(SDLTextFieldName*) audioPassThruDisplayText2 {
+    if (SDLTextFieldName_audioPassThruDisplayText2 == nil) {
+        SDLTextFieldName_audioPassThruDisplayText2 = [[SDLTextFieldName alloc] initWithValue:@"audioPassThruDisplayText2"];
+    }
+    return SDLTextFieldName_audioPassThruDisplayText2;
+}
+
++(SDLTextFieldName*) sliderHeader {
+    if (SDLTextFieldName_sliderHeader == nil) {
+        SDLTextFieldName_sliderHeader = [[SDLTextFieldName alloc] initWithValue:@"sliderHeader"];
+    }
+    return SDLTextFieldName_sliderHeader;
+}
+
++(SDLTextFieldName*) sliderFooter {
+    if (SDLTextFieldName_sliderFooter == nil) {
+        SDLTextFieldName_sliderFooter = [[SDLTextFieldName alloc] initWithValue:@"sliderFooter"];
+    }
+    return SDLTextFieldName_sliderFooter;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTireStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTireStatus.h
new file mode 100644 (file)
index 0000000..ec8dc88
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTireStatus.h
@@ -0,0 +1,24 @@
+//  SDLTireStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLSingleTireStatus.h>
+#import <SmartDeviceLink/SDLWarningLightStatus.h>
+
+@interface SDLTireStatus : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLWarningLightStatus* pressureTelltale;
+@property(assign) SDLSingleTireStatus* leftFront;
+@property(assign) SDLSingleTireStatus* rightFront;
+@property(assign) SDLSingleTireStatus* leftRear;
+@property(assign) SDLSingleTireStatus* rightRear;
+@property(assign) SDLSingleTireStatus* innerLeftRear;
+@property(assign) SDLSingleTireStatus* innerRightRear;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTireStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTireStatus.m
new file mode 100644 (file)
index 0000000..b6db036
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTireStatus.m
@@ -0,0 +1,105 @@
+//  SDLTireStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLTireStatus.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLTireStatus
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setPressureTelltale:(SDLWarningLightStatus *) pressureTelltale {
+    if (pressureTelltale != nil) {
+        [store setObject:pressureTelltale forKey:NAMES_pressureTelltale];
+    } else {
+        [store removeObjectForKey:NAMES_pressureTelltale];
+    }
+}
+
+-(SDLWarningLightStatus*) pressureTelltale {
+    return [store objectForKey:NAMES_pressureTelltale];
+}
+
+-(void) setLeftFront:(SDLSingleTireStatus*) leftFront {
+    if (leftFront != nil) {
+        [store setObject:leftFront forKey:NAMES_leftFront];
+    } else {
+        [store removeObjectForKey:NAMES_leftFront];
+    }
+}
+
+-(SDLWarningLightStatus*) leftFront {
+    return [store objectForKey:NAMES_leftFront];
+}
+
+-(void) setRightFront:(SDLSingleTireStatus*) rightFront {
+    if (rightFront != nil) {
+        [store setObject:rightFront forKey:NAMES_rightFront];
+    } else {
+        [store removeObjectForKey:NAMES_rightFront];
+    }
+}
+
+-(SDLWarningLightStatus*) rightFront {
+    return [store objectForKey:NAMES_rightFront];
+}
+
+-(void) setLeftRear:(SDLSingleTireStatus*) leftRear {
+    if (leftRear != nil) {
+        [store setObject:leftRear forKey:NAMES_leftRear];
+    } else {
+        [store removeObjectForKey:NAMES_leftRear];
+    }
+}
+
+-(SDLWarningLightStatus*) leftRear {
+    return [store objectForKey:NAMES_leftRear];
+}
+
+-(void) setRightRear:(SDLSingleTireStatus*) rightRear {
+    if (rightRear != nil) {
+        [store setObject:rightRear forKey:NAMES_rightRear];
+    } else {
+        [store removeObjectForKey:NAMES_rightRear];
+    }
+}
+
+-(SDLWarningLightStatus*) rightRear {
+    return [store objectForKey:NAMES_rightRear];
+}
+
+-(void) setInnerLeftRear:(SDLSingleTireStatus *) innerLeftRear {
+    if (innerLeftRear != nil) {
+        [store setObject:innerLeftRear forKey:NAMES_innerLeftRear];
+    } else {
+        [store removeObjectForKey:NAMES_innerLeftRear];
+    }
+}
+
+-(SDLWarningLightStatus*) innerLeftRear {
+    return [store objectForKey:NAMES_innerLeftRear];
+}
+
+-(void) setInnerRightRear:(SDLSingleTireStatus*) innerRightRear {
+    if (innerRightRear != nil) {
+        [store setObject:innerRightRear forKey:NAMES_innerRightRear];
+    } else {
+        [store removeObjectForKey:NAMES_innerRightRear];
+    }
+}
+
+-(SDLWarningLightStatus*) innerRightRear {
+    return [store objectForKey:NAMES_innerRightRear];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTransportListener.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTransportListener.h
similarity index 69%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTransportListener.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTransportListener.h
index 4e97a88..de0ca8c 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTransportListener.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTransportListener.h
@@ -1,6 +1,6 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLTransportListener.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTriggerSource.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTriggerSource.h
similarity index 64%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTriggerSource.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTriggerSource.h
index 59d1586..40923aa 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTriggerSource.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTriggerSource.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLTriggerSource.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLTriggerSource : SDLEnum {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTriggerSource.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTriggerSource.m
similarity index 89%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTriggerSource.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTriggerSource.m
index 77981ea..8305706 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTriggerSource.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTriggerSource.m
@@ -1,8 +1,8 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLTriggerSource.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLTriggerSource.h"
+#import <SmartDeviceLink/SDLTriggerSource.h>
 
 SDLTriggerSource* SDLTriggerSource_TS_MENU = nil;
 SDLTriggerSource* SDLTriggerSource_TS_VR = nil;

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTurn.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTurn.h
new file mode 100644 (file)
index 0000000..68d5f7a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTurn.h
@@ -0,0 +1,18 @@
+//  SDLTurn.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLImage.h>
+
+@interface SDLTurn : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSString* navigationText;
+@property(assign) SDLImage* turnIcon;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTurn.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTurn.m
new file mode 100644 (file)
index 0000000..b9f0280
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLTurn.m
@@ -0,0 +1,50 @@
+//  SDLTurn.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLTurn.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLTurn
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setNavigationText:(NSString *) navigationText {
+    if (navigationText != nil) {
+        [store setObject:navigationText forKey:NAMES_navigationText];
+    } else {
+        [store removeObjectForKey:NAMES_navigationText];
+    }
+}
+
+-(NSString*) navigationText {
+    return [store objectForKey:NAMES_navigationText];
+}
+
+-(void) setTurnIcon:(SDLImage *) turnIcon {
+    if (turnIcon != nil) {
+        [store setObject:turnIcon forKey:NAMES_turnIcon];
+    } else {
+        [store removeObjectForKey:NAMES_turnIcon];
+    }
+}
+
+-(SDLImage*) turnIcon {
+    NSObject* obj = [store objectForKey:NAMES_turnIcon];
+    if ([obj isKindOfClass:SDLImage.class]) {
+        return (SDLImage*)obj;
+    } else {
+        return [[[SDLImage alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnregisterAppInterface.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnregisterAppInterface.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnregisterAppInterface.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnregisterAppInterface.h
index 24feaf0..6675361 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnregisterAppInterface.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnregisterAppInterface.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLUnregisterAppInterface.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
 @interface SDLUnregisterAppInterface : SDLRPCRequest {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnregisterAppInterface.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnregisterAppInterface.m
similarity index 59%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnregisterAppInterface.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnregisterAppInterface.m
index a63a250..e3682eb 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnregisterAppInterface.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnregisterAppInterface.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLUnregisterAppInterface.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLUnregisterAppInterface.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLUnregisterAppInterface.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLUnregisterAppInterface
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnregisterAppInterfaceResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnregisterAppInterfaceResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h
index 11c382f..be336ff 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnregisterAppInterfaceResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLUnregisterAppInterfaceResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLUnregisterAppInterfaceResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnregisterAppInterfaceResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
similarity index 58%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnregisterAppInterfaceResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
index d8bab3b..e302c4f 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnregisterAppInterfaceResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLUnregisterAppInterfaceResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLUnregisterAppInterfaceResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLUnregisterAppInterfaceResponse
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnsubscribeButton.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeButton.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnsubscribeButton.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeButton.h
index 25d2ed6..af09e1e 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnsubscribeButton.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeButton.h
@@ -1,11 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLUnsubscribeButton.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
+#import <SmartDeviceLink/SDLRPCRequest.h>
 
-#import "SDLButtonName.h"
+#import <SmartDeviceLink/SDLButtonName.h>
 
 @interface SDLUnsubscribeButton : SDLRPCRequest {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnsubscribeButton.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeButton.m
similarity index 81%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnsubscribeButton.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeButton.m
index cc7e46c..1fb148c 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnsubscribeButton.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeButton.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLUnsubscribeButton.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLUnsubscribeButton.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLUnsubscribeButton.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLUnsubscribeButton
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnsubscribeButtonResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeButtonResponse.h
similarity index 54%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnsubscribeButtonResponse.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeButtonResponse.h
index 1f6d45d..d0d1982 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnsubscribeButtonResponse.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeButtonResponse.h
@@ -1,11 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLUnsubscribeButtonResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
+#import <SmartDeviceLink/SDLRPCResponse.h>
 
 @interface SDLUnsubscribeButtonResponse : SDLRPCResponse {}
 

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnsubscribeButtonResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
similarity index 58%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnsubscribeButtonResponse.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
index abf1e01..19e8a9a 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUnsubscribeButtonResponse.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLUnsubscribeButtonResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLUnsubscribeButtonResponse.h"
-#import "SDLNames.h"
+#import <SmartDeviceLink/SDLUnsubscribeButtonResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
 
 @implementation SDLUnsubscribeButtonResponse
 

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeVehicleData.h
new file mode 100644 (file)
index 0000000..e821bc4
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeVehicleData.h
@@ -0,0 +1,35 @@
+//  SDLUnsubscribeVehicleData.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+#import <SmartDeviceLink/SDLVehicleDataType.h>
+
+@interface SDLUnsubscribeVehicleData : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSNumber* gps;
+@property(assign) NSNumber* speed;
+@property(assign) NSNumber* rpm;
+@property(assign) NSNumber* fuelLevel;
+@property(assign) NSNumber* fuelLevelState;
+@property(assign) NSNumber* instantFuelConsumption;
+@property(assign) NSNumber* externalTemperature;
+@property(assign) NSNumber* prndl;
+@property(assign) NSNumber* tirePressure;
+@property(assign) NSNumber* odometer;
+@property(assign) NSNumber* beltStatus;
+@property(assign) NSNumber* bodyInformation;
+@property(assign) NSNumber* deviceStatus;
+@property(assign) NSNumber* driverBraking;
+@property(assign) NSNumber* wiperStatus;
+@property(assign) NSNumber* headLampStatus;
+@property(assign) NSNumber* engineTorque;
+@property(assign) NSNumber* accPedalPosition;
+@property(assign) NSNumber* steeringWheelAngle;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeVehicleData.m
new file mode 100644 (file)
index 0000000..a8d7315
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeVehicleData.m
@@ -0,0 +1,249 @@
+//  SDLUnsubscribeVehicleData.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLUnsubscribeVehicleData.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLUnsubscribeVehicleData
+
+-(id) init {
+    if (self = [super initWithName:NAMES_UnsubscribeVehicleData]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setGps:(NSNumber *) gps {
+    if (gps != nil) {
+        [parameters setObject:gps forKey:NAMES_gps];
+    } else {
+        [parameters removeObjectForKey:NAMES_gps];
+    }
+}
+
+-(NSNumber*) gps {
+    return [parameters objectForKey:NAMES_gps];
+}
+
+-(void) setSpeed:(NSNumber *) speed {
+    if (speed != nil) {
+        [parameters setObject:speed forKey:NAMES_speed];
+    } else {
+        [parameters removeObjectForKey:NAMES_speed];
+    }
+}
+
+-(NSNumber*) speed {
+    return [parameters objectForKey:NAMES_speed];
+}
+
+-(void) setRpm:(NSNumber *) rpm {
+    if (rpm != nil) {
+        [parameters setObject:rpm forKey:NAMES_rpm];
+    } else {
+        [parameters removeObjectForKey:NAMES_rpm];
+    }
+}
+
+-(NSNumber*) rpm {
+    return [parameters objectForKey:NAMES_rpm];
+}
+
+-(void) setFuelLevel:(NSNumber *) fuelLevel {
+    if (fuelLevel != nil) {
+        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevel];
+    }
+}
+
+-(NSNumber*) fuelLevel {
+    return [parameters objectForKey:NAMES_fuelLevel];
+}
+
+-(void) setFuelLevelState:(NSNumber *) fuelLevelState {
+    if (fuelLevelState != nil) {
+        [parameters setObject:fuelLevelState forKey:NAMES_fuelLevelState];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevelState];
+    }
+}
+
+-(NSNumber*) fuelLevelState {
+    return [parameters objectForKey:NAMES_fuelLevelState];
+}
+
+-(void) setInstantFuelConsumption:(NSNumber *) instantFuelConsumption {
+    if (instantFuelConsumption != nil) {
+        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+    } else {
+        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+    }
+}
+
+-(NSNumber*) instantFuelConsumption {
+    return [parameters objectForKey:NAMES_instantFuelConsumption];
+}
+
+-(void) setExternalTemperature:(NSNumber *) externalTemperature {
+    if (externalTemperature != nil) {
+        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+    } else {
+        [parameters removeObjectForKey:NAMES_externalTemperature];
+    }
+}
+
+-(NSNumber*) externalTemperature {
+    return [parameters objectForKey:NAMES_externalTemperature];
+}
+
+-(void) setPrndl:(NSNumber *) prndl {
+    if (prndl != nil) {
+        [parameters setObject:prndl forKey:NAMES_prndl];
+    } else {
+        [parameters removeObjectForKey:NAMES_prndl];
+    }
+}
+
+-(NSNumber*) prndl {
+    return [parameters objectForKey:NAMES_prndl];
+}
+
+-(void) setTirePressure:(NSNumber *) tirePressure {
+    if (tirePressure != nil) {
+        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+    } else {
+        [parameters removeObjectForKey:NAMES_tirePressure];
+    }
+}
+
+-(NSNumber*) tirePressure {
+    return [parameters objectForKey:NAMES_tirePressure];
+}
+
+-(void) setOdometer:(NSNumber *) odometer {
+    if (odometer != nil) {
+        [parameters setObject:odometer forKey:NAMES_odometer];
+    } else {
+        [parameters removeObjectForKey:NAMES_odometer];
+    }
+}
+
+-(NSNumber*) odometer {
+    return [parameters objectForKey:NAMES_odometer];
+}
+
+-(void) setBeltStatus:(NSNumber *) beltStatus {
+    if (beltStatus != nil) {
+        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_beltStatus];
+    }
+}
+
+-(NSNumber*) beltStatus {
+    return [parameters objectForKey:NAMES_beltStatus];
+}
+
+-(void) setBodyInformation:(NSNumber *) bodyInformation {
+    if (bodyInformation != nil) {
+        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+    } else {
+        [parameters removeObjectForKey:NAMES_bodyInformation];
+    }
+}
+
+-(NSNumber*) bodyInformation {
+    return [parameters objectForKey:NAMES_bodyInformation];
+}
+
+-(void) setDeviceStatus:(NSNumber *) deviceStatus {
+    if (deviceStatus != nil) {
+        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_deviceStatus];
+    }
+}
+
+-(NSNumber*) deviceStatus {
+    return [parameters objectForKey:NAMES_deviceStatus];
+}
+
+-(void) setDriverBraking:(NSNumber *) driverBraking {
+    if (driverBraking != nil) {
+        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+    } else {
+        [parameters removeObjectForKey:NAMES_driverBraking];
+    }
+}
+
+-(NSNumber*) driverBraking {
+    return [parameters objectForKey:NAMES_driverBraking];
+}
+
+-(void) setWiperStatus:(NSNumber *) wiperStatus {
+    if (wiperStatus != nil) {
+        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_wiperStatus];
+    }
+}
+
+-(NSNumber*) wiperStatus {
+    return [parameters objectForKey:NAMES_wiperStatus];
+}
+
+-(void) setHeadLampStatus:(NSNumber *) headLampStatus {
+    if (headLampStatus != nil) {
+        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_headLampStatus];
+    }
+}
+
+-(NSNumber*) headLampStatus {
+    return [parameters objectForKey:NAMES_headLampStatus];
+}
+
+-(void) setEngineTorque:(NSNumber *) engineTorque {
+    if (engineTorque != nil) {
+        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+    } else {
+        [parameters removeObjectForKey:NAMES_engineTorque];
+    }
+}
+
+-(NSNumber*) engineTorque {
+    return [parameters objectForKey:NAMES_engineTorque];
+}
+
+-(void) setAccPedalPosition:(NSNumber *) accPedalPosition {
+    if (accPedalPosition != nil) {
+        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+    } else {
+        [parameters removeObjectForKey:NAMES_accPedalPosition];
+    }
+}
+
+-(NSNumber*) accPedalPosition {
+    return [parameters objectForKey:NAMES_accPedalPosition];
+}
+
+-(void) setSteeringWheelAngle:(NSNumber *) steeringWheelAngle {
+    if (steeringWheelAngle != nil) {
+        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+    } else {
+        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+    }
+}
+
+-(NSNumber*) steeringWheelAngle {
+    return [parameters objectForKey:NAMES_steeringWheelAngle];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
new file mode 100644 (file)
index 0000000..eaae3ed
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
@@ -0,0 +1,35 @@
+//  SDLUnsubscribeVehicleDataResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+#import <SmartDeviceLink/SDLVehicleDataResult.h>
+
+@interface SDLUnsubscribeVehicleDataResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLVehicleDataResult* gps;
+@property(assign) SDLVehicleDataResult* speed;
+@property(assign) SDLVehicleDataResult* rpm;
+@property(assign) SDLVehicleDataResult* fuelLevel;
+@property(assign) SDLVehicleDataResult* fuelLevelState;
+@property(assign) SDLVehicleDataResult* instantFuelConsumption;
+@property(assign) SDLVehicleDataResult* externalTemperature;
+@property(assign) SDLVehicleDataResult* prndl;
+@property(assign) SDLVehicleDataResult* tirePressure;
+@property(assign) SDLVehicleDataResult* odometer;
+@property(assign) SDLVehicleDataResult* beltStatus;
+@property(assign) SDLVehicleDataResult* bodyInformation;
+@property(assign) SDLVehicleDataResult* deviceStatus;
+@property(assign) SDLVehicleDataResult* driverBraking;
+@property(assign) SDLVehicleDataResult* wiperStatus;
+@property(assign) SDLVehicleDataResult* headLampStatus;
+@property(assign) SDLVehicleDataResult* engineTorque;
+@property(assign) SDLVehicleDataResult* accPedalPosition;
+@property(assign) SDLVehicleDataResult* steeringWheelAngle;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
new file mode 100644 (file)
index 0000000..03a3176
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
@@ -0,0 +1,344 @@
+//  SDLUnsubscribeVehicleDataResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLUnsubscribeVehicleDataResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_UnsubscribeVehicleData]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setGps:(SDLVehicleDataResult *)gps {
+    if (gps != nil) {
+        [parameters setObject:gps forKey:NAMES_gps];
+    } else {
+        [parameters removeObjectForKey:NAMES_gps];
+    }
+}
+
+-(SDLVehicleDataResult*) gps {
+    NSObject* obj = [parameters objectForKey:NAMES_gps];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setSpeed:(SDLVehicleDataResult*) speed {
+    if (speed != nil) {
+        [parameters setObject:speed forKey:NAMES_speed];
+    } else {
+        [parameters removeObjectForKey:NAMES_speed];
+    }
+}
+
+-(SDLVehicleDataResult*) speed {
+    NSObject* obj = [parameters objectForKey:NAMES_speed];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setRpm:(SDLVehicleDataResult*) rpm {
+    if (rpm != nil) {
+        [parameters setObject:rpm forKey:NAMES_rpm];
+    } else {
+        [parameters removeObjectForKey:NAMES_rpm];
+    }
+}
+
+-(SDLVehicleDataResult*) rpm {
+    NSObject* obj = [parameters objectForKey:NAMES_rpm];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setFuelLevel:(SDLVehicleDataResult*) fuelLevel {
+    if (fuelLevel != nil) {
+        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevel];
+    }
+}
+
+-(SDLVehicleDataResult*) fuelLevel {
+    NSObject* obj = [parameters objectForKey:NAMES_fuelLevel];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setFuelLevelState:(SDLVehicleDataResult*) fuelLevelState {
+    if (fuelLevelState != nil) {
+        [parameters setObject:fuelLevelState forKey:NAMES_fuelLevelState];
+    } else {
+        [parameters removeObjectForKey:NAMES_fuelLevelState];
+    }
+}
+
+-(SDLVehicleDataResult*) fuelLevelState {
+    NSObject* obj = [parameters objectForKey:NAMES_fuelLevelState];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setInstantFuelConsumption:(SDLVehicleDataResult*) instantFuelConsumption {
+    if (instantFuelConsumption != nil) {
+        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
+    } else {
+        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
+    }
+}
+
+-(SDLVehicleDataResult*) instantFuelConsumption {
+    NSObject* obj = [parameters objectForKey:NAMES_instantFuelConsumption];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setExternalTemperature:(SDLVehicleDataResult*) externalTemperature {
+    if (externalTemperature != nil) {
+        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
+    } else {
+        [parameters removeObjectForKey:NAMES_externalTemperature];
+    }
+}
+
+-(SDLVehicleDataResult*) externalTemperature {
+    NSObject* obj = [parameters objectForKey:NAMES_externalTemperature];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setPrndl:(SDLVehicleDataResult*) prndl {
+    if (prndl != nil) {
+        [parameters setObject:prndl forKey:NAMES_prndl];
+    } else {
+        [parameters removeObjectForKey:NAMES_prndl];
+    }
+}
+
+-(SDLVehicleDataResult*) prndl {
+    NSObject* obj = [parameters objectForKey:NAMES_prndl];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setTirePressure:(SDLVehicleDataResult*) tirePressure {
+    if (tirePressure != nil) {
+        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
+    } else {
+        [parameters removeObjectForKey:NAMES_tirePressure];
+    }
+}
+
+-(SDLVehicleDataResult*) tirePressure {
+    NSObject* obj = [parameters objectForKey:NAMES_tirePressure];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setOdometer:(SDLVehicleDataResult*) odometer {
+    if (odometer != nil) {
+        [parameters setObject:odometer forKey:NAMES_odometer];
+    } else {
+        [parameters removeObjectForKey:NAMES_odometer];
+    }
+}
+
+-(SDLVehicleDataResult*) odometer {
+    NSObject* obj = [parameters objectForKey:NAMES_odometer];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setBeltStatus:(SDLVehicleDataResult*) beltStatus {
+    if (beltStatus != nil) {
+        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_beltStatus];
+    }
+}
+
+-(SDLVehicleDataResult*) beltStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_beltStatus];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setBodyInformation:(SDLVehicleDataResult*) bodyInformation {
+    if (bodyInformation != nil) {
+        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
+    } else {
+        [parameters removeObjectForKey:NAMES_bodyInformation];
+    }
+}
+
+-(SDLVehicleDataResult*) bodyInformation {
+    NSObject* obj = [parameters objectForKey:NAMES_bodyInformation];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setDeviceStatus:(SDLVehicleDataResult*) deviceStatus {
+    if (deviceStatus != nil) {
+        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_deviceStatus];
+    }
+}
+
+-(SDLVehicleDataResult*) deviceStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_deviceStatus];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setDriverBraking:(SDLVehicleDataResult*) driverBraking {
+    if (driverBraking != nil) {
+        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
+    } else {
+        [parameters removeObjectForKey:NAMES_driverBraking];
+    }
+}
+
+-(SDLVehicleDataResult*) driverBraking {
+    NSObject* obj = [parameters objectForKey:NAMES_driverBraking];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setWiperStatus:(SDLVehicleDataResult*) wiperStatus {
+    if (wiperStatus != nil) {
+        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_wiperStatus];
+    }
+}
+
+-(SDLVehicleDataResult*) wiperStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_wiperStatus];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setHeadLampStatus:(SDLVehicleDataResult*) headLampStatus {
+    if (headLampStatus != nil) {
+        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
+    } else {
+        [parameters removeObjectForKey:NAMES_headLampStatus];
+    }
+}
+
+-(SDLVehicleDataResult*) headLampStatus {
+    NSObject* obj = [parameters objectForKey:NAMES_headLampStatus];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setEngineTorque:(SDLVehicleDataResult*) engineTorque {
+    if (engineTorque != nil) {
+        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
+    } else {
+        [parameters removeObjectForKey:NAMES_engineTorque];
+    }
+}
+
+-(SDLVehicleDataResult*) engineTorque {
+    NSObject* obj = [parameters objectForKey:NAMES_engineTorque];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setAccPedalPosition:(SDLVehicleDataResult*) accPedalPosition {
+    if (accPedalPosition != nil) {
+        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
+    } else {
+        [parameters removeObjectForKey:NAMES_accPedalPosition];
+    }
+}
+
+-(SDLVehicleDataResult*) accPedalPosition {
+    NSObject* obj = [parameters objectForKey:NAMES_accPedalPosition];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setSteeringWheelAngle:(SDLVehicleDataResult*) steeringWheelAngle {
+    if (steeringWheelAngle != nil) {
+        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
+    } else {
+        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
+    }
+}
+
+-(SDLVehicleDataResult*) steeringWheelAngle {
+    NSObject* obj = [parameters objectForKey:NAMES_steeringWheelAngle];
+    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+        return (SDLVehicleDataResult*)obj;
+    } else {
+        return [[[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUpdateMode.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateMode.h
similarity index 64%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUpdateMode.h
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateMode.h
index 33e2872..ff43a9e 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUpdateMode.h
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateMode.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLUpdateMode.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
-#import "SDLEnum.h"
+#import <SmartDeviceLink/SDLEnum.h>
 
 @interface SDLUpdateMode : SDLEnum {}
 
@@ -14,5 +14,7 @@
 +(SDLUpdateMode*) COUNTDOWN;
 +(SDLUpdateMode*) PAUSE;
 +(SDLUpdateMode*) RESUME;
++(SDLUpdateMode*) CLEAR;
+
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUpdateMode.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateMode.m
similarity index 80%
rename from SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUpdateMode.m
rename to SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateMode.m
index 6db2850..e3d39f8 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLUpdateMode.m
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateMode.m
@@ -1,13 +1,14 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SDLUpdateMode.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
 
-#import "SDLUpdateMode.h"
+#import <SmartDeviceLink/SDLUpdateMode.h>
 
 SDLUpdateMode* SDLUpdateMode_COUNTUP = nil;
 SDLUpdateMode* SDLUpdateMode_COUNTDOWN = nil;
 SDLUpdateMode* SDLUpdateMode_PAUSE = nil;
 SDLUpdateMode* SDLUpdateMode_RESUME = nil;
+SDLUpdateMode* SDLUpdateMode_CLEAR = nil;
 
 NSMutableArray* SDLUpdateMode_values = nil;
 @implementation SDLUpdateMode
@@ -28,6 +29,7 @@ NSMutableArray* SDLUpdateMode_values = nil;
                 SDLUpdateMode.COUNTDOWN,
                 SDLUpdateMode.PAUSE,
                 SDLUpdateMode.RESUME,
+                SDLUpdateMode_CLEAR,
                 nil];
     }
     return SDLUpdateMode_values;
@@ -61,4 +63,11 @@ NSMutableArray* SDLUpdateMode_values = nil;
        return SDLUpdateMode_RESUME;
 }
 
++(SDLUpdateMode*) CLEAR {
+    if (SDLUpdateMode_CLEAR == nil) {
+        SDLUpdateMode_CLEAR = [[SDLUpdateMode alloc] initWithValue:@"CLEAR"];
+    }
+    return SDLUpdateMode_CLEAR;
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateTurnList.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateTurnList.h
new file mode 100644 (file)
index 0000000..1f13581
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateTurnList.h
@@ -0,0 +1,16 @@
+//  SDLUpdateTurnList.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+
+@interface SDLUpdateTurnList : SDLRPCRequest {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSMutableArray* turnList;
+@property(assign) NSMutableArray* softButtons;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateTurnList.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateTurnList.m
new file mode 100644 (file)
index 0000000..365a943
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateTurnList.m
@@ -0,0 +1,65 @@
+//  SDLUpdateTurnList.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLUpdateTurnList.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+#import <SmartDeviceLink/SDLSoftButton.h>
+#import <SmartDeviceLink/SDLTurn.h>
+
+@implementation SDLUpdateTurnList
+
+-(id) init {
+    if (self = [super initWithName:NAMES_UpdateTurnList]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setTurnList:(NSMutableArray *) turnList {
+    if (turnList != nil) {
+        [parameters setObject:turnList forKey:NAMES_turnList];
+    } else {
+        [parameters removeObjectForKey:NAMES_turnList];
+    }
+}
+
+-(NSMutableArray*) turnList {
+    NSMutableArray* array = [parameters objectForKey:NAMES_turnList];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTurn.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLTurn alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
+-(void) setSoftButtons:(NSMutableArray *) softButtons {
+    if (softButtons != nil) {
+        [parameters setObject:softButtons forKey:NAMES_softButtons];
+    } else {
+        [parameters removeObjectForKey:NAMES_softButtons];
+    }
+}
+
+-(NSMutableArray*) softButtons {
+    NSMutableArray* array = [parameters objectForKey:NAMES_softButtons];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
+        return array;
+    } else {
+        NSMutableArray* newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary* dict in array) {
+            [newList addObject:[[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary*)dict] autorelease]];
+        }
+        return newList;
+    }
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateTurnListResponse.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateTurnListResponse.h
new file mode 100644 (file)
index 0000000..6794c1c
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateTurnListResponse.h
@@ -0,0 +1,13 @@
+//  SDLUpdateTurnListResponse.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+
+@interface SDLUpdateTurnListResponse : SDLRPCResponse {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateTurnListResponse.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateTurnListResponse.m
new file mode 100644 (file)
index 0000000..a18d318
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLUpdateTurnListResponse.m
@@ -0,0 +1,21 @@
+//  SDLUpdateTurnListResponse.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLUpdateTurnListResponse.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLUpdateTurnListResponse
+
+-(id) init {
+    if (self = [super initWithName:NAMES_AlertManeuver]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataActiveStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataActiveStatus.h
new file mode 100644 (file)
index 0000000..a38daa6
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataActiveStatus.h
@@ -0,0 +1,21 @@
+//  SDLVehicleDataActiveStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLVehicleDataActiveStatus : SDLEnum {}
+
++(SDLVehicleDataActiveStatus*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLVehicleDataActiveStatus*) INACTIVE_NOT_CONFIRMED;
++(SDLVehicleDataActiveStatus*) INACTIVE_CONFIRMED;
++(SDLVehicleDataActiveStatus*) ACTIVE_NOT_CONFIRMED;
++(SDLVehicleDataActiveStatus*) ACTIVE_CONFIRMED;
++(SDLVehicleDataActiveStatus*) FAULT;
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataActiveStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataActiveStatus.m
new file mode 100644 (file)
index 0000000..7058c28
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataActiveStatus.m
@@ -0,0 +1,76 @@
+//  SDLVehicleDataActiveStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLVehicleDataActiveStatus.h>
+
+SDLVehicleDataActiveStatus* SDLVehicleDataActiveStatus_INACTIVE_NOT_CONFIRMED = nil;
+SDLVehicleDataActiveStatus* SDLVehicleDataActiveStatus_INACTIVE_CONFIRMED = nil;
+SDLVehicleDataActiveStatus* SDLVehicleDataActiveStatus_ACTIVE_NOT_CONFIRMED = nil;
+SDLVehicleDataActiveStatus* SDLVehicleDataActiveStatus_ACTIVE_CONFIRMED = nil;
+SDLVehicleDataActiveStatus* SDLVehicleDataActiveStatus_FAULT = nil;
+
+NSMutableArray* SDLVehicleDataActiveStatus_values = nil; 
+
+@implementation SDLVehicleDataActiveStatus
+
++(SDLVehicleDataActiveStatus*) valueOf:(NSString*) value {                       
+       for (SDLVehicleDataActiveStatus* item in SDLVehicleDataActiveStatus.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLVehicleDataActiveStatus_values == nil) {                               
+               SDLVehicleDataActiveStatus_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLVehicleDataActiveStatus.INACTIVE_NOT_CONFIRMED,
+                                    SDLVehicleDataActiveStatus.INACTIVE_CONFIRMED,
+                                    SDLVehicleDataActiveStatus.ACTIVE_NOT_CONFIRMED,
+                                    SDLVehicleDataActiveStatus.ACTIVE_CONFIRMED,
+                                    SDLVehicleDataActiveStatus.FAULT,
+                                                                       nil];
+       } 
+       return SDLVehicleDataActiveStatus_values; 
+}
+
++(SDLVehicleDataActiveStatus*) INACTIVE_NOT_CONFIRMED {
+       if (SDLVehicleDataActiveStatus_INACTIVE_NOT_CONFIRMED == nil) {
+               SDLVehicleDataActiveStatus_INACTIVE_NOT_CONFIRMED = [[SDLVehicleDataActiveStatus alloc] initWithValue:@"INACTIVE_NOT_CONFIRMED"];
+       } 
+       return SDLVehicleDataActiveStatus_INACTIVE_NOT_CONFIRMED;  
+}
+
++(SDLVehicleDataActiveStatus*) INACTIVE_CONFIRMED {
+       if (SDLVehicleDataActiveStatus_INACTIVE_CONFIRMED == nil) {
+               SDLVehicleDataActiveStatus_INACTIVE_CONFIRMED = [[SDLVehicleDataActiveStatus alloc] initWithValue:@"INACTIVE_CONFIRMED"];
+       }
+       return SDLVehicleDataActiveStatus_INACTIVE_CONFIRMED;
+}
+
++(SDLVehicleDataActiveStatus*) ACTIVE_NOT_CONFIRMED {
+       if (SDLVehicleDataActiveStatus_ACTIVE_NOT_CONFIRMED == nil) {
+               SDLVehicleDataActiveStatus_ACTIVE_NOT_CONFIRMED = [[SDLVehicleDataActiveStatus alloc] initWithValue:@"ACTIVE_NOT_CONFIRMED"];
+       }
+       return SDLVehicleDataActiveStatus_ACTIVE_NOT_CONFIRMED;
+}
+
++(SDLVehicleDataActiveStatus*) ACTIVE_CONFIRMED {
+       if (SDLVehicleDataActiveStatus_ACTIVE_CONFIRMED == nil) {
+               SDLVehicleDataActiveStatus_ACTIVE_CONFIRMED = [[SDLVehicleDataActiveStatus alloc] initWithValue:@"ACTIVE_CONFIRMED"];
+       }
+       return SDLVehicleDataActiveStatus_ACTIVE_CONFIRMED;
+}
+
++(SDLVehicleDataActiveStatus*) FAULT {
+       if (SDLVehicleDataActiveStatus_FAULT == nil) {
+               SDLVehicleDataActiveStatus_FAULT = [[SDLVehicleDataActiveStatus alloc] initWithValue:@"FAULT"];
+       }
+       return SDLVehicleDataActiveStatus_FAULT;
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataEventStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataEventStatus.h
new file mode 100644 (file)
index 0000000..fe8b4e4
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataEventStatus.h
@@ -0,0 +1,21 @@
+//  SDLVehicleDataEventStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLVehicleDataEventStatus : SDLEnum {}
+
++(SDLVehicleDataEventStatus*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLVehicleDataEventStatus*) NO_EVENT;
++(SDLVehicleDataEventStatus*) _NO;
++(SDLVehicleDataEventStatus*) _YES;
++(SDLVehicleDataEventStatus*) NOT_SUPPORTED;
++(SDLVehicleDataEventStatus*) FAULT;
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataEventStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataEventStatus.m
new file mode 100644 (file)
index 0000000..c1fb6ed
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataEventStatus.m
@@ -0,0 +1,75 @@
+//  SDLVehicleDataEventStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLVehicleDataEventStatus.h>   
+
+SDLVehicleDataEventStatus* SDLVehicleDataEventStatus_NO_EVENT = nil;
+SDLVehicleDataEventStatus* SDLVehicleDataEventStatus_NO = nil;
+SDLVehicleDataEventStatus* SDLVehicleDataEventStatus_YES = nil;
+SDLVehicleDataEventStatus* SDLVehicleDataEventStatus_NOT_SUPPORTED = nil;
+SDLVehicleDataEventStatus* SDLVehicleDataEventStatus_FAULT = nil;
+
+NSMutableArray* SDLVehicleDataEventStatus_values = nil; 
+
+@implementation SDLVehicleDataEventStatus
+
++(SDLVehicleDataEventStatus*) valueOf:(NSString*) value {                       
+       for (SDLVehicleDataEventStatus* item in SDLVehicleDataEventStatus.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLVehicleDataEventStatus_values == nil) {                               
+               SDLVehicleDataEventStatus_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLVehicleDataEventStatus.NO_EVENT,
+                                    SDLVehicleDataEventStatus._NO,
+                                    SDLVehicleDataEventStatus._YES,
+                                    SDLVehicleDataEventStatus.NOT_SUPPORTED,
+                                    SDLVehicleDataEventStatus.FAULT,
+                                                                       nil];
+       } 
+       return SDLVehicleDataEventStatus_values; 
+}
+
++(SDLVehicleDataEventStatus*) NO_EVENT {
+       if (SDLVehicleDataEventStatus_NO_EVENT == nil) {
+               SDLVehicleDataEventStatus_NO_EVENT = [[SDLVehicleDataEventStatus alloc] initWithValue:@"NO_EVENT"];
+       } 
+       return SDLVehicleDataEventStatus_NO_EVENT;  
+}
+
++(SDLVehicleDataEventStatus*) _NO {
+       if (SDLVehicleDataEventStatus_NO == nil) {
+               SDLVehicleDataEventStatus_NO = [[SDLVehicleDataEventStatus alloc] initWithValue:@"NO"];
+       }
+       return SDLVehicleDataEventStatus_NO;
+}
+
++(SDLVehicleDataEventStatus*) _YES {
+       if (SDLVehicleDataEventStatus_YES == nil) {
+               SDLVehicleDataEventStatus_YES = [[SDLVehicleDataEventStatus alloc] initWithValue:@"YES"];
+       }
+       return SDLVehicleDataEventStatus_YES;
+}
+
++(SDLVehicleDataEventStatus*) NOT_SUPPORTED {
+       if (SDLVehicleDataEventStatus_NOT_SUPPORTED == nil) {
+               SDLVehicleDataEventStatus_NOT_SUPPORTED = [[SDLVehicleDataEventStatus alloc] initWithValue:@"NOT_SUPPORTED"];
+       }
+       return SDLVehicleDataEventStatus_NOT_SUPPORTED;
+}
+
++(SDLVehicleDataEventStatus*) FAULT {
+       if (SDLVehicleDataEventStatus_FAULT == nil) {
+               SDLVehicleDataEventStatus_FAULT = [[SDLVehicleDataEventStatus alloc] initWithValue:@"FAULT"];
+       }
+       return SDLVehicleDataEventStatus_FAULT;
+}
+
+@end
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataNotificationStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataNotificationStatus.h
new file mode 100644 (file)
index 0000000..9753dea
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataNotificationStatus.h
@@ -0,0 +1,19 @@
+//  SDLVehicleDataNotificationStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLVehicleDataNotificationStatus : SDLEnum {}
+
++(SDLVehicleDataNotificationStatus*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLVehicleDataNotificationStatus*) NOT_SUPPORTED;
++(SDLVehicleDataNotificationStatus*) NORMAL;
++(SDLVehicleDataNotificationStatus*) ACTIVE;
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataNotificationStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataNotificationStatus.m
new file mode 100644 (file)
index 0000000..ac05940
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataNotificationStatus.m
@@ -0,0 +1,58 @@
+//  SDLVehicleDataNotificationStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLVehicleDataNotificationStatus.h>   
+
+SDLVehicleDataNotificationStatus* SDLVehicleDataNotificationStatus_NOT_SUPPORTED = nil;
+SDLVehicleDataNotificationStatus* SDLVehicleDataNotificationStatus_NORMAL = nil;
+SDLVehicleDataNotificationStatus* SDLVehicleDataNotificationStatus_ACTIVE = nil;
+
+NSMutableArray* SDLVehicleDataNotificationStatus_values = nil; 
+
+@implementation SDLVehicleDataNotificationStatus
+
++(SDLVehicleDataNotificationStatus*) valueOf:(NSString*) value {                       
+       for (SDLVehicleDataNotificationStatus* item in SDLVehicleDataNotificationStatus.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLVehicleDataNotificationStatus_values == nil) {                               
+               SDLVehicleDataNotificationStatus_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLVehicleDataNotificationStatus.NOT_SUPPORTED,
+                                    SDLVehicleDataNotificationStatus.NORMAL,
+                                    SDLVehicleDataNotificationStatus.ACTIVE,
+                                                                       nil];                        
+       } 
+       return SDLVehicleDataNotificationStatus_values; 
+}
+
++(SDLVehicleDataNotificationStatus*) NOT_SUPPORTED {
+       if (SDLVehicleDataNotificationStatus_NOT_SUPPORTED == nil) {
+               SDLVehicleDataNotificationStatus_NOT_SUPPORTED = [[SDLVehicleDataNotificationStatus alloc] initWithValue:@"NOT_SUPPORTED"];
+       } 
+       return SDLVehicleDataNotificationStatus_NOT_SUPPORTED;  
+}
+
++(SDLVehicleDataNotificationStatus*) NORMAL {
+       if (SDLVehicleDataNotificationStatus_NORMAL == nil) {
+               SDLVehicleDataNotificationStatus_NORMAL = [[SDLVehicleDataNotificationStatus alloc] initWithValue:@"NORMAL"];
+       }
+       return SDLVehicleDataNotificationStatus_NORMAL;
+}
+
++(SDLVehicleDataNotificationStatus*) ACTIVE {
+       if (SDLVehicleDataNotificationStatus_ACTIVE == nil) {
+               SDLVehicleDataNotificationStatus_ACTIVE = [[SDLVehicleDataNotificationStatus alloc] initWithValue:@"ACTIVE"];
+       }
+       return SDLVehicleDataNotificationStatus_ACTIVE;
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataResult.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataResult.h
new file mode 100644 (file)
index 0000000..6161249
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataResult.h
@@ -0,0 +1,19 @@
+//  SDLVehicleDataResult.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLVehicleDataType.h>
+#import <SmartDeviceLink/SDLVehicleDataResultCode.h>
+
+@interface SDLVehicleDataResult : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) SDLVehicleDataType* dataType;
+@property(assign) SDLVehicleDataResultCode* resultCode;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataResult.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataResult.m
new file mode 100644 (file)
index 0000000..74dd282
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataResult.m
@@ -0,0 +1,45 @@
+//  SDLVehicleDataResult.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLVehicleDataResult.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLVehicleDataResult
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setDataType:(SDLVehicleDataType*) dataType {
+    if (dataType != nil) {
+        [store setObject:dataType forKey:NAMES_dataType];
+    } else {
+        [store removeObjectForKey:NAMES_dataType];
+    }
+}
+
+-(SDLVehicleDataType*) dataType {
+    return [store objectForKey:NAMES_dataType];
+}
+
+-(void) setResultCode:(SDLVehicleDataResultCode*) resultCode {
+    if (resultCode != nil) {
+        [store setObject:resultCode forKey:NAMES_resultCode];
+    } else {
+        [store removeObjectForKey:NAMES_resultCode];
+    }
+}
+
+-(SDLVehicleDataResultCode*) resultCode {
+    return [store objectForKey:NAMES_resultCode];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataResultCode.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataResultCode.h
new file mode 100644 (file)
index 0000000..fa9ea11
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataResultCode.h
@@ -0,0 +1,24 @@
+//  SDLVehicleDataResultCode.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLVehicleDataResultCode : SDLEnum {}
+
++(SDLVehicleDataResultCode*) valueOf:(NSString*) value;
++(NSMutableArray*) values;                                 
+
++(SDLVehicleDataResultCode*) SUCCESS;
++(SDLVehicleDataResultCode*) DISALLOWED;
++(SDLVehicleDataResultCode*) USER_DISALLOWED;
++(SDLVehicleDataResultCode*) INVALID_ID;
++(SDLVehicleDataResultCode*) VEHICLE_DATA_NOT_AVAILABLE;
++(SDLVehicleDataResultCode*) DATA_ALREADY_SUBSCRIBED;
++(SDLVehicleDataResultCode*) DATA_NOT_SUBSCRIBED;
++(SDLVehicleDataResultCode*) IGNORED;
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataResultCode.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataResultCode.m
new file mode 100644 (file)
index 0000000..1b0759e
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataResultCode.m
@@ -0,0 +1,103 @@
+//  SDLVehicleDataResultCode.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLVehicleDataResultCode.h>   
+
+SDLVehicleDataResultCode* SDLVehicleDataResultCode_SUCCESS = nil;
+SDLVehicleDataResultCode* SDLVehicleDataResultCode_DISALLOWED = nil;
+SDLVehicleDataResultCode* SDLVehicleDataResultCode_USER_DISALLOWED = nil;
+SDLVehicleDataResultCode* SDLVehicleDataResultCode_INVALID_ID = nil;
+SDLVehicleDataResultCode* SDLVehicleDataResultCode_VEHICLE_DATA_NOT_AVAILABLE = nil;
+SDLVehicleDataResultCode* SDLVehicleDataResultCode_DATA_ALREADY_SUBSCRIBED = nil;
+SDLVehicleDataResultCode* SDLVehicleDataResultCode_DATA_NOT_SUBSCRIBED = nil;
+SDLVehicleDataResultCode* SDLVehicleDataResultCode_IGNORED = nil;
+
+NSMutableArray* SDLVehicleDataResultCode_values = nil; 
+
+@implementation SDLVehicleDataResultCode
+
++(SDLVehicleDataResultCode*) valueOf:(NSString*) value {                       
+       for (SDLVehicleDataResultCode* item in SDLVehicleDataResultCode.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLVehicleDataResultCode_values == nil) {                               
+               SDLVehicleDataResultCode_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLVehicleDataResultCode.SUCCESS,
+                                    SDLVehicleDataResultCode.DISALLOWED,
+                                    SDLVehicleDataResultCode.USER_DISALLOWED,
+                                    SDLVehicleDataResultCode.INVALID_ID,
+                                    SDLVehicleDataResultCode.VEHICLE_DATA_NOT_AVAILABLE,
+                                    SDLVehicleDataResultCode.DATA_ALREADY_SUBSCRIBED,
+                                    SDLVehicleDataResultCode.DATA_NOT_SUBSCRIBED,
+                                    SDLVehicleDataResultCode.IGNORED,
+                                                                       nil];
+       } 
+       return SDLVehicleDataResultCode_values; 
+}
+
++(SDLVehicleDataResultCode*) SUCCESS {                                                                         
+       if (SDLVehicleDataResultCode_SUCCESS == nil) {
+               SDLVehicleDataResultCode_SUCCESS = [[SDLVehicleDataResultCode alloc] initWithValue:@"SUCCESS"];
+       } 
+       return SDLVehicleDataResultCode_SUCCESS;  
+}
+
++(SDLVehicleDataResultCode*) DISALLOWED {
+       if (SDLVehicleDataResultCode_DISALLOWED == nil) {
+               SDLVehicleDataResultCode_DISALLOWED = [[SDLVehicleDataResultCode alloc] initWithValue:@"DISALLOWED"];
+       }
+       return SDLVehicleDataResultCode_DISALLOWED;
+}
+
++(SDLVehicleDataResultCode*) USER_DISALLOWED {
+       if (SDLVehicleDataResultCode_USER_DISALLOWED == nil) {
+               SDLVehicleDataResultCode_USER_DISALLOWED = [[SDLVehicleDataResultCode alloc] initWithValue:@"USER_DISALLOWED"];
+       }
+       return SDLVehicleDataResultCode_USER_DISALLOWED;
+}
+
++(SDLVehicleDataResultCode*) INVALID_ID {
+       if (SDLVehicleDataResultCode_INVALID_ID == nil) {
+               SDLVehicleDataResultCode_INVALID_ID = [[SDLVehicleDataResultCode alloc] initWithValue:@"INVALID_ID"];
+       }
+       return SDLVehicleDataResultCode_INVALID_ID;
+}
+
++(SDLVehicleDataResultCode*) VEHICLE_DATA_NOT_AVAILABLE {
+       if (SDLVehicleDataResultCode_VEHICLE_DATA_NOT_AVAILABLE == nil) {
+               SDLVehicleDataResultCode_VEHICLE_DATA_NOT_AVAILABLE = [[SDLVehicleDataResultCode alloc] initWithValue:@"VEHICLE_DATA_NOT_AVAILABLE"];
+       }
+       return SDLVehicleDataResultCode_VEHICLE_DATA_NOT_AVAILABLE;
+}
+
++(SDLVehicleDataResultCode*) DATA_ALREADY_SUBSCRIBED {
+       if (SDLVehicleDataResultCode_DATA_ALREADY_SUBSCRIBED == nil) {
+               SDLVehicleDataResultCode_DATA_ALREADY_SUBSCRIBED = [[SDLVehicleDataResultCode alloc] initWithValue:@"DATA_ALREADY_SUBSCRIBED"];
+       }
+       return SDLVehicleDataResultCode_DATA_ALREADY_SUBSCRIBED;
+}
+
++(SDLVehicleDataResultCode*) DATA_NOT_SUBSCRIBED {
+       if (SDLVehicleDataResultCode_DATA_NOT_SUBSCRIBED == nil) {
+               SDLVehicleDataResultCode_DATA_NOT_SUBSCRIBED = [[SDLVehicleDataResultCode alloc] initWithValue:@"DATA_NOT_SUBSCRIBED"];
+       }
+       return SDLVehicleDataResultCode_DATA_NOT_SUBSCRIBED;
+}
+
++(SDLVehicleDataResultCode*) IGNORED {
+       if (SDLVehicleDataResultCode_IGNORED == nil) {
+               SDLVehicleDataResultCode_IGNORED = [[SDLVehicleDataResultCode alloc] initWithValue:@"IGNORED"];
+       }
+       return SDLVehicleDataResultCode_IGNORED;
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataStatus.h
new file mode 100644 (file)
index 0000000..3626314
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataStatus.h
@@ -0,0 +1,17 @@
+//  SDLVehicleDataStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLVehicleDataStatus : SDLEnum {}
+
++(SDLVehicleDataStatus*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLVehicleDataStatus*) NO_DATA_EXISTS;
++(SDLVehicleDataStatus*) OFF;
++(SDLVehicleDataStatus*) ON;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataStatus.m
new file mode 100644 (file)
index 0000000..73618fc
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataStatus.m
@@ -0,0 +1,58 @@
+//  SDLVehicleDataStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLVehicleDataStatus.h>
+
+SDLVehicleDataStatus* SDLVehicleDataStatus_NO_DATA_EXISTS = nil;
+SDLVehicleDataStatus* SDLVehicleDataStatus_OFF = nil;
+SDLVehicleDataStatus* SDLVehicleDataStatus_ON = nil;
+
+NSMutableArray* SDLVehicleDataStatus_values = nil; 
+
+@implementation SDLVehicleDataStatus
+
++(SDLVehicleDataStatus*) valueOf:(NSString*) value {                       
+       for (SDLVehicleDataStatus* item in SDLVehicleDataStatus.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLVehicleDataStatus_values == nil) {                               
+               SDLVehicleDataStatus_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLVehicleDataStatus.NO_DATA_EXISTS,
+                                    SDLVehicleDataStatus.OFF,
+                                    SDLVehicleDataStatus.ON,
+                                                                       nil];
+       } 
+       return SDLVehicleDataStatus_values; 
+}
+
++(SDLVehicleDataStatus*) NO_DATA_EXISTS {
+       if (SDLVehicleDataStatus_NO_DATA_EXISTS == nil) {
+               SDLVehicleDataStatus_NO_DATA_EXISTS = [[SDLVehicleDataStatus alloc] initWithValue:@"NO_DATA_EXISTS"];
+       } 
+       return SDLVehicleDataStatus_NO_DATA_EXISTS;  
+}
+
++(SDLVehicleDataStatus*) OFF {
+       if (SDLVehicleDataStatus_OFF == nil) {
+               SDLVehicleDataStatus_OFF = [[SDLVehicleDataStatus alloc] initWithValue:@"OFF"];
+       }
+       return SDLVehicleDataStatus_OFF;
+}
+
++(SDLVehicleDataStatus*) ON {
+       if (SDLVehicleDataStatus_ON == nil) {
+               SDLVehicleDataStatus_ON = [[SDLVehicleDataStatus alloc] initWithValue:@"ON"];
+       }
+       return SDLVehicleDataStatus_ON;
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataType.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataType.h
new file mode 100644 (file)
index 0000000..f4cc19d
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataType.h
@@ -0,0 +1,37 @@
+//  SDLVehicleDataType.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLVehicleDataType : SDLEnum {}
+
++(SDLVehicleDataType*) valueOf:(NSString*) value;
++(NSMutableArray*) values;                                 
+
++(SDLVehicleDataType*) VEHICLEDATA_GPS;
++(SDLVehicleDataType*) VEHICLEDATA_SPEED;
++(SDLVehicleDataType*) VEHICLEDATA_RPM;
++(SDLVehicleDataType*) VEHICLEDATA_FUELLEVEL;
++(SDLVehicleDataType*) VEHICLEDATA_FUELLEVEL_STATE;
++(SDLVehicleDataType*) VEHICLEDATA_FUELCONSUMPTION;
++(SDLVehicleDataType*) VEHICLEDATA_EXTERNTEMP;
++(SDLVehicleDataType*) VEHICLEDATA_VIN;
++(SDLVehicleDataType*) VEHICLEDATA_PRNDL;
++(SDLVehicleDataType*) VEHICLEDATA_TIREPRESSURE;
++(SDLVehicleDataType*) VEHICLEDATA_ODOMETER;
++(SDLVehicleDataType*) VEHICLEDATA_BELTSTATUS;
++(SDLVehicleDataType*) VEHICLEDATA_BODYINFO;
++(SDLVehicleDataType*) VEHICLEDATA_DEVICESTATUS;
++(SDLVehicleDataType*) VEHICLEDATA_BRAKING;
++(SDLVehicleDataType*) VEHICLEDATA_WIPERSTATUS;
++(SDLVehicleDataType*) VEHICLEDATA_HEADLAMPSTATUS;
++(SDLVehicleDataType*) VEHICLEDATA_BATTVOLTAGE;
++(SDLVehicleDataType*) VEHICLEDATA_ENGINETORQUE;
++(SDLVehicleDataType*) VEHICLEDATA_ACCPEDAL;
++(SDLVehicleDataType*) VEHICLEDATA_STEERINGWHEEL;
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataType.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataType.m
new file mode 100644 (file)
index 0000000..3301668
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleDataType.m
@@ -0,0 +1,220 @@
+//  SDLVehicleDataType.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLVehicleDataType.h>   
+
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_GPS = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_SPEED = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_RPM = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_FUELLEVEL = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_FUELLEVEL_STATE = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_FUELCONSUMPTION = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_EXTERNTEMP = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_VIN = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_PRNDL = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_TIREPRESSURE = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_ODOMETER = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_BELTSTATUS = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_BODYINFO = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_DEVICESTATUS = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_BRAKING = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_WIPERSTATUS = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_HEADLAMPSTATUS = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_BATTVOLTAGE = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_ENGINETORQUE = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_ACCPEDAL = nil;
+SDLVehicleDataType* SDLVehicleDataType_VEHICLEDATA_STEERINGWHEEL = nil;
+
+NSMutableArray* SDLVehicleDataType_values = nil; 
+
+@implementation SDLVehicleDataType
+
++(SDLVehicleDataType*) valueOf:(NSString*) value {                       
+       for (SDLVehicleDataType* item in SDLVehicleDataType.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLVehicleDataType_values == nil) {                               
+               SDLVehicleDataType_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLVehicleDataType.VEHICLEDATA_GPS,
+                                    SDLVehicleDataType.VEHICLEDATA_SPEED,
+                                    SDLVehicleDataType.VEHICLEDATA_RPM,
+                                    SDLVehicleDataType.VEHICLEDATA_FUELLEVEL,
+                                    SDLVehicleDataType.VEHICLEDATA_FUELLEVEL_STATE,
+                                    SDLVehicleDataType.VEHICLEDATA_FUELCONSUMPTION,
+                                    SDLVehicleDataType.VEHICLEDATA_EXTERNTEMP,
+                                    SDLVehicleDataType.VEHICLEDATA_VIN,
+                                    SDLVehicleDataType.VEHICLEDATA_PRNDL,
+                                    SDLVehicleDataType.VEHICLEDATA_TIREPRESSURE,
+                                    SDLVehicleDataType.VEHICLEDATA_ODOMETER,
+                                    SDLVehicleDataType.VEHICLEDATA_BELTSTATUS,
+                                    SDLVehicleDataType.VEHICLEDATA_BODYINFO,
+                                    SDLVehicleDataType.VEHICLEDATA_DEVICESTATUS,
+                                    SDLVehicleDataType.VEHICLEDATA_BRAKING,
+                                    SDLVehicleDataType.VEHICLEDATA_WIPERSTATUS,
+                                    SDLVehicleDataType.VEHICLEDATA_HEADLAMPSTATUS,
+                                    SDLVehicleDataType.VEHICLEDATA_BATTVOLTAGE,
+                                    SDLVehicleDataType.VEHICLEDATA_ENGINETORQUE,
+                                    SDLVehicleDataType.VEHICLEDATA_ACCPEDAL,
+                                    SDLVehicleDataType.VEHICLEDATA_STEERINGWHEEL,
+                                                                       nil];
+       } 
+       return SDLVehicleDataType_values;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_GPS {
+       if (SDLVehicleDataType_VEHICLEDATA_GPS == nil) {
+               SDLVehicleDataType_VEHICLEDATA_GPS = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_GPS"];
+       } 
+       return SDLVehicleDataType_VEHICLEDATA_GPS;  
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_SPEED {
+       if (SDLVehicleDataType_VEHICLEDATA_SPEED == nil) {
+               SDLVehicleDataType_VEHICLEDATA_SPEED = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_SPEED"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_SPEED;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_RPM {
+       if (SDLVehicleDataType_VEHICLEDATA_RPM == nil) {
+               SDLVehicleDataType_VEHICLEDATA_RPM = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_RPM"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_RPM;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_FUELLEVEL {
+       if (SDLVehicleDataType_VEHICLEDATA_FUELLEVEL == nil) {
+               SDLVehicleDataType_VEHICLEDATA_FUELLEVEL = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_FUELLEVEL"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_FUELLEVEL;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_FUELLEVEL_STATE {
+       if (SDLVehicleDataType_VEHICLEDATA_FUELLEVEL_STATE == nil) {
+               SDLVehicleDataType_VEHICLEDATA_FUELLEVEL_STATE = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_FUELLEVEL_STATE"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_FUELLEVEL_STATE;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_FUELCONSUMPTION {
+       if (SDLVehicleDataType_VEHICLEDATA_FUELCONSUMPTION == nil) {
+               SDLVehicleDataType_VEHICLEDATA_FUELCONSUMPTION = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_FUELCONSUMPTION"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_FUELCONSUMPTION;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_EXTERNTEMP {
+       if (SDLVehicleDataType_VEHICLEDATA_EXTERNTEMP == nil) {
+               SDLVehicleDataType_VEHICLEDATA_EXTERNTEMP = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_EXTERNTEMP"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_EXTERNTEMP;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_VIN {
+       if (SDLVehicleDataType_VEHICLEDATA_VIN == nil) {
+               SDLVehicleDataType_VEHICLEDATA_VIN = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_VIN"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_VIN;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_PRNDL {
+       if (SDLVehicleDataType_VEHICLEDATA_PRNDL == nil) {
+               SDLVehicleDataType_VEHICLEDATA_PRNDL = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_PRNDL"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_PRNDL;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_TIREPRESSURE {
+       if (SDLVehicleDataType_VEHICLEDATA_TIREPRESSURE == nil) {
+               SDLVehicleDataType_VEHICLEDATA_TIREPRESSURE = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_TIREPRESSURE"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_TIREPRESSURE;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_ODOMETER {
+       if (SDLVehicleDataType_VEHICLEDATA_ODOMETER == nil) {
+               SDLVehicleDataType_VEHICLEDATA_ODOMETER = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_ODOMETER"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_ODOMETER;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_BELTSTATUS {
+       if (SDLVehicleDataType_VEHICLEDATA_BELTSTATUS == nil) {
+               SDLVehicleDataType_VEHICLEDATA_BELTSTATUS = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_BELTSTATUS"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_BELTSTATUS;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_BODYINFO {
+       if (SDLVehicleDataType_VEHICLEDATA_BODYINFO == nil) {
+               SDLVehicleDataType_VEHICLEDATA_BODYINFO = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_BODYINFO"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_BODYINFO;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_DEVICESTATUS {
+       if (SDLVehicleDataType_VEHICLEDATA_DEVICESTATUS == nil) {
+               SDLVehicleDataType_VEHICLEDATA_DEVICESTATUS = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_DEVICESTATUS"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_DEVICESTATUS;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_BRAKING {
+       if (SDLVehicleDataType_VEHICLEDATA_BRAKING == nil) {
+               SDLVehicleDataType_VEHICLEDATA_BRAKING = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_BRAKING"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_BRAKING;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_WIPERSTATUS {
+       if (SDLVehicleDataType_VEHICLEDATA_WIPERSTATUS == nil) {
+               SDLVehicleDataType_VEHICLEDATA_WIPERSTATUS = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_WIPERSTATUS"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_WIPERSTATUS;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_HEADLAMPSTATUS {
+       if (SDLVehicleDataType_VEHICLEDATA_HEADLAMPSTATUS == nil) {
+               SDLVehicleDataType_VEHICLEDATA_HEADLAMPSTATUS = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_HEADLAMPSTATUS"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_HEADLAMPSTATUS;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_BATTVOLTAGE {
+       if (SDLVehicleDataType_VEHICLEDATA_BATTVOLTAGE == nil) {
+               SDLVehicleDataType_VEHICLEDATA_BATTVOLTAGE = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_BATTVOLTAGE"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_BATTVOLTAGE;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_ENGINETORQUE {
+       if (SDLVehicleDataType_VEHICLEDATA_ENGINETORQUE == nil) {
+               SDLVehicleDataType_VEHICLEDATA_ENGINETORQUE = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_ENGINETORQUE"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_ENGINETORQUE;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_ACCPEDAL {
+       if (SDLVehicleDataType_VEHICLEDATA_ACCPEDAL == nil) {
+               SDLVehicleDataType_VEHICLEDATA_ACCPEDAL = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_ACCPEDAL"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_ACCPEDAL;
+}
+
++(SDLVehicleDataType*) VEHICLEDATA_STEERINGWHEEL {
+       if (SDLVehicleDataType_VEHICLEDATA_STEERINGWHEEL == nil) {
+               SDLVehicleDataType_VEHICLEDATA_STEERINGWHEEL = [[SDLVehicleDataType alloc] initWithValue:@"VEHICLEDATA_STEERINGWHEEL"];
+       }
+       return SDLVehicleDataType_VEHICLEDATA_STEERINGWHEEL;
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleType.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleType.h
new file mode 100644 (file)
index 0000000..9f6f892
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleType.h
@@ -0,0 +1,18 @@
+//  SDLVehicleType.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+@interface SDLVehicleType : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSString* make;
+@property(assign) NSString* model;
+@property(assign) NSString* modelYear;
+@property(assign) NSString* trim;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleType.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleType.m
new file mode 100644 (file)
index 0000000..b5ce34e
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVehicleType.m
@@ -0,0 +1,69 @@
+//  SDLVehicleType.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLVehicleType.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLVehicleType
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setMake:(NSString *) make {
+    if (make != nil) {
+        [store setObject:make forKey:NAMES_make];
+    } else {
+        [store removeObjectForKey:NAMES_make];
+    }
+}
+
+-(NSString*) make {
+    return [store objectForKey:NAMES_make];
+}
+
+-(void) setModel:(NSString *) model {
+    if (model != nil) {
+        [store setObject:model forKey:NAMES_model];
+    } else {
+        [store removeObjectForKey:NAMES_model];
+    }
+}
+
+-(NSString*) model {
+    return [store objectForKey:NAMES_model];
+}
+
+-(void) setModelYear:(NSString *) modelYear {
+    if (modelYear != nil) {
+        [store setObject:modelYear forKey:NAMES_modelYear];
+    } else {
+        [store removeObjectForKey:NAMES_modelYear];
+    }
+}
+
+-(NSString*) modelYear {
+    return [store objectForKey:NAMES_modelYear];
+}
+
+-(void) setTrim:(NSString *) trim {
+    if (trim != nil) {
+        [store setObject:trim forKey:NAMES_trim];
+    } else {
+        [store removeObjectForKey:NAMES_trim];
+    }
+}
+
+-(NSString*) trim {
+    return [store objectForKey:NAMES_trim];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVrCapabilities.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVrCapabilities.h
new file mode 100644 (file)
index 0000000..4515aaa
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVrCapabilities.h
@@ -0,0 +1,15 @@
+//  SDLVrCapabilities.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLEnum.h>
+
+@interface SDLVrCapabilities : SDLEnum {}
+
++(SDLVrCapabilities*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLVrCapabilities*) TEXT;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVrCapabilities.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVrCapabilities.m
new file mode 100644 (file)
index 0000000..1b23771
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVrCapabilities.m
@@ -0,0 +1,41 @@
+//  SDLVrCapabilities.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLVrCapabilities.h>
+
+SDLVrCapabilities* SDLVrCapabilities_TEXT = nil;
+
+NSMutableArray* SDLVrCapabilities_values = nil;
+@implementation SDLVrCapabilities
+
++(SDLVrCapabilities*) valueOf:(NSString*) value {
+    for (SDLVrCapabilities* item in SDLVrCapabilities.values) {
+        //NOTE: This was added for Sync Module Compatability, V1 module resturns "Text" and a
+        //      Gen 1.1 module returns "TEXT", the new if statement makes a case insensitive
+        //      check instead to accept both
+        //if ([item.value isEqualToString:value]) {
+        if (item.value && [item.value caseInsensitiveCompare:value] == NSOrderedSame) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++(NSMutableArray*) values {
+    if (SDLVrCapabilities_values == nil) {
+        SDLVrCapabilities_values = [[NSMutableArray alloc] initWithObjects:
+                SDLVrCapabilities.TEXT,
+                nil];
+    }
+    return SDLVrCapabilities_values;
+}
+
++(SDLVrCapabilities*) TEXT {
+       if (SDLVrCapabilities_TEXT == nil) {
+                       SDLVrCapabilities_TEXT = [[SDLVrCapabilities alloc] initWithValue:@"TEXT"];
+       }
+       return SDLVrCapabilities_TEXT;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVrHelpItem.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVrHelpItem.h
new file mode 100644 (file)
index 0000000..41bcad7
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVrHelpItem.h
@@ -0,0 +1,19 @@
+//  SDLVrHelpItem.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+
+#import <SmartDeviceLink/SDLImage.h>
+
+@interface SDLVrHelpItem : SDLRPCStruct {}
+
+-(id) init;
+-(id) initWithDictionary:(NSMutableDictionary*) dict;
+
+@property(assign) NSString* text;
+@property(assign) SDLImage* image;
+@property(assign) NSNumber* position;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVrHelpItem.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVrHelpItem.m
new file mode 100644 (file)
index 0000000..86ae0ac
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLVrHelpItem.m
@@ -0,0 +1,62 @@
+//  SDLVrHelpItem.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLVrHelpItem.h>
+
+#import <SmartDeviceLink/SDLNames.h>
+
+@implementation SDLVrHelpItem
+
+-(id) init {
+    if (self = [super init]) {}
+    return self;
+}
+
+-(id) initWithDictionary:(NSMutableDictionary*) dict {
+    if (self = [super initWithDictionary:dict]) {}
+    return self;
+}
+
+-(void) setText:(NSString*) text {
+    if (text != nil) {
+        [store setObject:text forKey:NAMES_text];
+    } else {
+        [store removeObjectForKey:NAMES_text];
+    }
+}
+
+-(NSString*) text {
+    return [store objectForKey:NAMES_text];
+}
+
+-(void) setImage:(SDLImage*) image {
+    if (image != nil) {
+        [store setObject:image forKey:NAMES_image];
+    } else {
+        [store removeObjectForKey:NAMES_image];
+    }
+}
+
+-(SDLImage*) image {
+    NSObject* obj = [store objectForKey:NAMES_image];
+    if ([obj isKindOfClass:SDLImage.class]) {
+        return (SDLImage*)obj;
+    } else {
+        return [[[SDLImage alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
+    }
+}
+
+-(void) setPosition:(NSNumber*) position {
+    if (position != nil) {
+        [store setObject:position forKey:NAMES_position];
+    } else {
+        [store removeObjectForKey:NAMES_position];
+    }
+}
+
+-(NSNumber*) position {
+    return [store objectForKey:NAMES_position];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLWarningLightStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLWarningLightStatus.h
new file mode 100644 (file)
index 0000000..0e132a4
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLWarningLightStatus.h
@@ -0,0 +1,19 @@
+//  SDLWarningLightStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLWarningLightStatus : SDLEnum {}
+
++(SDLWarningLightStatus*) valueOf:(NSString*) value;
++(NSMutableArray*) values;                                 
+
++(SDLWarningLightStatus*) OFF;
++(SDLWarningLightStatus*) ON;
++(SDLWarningLightStatus*) FLASH;
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLWarningLightStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLWarningLightStatus.m
new file mode 100644 (file)
index 0000000..31e3d8b
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLWarningLightStatus.m
@@ -0,0 +1,58 @@
+//  SDLWarningLightStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLWarningLightStatus.h>
+
+SDLWarningLightStatus* SDLWarningLightStatus_OFF = nil;
+SDLWarningLightStatus* SDLWarningLightStatus_ON = nil;
+SDLWarningLightStatus* SDLWarningLightStatus_FLASH = nil;
+
+NSMutableArray* SDLWarningLightStatus_values = nil; 
+
+@implementation SDLWarningLightStatus
+
++(SDLWarningLightStatus*) valueOf:(NSString*) value {                       
+       for (SDLWarningLightStatus* item in SDLWarningLightStatus.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {           
+       if (SDLWarningLightStatus_values == nil) {                               
+               SDLWarningLightStatus_values = [[NSMutableArray alloc] initWithObjects: 
+                                    SDLWarningLightStatus.OFF,
+                                    SDLWarningLightStatus.ON,
+                                    SDLWarningLightStatus.FLASH,
+                                                                       nil];
+       } 
+       return SDLWarningLightStatus_values; 
+}
+
++(SDLWarningLightStatus*) OFF {
+       if (SDLWarningLightStatus_OFF == nil) {
+               SDLWarningLightStatus_OFF = [[SDLWarningLightStatus alloc] initWithValue:@"OFF"];
+       } 
+       return SDLWarningLightStatus_OFF;  
+}
+
++(SDLWarningLightStatus*) ON {
+       if (SDLWarningLightStatus_ON == nil) {
+               SDLWarningLightStatus_ON = [[SDLWarningLightStatus alloc] initWithValue:@"ON"];
+       }
+       return SDLWarningLightStatus_ON;
+}
+
++(SDLWarningLightStatus*) FLASH {
+       if (SDLWarningLightStatus_FLASH == nil) {
+               SDLWarningLightStatus_FLASH = [[SDLWarningLightStatus alloc] initWithValue:@"FLASH"];
+       }
+       return SDLWarningLightStatus_FLASH;
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLWiperStatus.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLWiperStatus.h
new file mode 100644 (file)
index 0000000..9c56c5a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLWiperStatus.h
@@ -0,0 +1,30 @@
+//  SDLWiperStatus.h
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h> 
+#import <SmartDeviceLink/SDLEnum.h>   
+
+@interface SDLWiperStatus : SDLEnum {}
+
++(SDLWiperStatus*) valueOf:(NSString*) value;
++(NSMutableArray*) values;
+
++(SDLWiperStatus*) OFF;
++(SDLWiperStatus*) AUTO_OFF;
++(SDLWiperStatus*) OFF_MOVING;
++(SDLWiperStatus*) MAN_INT_OFF;
++(SDLWiperStatus*) MAN_INT_ON;
++(SDLWiperStatus*) MAN_LOW;
++(SDLWiperStatus*) MAN_HIGH;
++(SDLWiperStatus*) MAN_FLICK;
++(SDLWiperStatus*) WASH;
++(SDLWiperStatus*) AUTO_LOW;
++(SDLWiperStatus*) AUTO_HIGH;
++(SDLWiperStatus*) COURTESYWIPE;
++(SDLWiperStatus*) AUTO_ADJUST;
++(SDLWiperStatus*) STALLED;
++(SDLWiperStatus*) NO_DATA_EXISTS;
+
+@end
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLWiperStatus.m b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLWiperStatus.m
new file mode 100644 (file)
index 0000000..d582c8a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SDLWiperStatus.m
@@ -0,0 +1,167 @@
+//  SDLWiperStatus.m
+//  SmartDeviceLink
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <SmartDeviceLink/SDLWiperStatus.h>
+
+SDLWiperStatus* SDLWiperStatus_OFF = nil;
+SDLWiperStatus* SDLWiperStatus_AUTO_OFF = nil;
+SDLWiperStatus* SDLWiperStatus_OFF_MOVING = nil;
+SDLWiperStatus* SDLWiperStatus_MAN_INT_OFF = nil;
+SDLWiperStatus* SDLWiperStatus_MAN_INT_ON = nil;
+SDLWiperStatus* SDLWiperStatus_MAN_LOW = nil;
+SDLWiperStatus* SDLWiperStatus_MAN_HIGH = nil;
+SDLWiperStatus* SDLWiperStatus_MAN_FLICK = nil;
+SDLWiperStatus* SDLWiperStatus_WASH = nil;
+SDLWiperStatus* SDLWiperStatus_AUTO_LOW = nil;
+SDLWiperStatus* SDLWiperStatus_AUTO_HIGH = nil;
+SDLWiperStatus* SDLWiperStatus_COURTESYWIPE = nil;
+SDLWiperStatus* SDLWiperStatus_AUTO_ADJUST = nil;
+SDLWiperStatus* SDLWiperStatus_STALLED = nil;
+SDLWiperStatus* SDLWiperStatus_NO_DATA_EXISTS = nil;
+
+NSMutableArray* SDLWiperStatus_values = nil; 
+
+@implementation SDLWiperStatus
+
++(SDLWiperStatus*) valueOf:(NSString*) value {                       
+       for (SDLWiperStatus* item in SDLWiperStatus.values) {    
+               if ([item.value isEqualToString:value]) { 
+                       return item; 
+               } 
+       } 
+       return nil; 
+}
+
++(NSMutableArray *) values {
+       if (SDLWiperStatus_values == nil) {
+               SDLWiperStatus_values = [[NSMutableArray alloc] initWithObjects:
+                                SDLWiperStatus.OFF,
+                                SDLWiperStatus.AUTO_OFF,
+                                SDLWiperStatus.OFF_MOVING,
+                                SDLWiperStatus.MAN_INT_OFF,
+                                SDLWiperStatus.MAN_INT_ON,
+                                SDLWiperStatus.MAN_LOW,
+                                SDLWiperStatus.MAN_HIGH,
+                                SDLWiperStatus.MAN_FLICK,
+                                SDLWiperStatus.WASH,
+                                SDLWiperStatus.AUTO_LOW,
+                                SDLWiperStatus.AUTO_HIGH,
+                                SDLWiperStatus.COURTESYWIPE,
+                                SDLWiperStatus.AUTO_ADJUST,
+                                SDLWiperStatus.STALLED,
+                                SDLWiperStatus.NO_DATA_EXISTS,
+                                nil];
+       }
+       return SDLWiperStatus_values;
+}
+
++(SDLWiperStatus*) OFF {
+       if (SDLWiperStatus_OFF == nil) {
+               SDLWiperStatus_OFF = [[SDLWiperStatus alloc] initWithValue:@"OFF"];
+       } 
+       return SDLWiperStatus_OFF;  
+}
+
++(SDLWiperStatus*) AUTO_OFF {
+       if (SDLWiperStatus_AUTO_OFF == nil) {
+               SDLWiperStatus_AUTO_OFF = [[SDLWiperStatus alloc] initWithValue:@"AUTO_OFF"];
+       }
+       return SDLWiperStatus_AUTO_OFF;
+}
+
++(SDLWiperStatus*) OFF_MOVING {
+       if (SDLWiperStatus_OFF_MOVING == nil) {
+               SDLWiperStatus_OFF_MOVING = [[SDLWiperStatus alloc] initWithValue:@"OFF_MOVING"];
+       }
+       return SDLWiperStatus_OFF_MOVING;
+}
+
++(SDLWiperStatus*) MAN_INT_OFF {
+       if (SDLWiperStatus_MAN_INT_OFF == nil) {
+               SDLWiperStatus_MAN_INT_OFF = [[SDLWiperStatus alloc] initWithValue:@"MAN_INT_OFF"];
+       }
+       return SDLWiperStatus_MAN_INT_OFF;
+}
+
++(SDLWiperStatus*) MAN_INT_ON {
+       if (SDLWiperStatus_MAN_INT_ON == nil) {
+               SDLWiperStatus_MAN_INT_ON = [[SDLWiperStatus alloc] initWithValue:@"MAN_INT_ON"];
+       }
+       return SDLWiperStatus_MAN_INT_ON;
+}
+
++(SDLWiperStatus*) MAN_LOW {
+       if (SDLWiperStatus_MAN_LOW == nil) {
+               SDLWiperStatus_MAN_LOW = [[SDLWiperStatus alloc] initWithValue:@"MAN_LOW"];
+       }
+       return SDLWiperStatus_MAN_LOW;
+}
+
++(SDLWiperStatus*) MAN_HIGH {
+       if (SDLWiperStatus_MAN_HIGH == nil) {
+               SDLWiperStatus_MAN_HIGH = [[SDLWiperStatus alloc] initWithValue:@"MAN_HIGH"];
+       }
+       return SDLWiperStatus_MAN_HIGH;
+}
+
++(SDLWiperStatus*) MAN_FLICK {
+       if (SDLWiperStatus_MAN_FLICK == nil) {
+               SDLWiperStatus_MAN_FLICK = [[SDLWiperStatus alloc] initWithValue:@"MAN_FLICK"];
+       }
+       return SDLWiperStatus_MAN_FLICK;
+}
+
++(SDLWiperStatus*) WASH {
+       if (SDLWiperStatus_WASH == nil) {
+               SDLWiperStatus_WASH = [[SDLWiperStatus alloc] initWithValue:@"WASH"];
+       }
+       return SDLWiperStatus_WASH;
+}
+
++(SDLWiperStatus*) AUTO_LOW {
+       if (SDLWiperStatus_AUTO_LOW == nil) {
+               SDLWiperStatus_AUTO_LOW = [[SDLWiperStatus alloc] initWithValue:@"AUTO_LOW"];
+       }
+       return SDLWiperStatus_AUTO_LOW;
+}
+
++(SDLWiperStatus*) AUTO_HIGH {
+       if (SDLWiperStatus_AUTO_HIGH == nil) {
+               SDLWiperStatus_AUTO_HIGH = [[SDLWiperStatus alloc] initWithValue:@"AUTO_HIGH"];
+       }
+       return SDLWiperStatus_AUTO_HIGH;
+}
+
++(SDLWiperStatus*) COURTESYWIPE {
+       if (SDLWiperStatus_COURTESYWIPE == nil) {
+               SDLWiperStatus_COURTESYWIPE = [[SDLWiperStatus alloc] initWithValue:@"COURTESYWIPE"];
+       }
+       return SDLWiperStatus_COURTESYWIPE;
+}
+
++(SDLWiperStatus*) AUTO_ADJUST {
+       if (SDLWiperStatus_AUTO_ADJUST == nil) {
+               SDLWiperStatus_AUTO_ADJUST = [[SDLWiperStatus alloc] initWithValue:@"AUTO_ADJUST"];
+       }
+       return SDLWiperStatus_AUTO_ADJUST;
+}
+
++(SDLWiperStatus*) STALLED {
+       if (SDLWiperStatus_STALLED == nil) {
+               SDLWiperStatus_STALLED = [[SDLWiperStatus alloc] initWithValue:@"STALLED"];
+       }
+       return SDLWiperStatus_STALLED;
+}
+
++(SDLWiperStatus*) NO_DATA_EXISTS {
+       if (SDLWiperStatus_NO_DATA_EXISTS == nil) {
+               SDLWiperStatus_NO_DATA_EXISTS = [[SDLWiperStatus alloc] initWithValue:@"NO_DATA_EXISTS"];
+       }
+       return SDLWiperStatus_NO_DATA_EXISTS;
+}
+
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SmartDeviceLink-Info.plist b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SmartDeviceLink-Info.plist
new file mode 100644 (file)
index 0000000..22d563d
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SmartDeviceLink-Info.plist
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>CFBundleDevelopmentRegion</key>
+       <string>English</string>
+       <key>CFBundleExecutable</key>
+       <string>${EXECUTABLE_NAME}</string>
+       <key>CFBundleIconFile</key>
+       <string></string>
+       <key>CFBundleIdentifier</key>
+       <string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+       <key>CFBundleName</key>
+       <string>${PRODUCT_NAME}</string>
+       <key>CFBundlePackageType</key>
+       <string>BNDL</string>
+       <key>CFBundleShortVersionString</key>
+       <string>1.0</string>
+       <key>CFBundleSignature</key>
+       <string>????</string>
+       <key>CFBundleVersion</key>
+       <string>1</string>
+       <key>CFPlugInDynamicRegisterFunction</key>
+       <string></string>
+       <key>CFPlugInDynamicRegistration</key>
+       <string>NO</string>
+       <key>CFPlugInFactories</key>
+       <dict>
+               <key>00000000-0000-0000-0000-000000000000</key>
+               <string>MyFactoryFunction</string>
+       </dict>
+       <key>CFPlugInTypes</key>
+       <dict>
+               <key>00000000-0000-0000-0000-000000000000</key>
+               <array>
+                       <string>00000000-0000-0000-0000-000000000000</string>
+               </array>
+       </dict>
+       <key>CFPlugInUnloadFunction</key>
+       <string></string>
+</dict>
+</plist>

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SmartDeviceLink.h b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SmartDeviceLink.h
new file mode 100644 (file)
index 0000000..a707da3
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/SmartDeviceLink.h
@@ -0,0 +1,201 @@
+//SmartDeviceLink
+#import <SmartDeviceLink/SDLAbstractProtocol.h>
+#import <SmartDeviceLink/SDLAbstractTransport.h>
+#import <SmartDeviceLink/SDLBinaryFrameHeader.h>
+#import <SmartDeviceLink/SDLBitConverter.h>
+#import <SmartDeviceLink/SDLConsoleController.h>
+#import <SmartDeviceLink/SDLDebugTool.h>
+#import <SmartDeviceLink/SDLDecoder.h>
+#import <SmartDeviceLink/SDLEncoder.h>
+#import <SmartDeviceLink/SDLEnum.h>
+#import <SmartDeviceLink/SDLExternalLibrary.h>
+#import <SmartDeviceLink/SDLFunctionID.h>
+#import <SmartDeviceLink/SDLIProxy.h>
+#import <SmartDeviceLink/SDLJingle.h>
+#import <SmartDeviceLink/SDLJsonDecoder.h>
+#import <SmartDeviceLink/SDLJsonEncoder.h>
+#import <SmartDeviceLink/SDLIProtocol.h>
+#import <SmartDeviceLink/SDLProtocolFrameHeader.h>
+#import <SmartDeviceLink/SDLProtocolFrameHeaderFactory.h>
+#import <SmartDeviceLink/SDLProtocolListener.h>
+#import <SmartDeviceLink/SDLProtocolMessage.h>
+#import <SmartDeviceLink/SDLProxyListener.h>
+#import <SmartDeviceLink/SDLRPCMessage.h>
+#import <SmartDeviceLink/SDLRPCNotification.h>
+#import <SmartDeviceLink/SDLRPCRequest.h>
+#import <SmartDeviceLink/SDLRPCRequestFactory.h>
+#import <SmartDeviceLink/SDLRPCResponse.h>
+#import <SmartDeviceLink/SDLSiphonServer.h>
+#import <SmartDeviceLink/SDLIAPTransport.h>
+#import <SmartDeviceLink/SDLProxy.h>
+#import <SmartDeviceLink/SDLProxyFactory.h>
+#import <SmartDeviceLink/SDLTCPTransport.h>
+#import <SmartDeviceLink/SDLITransport.h>
+#import <SmartDeviceLink/SDLTransportListener.h>
+#import <SmartDeviceLink/SDLTTSChunkFactory.h>
+#import <SmartDeviceLink/SDLProtocol.h>
+
+//RPCs
+#import <SmartDeviceLink/SDLAddCommand.h>
+#import <SmartDeviceLink/SDLAddCommandResponse.h>
+#import <SmartDeviceLink/SDLAddSubMenu.h>
+#import <SmartDeviceLink/SDLAddSubMenuResponse.h>
+#import <SmartDeviceLink/SDLAlert.h>
+#import <SmartDeviceLink/SDLAlertManeuver.h>
+#import <SmartDeviceLink/SDLAlertManeuverResponse.h>
+#import <SmartDeviceLink/SDLAlertResponse.h>
+#import <SmartDeviceLink/SDLAppHMIType.h>
+#import <SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h>
+#import <SmartDeviceLink/SDLAudioPassThruCapabilities.h>
+#import <SmartDeviceLink/SDLAudioStreamingState.h>
+#import <SmartDeviceLink/SDLAudioType.h>
+#import <SmartDeviceLink/SDLBitsPerSample.h>
+#import <SmartDeviceLink/SDLButtonCapabilities.h>
+#import <SmartDeviceLink/SDLButtonEventMode.h>
+#import <SmartDeviceLink/SDLButtonName.h>
+#import <SmartDeviceLink/SDLButtonPressMode.h>
+#import <SmartDeviceLink/SDLChangeRegistration.h>
+#import <SmartDeviceLink/SDLChangeRegistrationResponse.h>
+#import <SmartDeviceLink/SDLCharacterSet.h>
+#import <SmartDeviceLink/SDLChoice.h>
+#import <SmartDeviceLink/SDLCreateInteractionChoiceSet.h>
+#import <SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h>
+#import <SmartDeviceLink/SDLDeleteCommand.h>
+#import <SmartDeviceLink/SDLDeleteCommandResponse.h>
+#import <SmartDeviceLink/SDLDeleteFile.h>
+#import <SmartDeviceLink/SDLDeleteFileResponse.h>
+#import <SmartDeviceLink/SDLDeleteInteractionChoiceSet.h>
+#import <SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h>
+#import <SmartDeviceLink/SDLDeleteSubMenu.h>
+#import <SmartDeviceLink/SDLDeleteSubMenuResponse.h>
+#import <SmartDeviceLink/SDLDisplayCapabilities.h>
+#import <SmartDeviceLink/SDLDisplayType.h>
+#import <SmartDeviceLink/SDLDriverDistractionState.h>
+#import <SmartDeviceLink/SDLEndAudioPassThru.h>
+#import <SmartDeviceLink/SDLEndAudioPassThruResponse.h>
+#import <SmartDeviceLink/SDLFileType.h>
+#import <SmartDeviceLink/SDLGenericResponse.h>
+#import <SmartDeviceLink/SDLGlobalProperty.h>
+#import <SmartDeviceLink/SDLHMILevel.h>
+#import <SmartDeviceLink/SDLHMIPermissions.h>
+#import <SmartDeviceLink/SDLHMIZoneCapabilities.h>
+#import <SmartDeviceLink/SDLImage.h>
+#import <SmartDeviceLink/SDLImageType.h>
+#import <SmartDeviceLink/SDLInteractionMode.h>
+#import <SmartDeviceLink/SDLLanguage.h>
+#import <SmartDeviceLink/SDLListFiles.h>
+#import <SmartDeviceLink/SDLListFilesResponse.h>
+#import <SmartDeviceLink/SDLMediaClockFormat.h>
+#import <SmartDeviceLink/SDLMenuParams.h>
+#import <SmartDeviceLink/SDLOnAppInterfaceUnregistered.h>
+#import <SmartDeviceLink/SDLOnAudioPassThru.h>
+#import <SmartDeviceLink/SDLOnButtonEvent.h>
+#import <SmartDeviceLink/SDLOnButtonPress.h>
+#import <SmartDeviceLink/SDLOnCommand.h>
+#import <SmartDeviceLink/SDLOnDriverDistraction.h>
+#import <SmartDeviceLink/SDLOnHMIStatus.h>
+#import <SmartDeviceLink/SDLOnLanguageChange.h>
+#import <SmartDeviceLink/SDLOnPermissionsChange.h>
+#import <SmartDeviceLink/SDLOnTBTClientState.h>
+#import <SmartDeviceLink/SDLParameterPermissions.h>
+#import <SmartDeviceLink/SDLPerformAudioPassThru.h>
+#import <SmartDeviceLink/SDLPerformAudioPassThruResponse.h>
+#import <SmartDeviceLink/SDLPerformInteraction.h>
+#import <SmartDeviceLink/SDLPerformInteractionResponse.h>
+#import <SmartDeviceLink/SDLPermissionItem.h>
+#import <SmartDeviceLink/SDLPermissionStatus.h>
+#import <SmartDeviceLink/SDLPresetBankCapabilities.h>
+#import <SmartDeviceLink/SDLPutFile.h>
+#import <SmartDeviceLink/SDLPutFileResponse.h>
+#import <SmartDeviceLink/SDLRegisterAppInterface.h>
+#import <SmartDeviceLink/SDLRegisterAppInterfaceResponse.h>
+#import <SmartDeviceLink/SDLResetGlobalProperties.h>
+#import <SmartDeviceLink/SDLResetGlobalPropertiesResponse.h>
+#import <SmartDeviceLink/SDLResult.h>
+#import <SmartDeviceLink/SDLRPCMessageType.h>
+#import <SmartDeviceLink/SDLSamplingRate.h>
+#import <SmartDeviceLink/SDLScrollableMessage.h>
+#import <SmartDeviceLink/SDLScrollableMessageResponse.h>
+#import <SmartDeviceLink/SDLSetAppIcon.h>
+#import <SmartDeviceLink/SDLSetAppIconResponse.h>
+#import <SmartDeviceLink/SDLSetDisplayLayout.h>
+#import <SmartDeviceLink/SDLSetDisplayLayoutResponse.h>
+#import <SmartDeviceLink/SDLSetGlobalProperties.h>
+#import <SmartDeviceLink/SDLSetGlobalPropertiesResponse.h>
+#import <SmartDeviceLink/SDLSetMediaClockTimer.h>
+#import <SmartDeviceLink/SDLSetMediaClockTimerResponse.h>
+#import <SmartDeviceLink/SDLShow.h>
+#import <SmartDeviceLink/SDLShowConstantTBT.h>
+#import <SmartDeviceLink/SDLShowConstantTBTResponse.h>
+#import <SmartDeviceLink/SDLShowResponse.h>
+#import <SmartDeviceLink/SDLSlider.h>
+#import <SmartDeviceLink/SDLSliderResponse.h>
+#import <SmartDeviceLink/SDLSoftButton.h>
+#import <SmartDeviceLink/SDLSoftButtonCapabilities.h>
+#import <SmartDeviceLink/SDLSoftButtonType.h>
+#import <SmartDeviceLink/SDLSpeak.h>
+#import <SmartDeviceLink/SDLSpeakResponse.h>
+#import <SmartDeviceLink/SDLSpeechCapabilities.h>
+#import <SmartDeviceLink/SDLStartTime.h>
+#import <SmartDeviceLink/SDLSubscribeButton.h>
+#import <SmartDeviceLink/SDLSubscribeButtonResponse.h>
+#import <SmartDeviceLink/SDLSyncMsgVersion.h>
+#import <SmartDeviceLink/SDLSystemAction.h>
+#import <SmartDeviceLink/SDLSystemContext.h>
+#import <SmartDeviceLink/SDLTBTState.h>
+#import <SmartDeviceLink/SDLTextAlignment.h>
+#import <SmartDeviceLink/SDLTextField.h>
+#import <SmartDeviceLink/SDLTextFieldName.h>
+#import <SmartDeviceLink/SDLTriggerSource.h>
+#import <SmartDeviceLink/SDLTTSChunk.h>
+#import <SmartDeviceLink/SDLTurn.h>
+#import <SmartDeviceLink/SDLUnregisterAppInterface.h>
+#import <SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h>
+#import <SmartDeviceLink/SDLUnsubscribeButton.h>
+#import <SmartDeviceLink/SDLUnsubscribeButtonResponse.h>
+#import <SmartDeviceLink/SDLUpdateMode.h>
+#import <SmartDeviceLink/SDLUpdateTurnList.h>
+#import <SmartDeviceLink/SDLUpdateTurnListResponse.h>
+#import <SmartDeviceLink/SDLVrCapabilities.h>
+#import <SmartDeviceLink/SDLVrHelpItem.h>
+
+//Vehicle Data
+#import <SmartDeviceLink/SDLBeltStatus.h>
+#import <SmartDeviceLink/SDLBodyInformation.h>
+#import <SmartDeviceLink/SDLCompassDirection.h>
+#import <SmartDeviceLink/SDLComponentVolumeStatus.h>
+#import <SmartDeviceLink/SDLDeviceLevelStatus.h>
+#import <SmartDeviceLink/SDLDeviceStatus.h>
+#import <SmartDeviceLink/SDLDIDResult.h>
+#import <SmartDeviceLink/SDLDimension.h>
+#import <SmartDeviceLink/SDLEngineInfo.h>
+#import <SmartDeviceLink/SDLGetDTCs.h>
+#import <SmartDeviceLink/SDLGetDTCsResponse.h>
+#import <SmartDeviceLink/SDLGetVehicleData.h>
+#import <SmartDeviceLink/SDLGetVehicleDataResponse.h>
+#import <SmartDeviceLink/SDLGPSData.h>
+#import <SmartDeviceLink/SDLHeadLampStatus.h>
+#import <SmartDeviceLink/SDLIgnitionStableStatus.h>
+#import <SmartDeviceLink/SDLIgnitionStatus.h>
+#import <SmartDeviceLink/SDLMaintenanceModeStatus.h>
+#import <SmartDeviceLink/SDLOnVehicleData.h>
+#import <SmartDeviceLink/SDLPrimaryAudioSource.h>
+#import <SmartDeviceLink/SDLPRNDL.h>
+#import <SmartDeviceLink/SDLReadDID.h>
+#import <SmartDeviceLink/SDLReadDIDResponse.h>
+#import <SmartDeviceLink/SDLSingleTireStatus.h>
+#import <SmartDeviceLink/SDLSubscribeVehicleData.h>
+#import <SmartDeviceLink/SDLSubscribeVehicleDataResponse.h>
+#import <SmartDeviceLink/SDLTireStatus.h>
+#import <SmartDeviceLink/SDLUnsubscribeVehicleData.h>
+#import <SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h>
+#import <SmartDeviceLink/SDLVehicleDataActiveStatus.h>
+#import <SmartDeviceLink/SDLVehicleDataEventStatus.h>
+#import <SmartDeviceLink/SDLVehicleDataNotificationStatus.h>
+#import <SmartDeviceLink/SDLVehicleDataResult.h>
+#import <SmartDeviceLink/SDLVehicleDataResultCode.h>
+#import <SmartDeviceLink/SDLVehicleDataStatus.h>
+#import <SmartDeviceLink/SDLVehicleDataType.h>
+#import <SmartDeviceLink/SDLVehicleType.h>
+#import <SmartDeviceLink/SDLWarningLightStatus.h>
+#import <SmartDeviceLink/SDLWiperStatus.h>

diff --git a/SDL_iOS/SmartDeviceLink/SmartDeviceLink/en.lproj/InfoPlist.strings b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/en.lproj/InfoPlist.strings
new file mode 100644 (file)
index 0000000..477b28f
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLink/SmartDeviceLink/en.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/JSON.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/JSON.h
deleted file mode 100644 (file)
index 1e58c9a..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/JSON.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- 
- * Neither the name of the author nor the names of its contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- @mainpage A strict JSON parser and generator for Objective-C
-
- JSON (JavaScript Object Notation) is a lightweight data-interchange
- format. This framework provides two apis for parsing and generating
- JSON. One standard object-based and a higher level api consisting of
- categories added to existing Objective-C classes.
-
- Learn more on the http://code.google.com/p/json-framework project site.
- 
- This framework does its best to be as strict as possible, both in what it
- accepts and what it generates. For example, it does not support trailing commas
- in arrays or objects. Nor does it support embedded comments, or
- anything else not in the JSON specification. This is considered a feature. 
- 
-*/
-
-#import "SBJSON.h"
-#import "NSObject+SBJSON.h"
-#import "NSString+SBJSON.h"
-

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/NSObject+SBJSON.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/NSObject+SBJSON.h
deleted file mode 100644 (file)
index ecf0ee4..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/NSObject+SBJSON.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- 
- * Neither the name of the author nor the names of its contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-
-
-/**
- @brief Adds JSON generation to Foundation classes
- 
- This is a category on NSObject that adds methods for returning JSON representations
- of standard objects to the objects themselves. This means you can call the
- -JSONRepresentation method on an NSArray object and it'll do what you want.
- */
-@interface NSObject (NSObject_SBJSON)
-
-/**
- @brief Returns a string containing the receiver encoded as a JSON fragment.
- 
- This method is added as a category on NSObject but is only actually
- supported for the following objects:
- @li NSDictionary
- @li NSArray
- @li NSString
- @li NSNumber (also used for booleans)
- @li NSNull 
- 
- @deprecated Given we bill ourselves as a "strict" JSON library, this method should be removed.
- */
-- (NSString *)JSONFragment;
-
-/**
- @brief Returns a string containing the receiver encoded in JSON.
-
- This method is added as a category on NSObject but is only actually
- supported for the following objects:
- @li NSDictionary
- @li NSArray
- */
-- (NSString *)JSONRepresentation;
-
-@end
-

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/NSObject+SBJSON.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/NSObject+SBJSON.m
deleted file mode 100644 (file)
index 20b084b..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/NSObject+SBJSON.m
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- 
- * Neither the name of the author nor the names of its contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "NSObject+SBJSON.h"
-#import "SBJsonWriter.h"
-
-@implementation NSObject (NSObject_SBJSON)
-
-- (NSString *)JSONFragment {
-    SBJsonWriter *jsonWriter = [SBJsonWriter new];
-    NSString *json = [jsonWriter stringWithFragment:self];    
-    if (!json)
-        NSLog(@"-JSONFragment failed. Error trace is: %@", [jsonWriter errorTrace]);
-    [jsonWriter release];
-    return json;
-}
-
-- (NSString *)JSONRepresentation {
-    SBJsonWriter *jsonWriter = [SBJsonWriter new];    
-    NSString *json = [jsonWriter stringWithObject:self];
-    if (!json)
-        NSLog(@"-JSONRepresentation failed. Error trace is: %@", [jsonWriter errorTrace]);
-    [jsonWriter release];
-    return json;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/NSString+SBJSON.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/NSString+SBJSON.h
deleted file mode 100644 (file)
index fad7179..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/NSString+SBJSON.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- 
- * Neither the name of the author nor the names of its contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-
-/**
- @brief Adds JSON parsing methods to NSString
- 
-This is a category on NSString that adds methods for parsing the target string.
-*/
-@interface NSString (NSString_SBJSON)
-
-
-/**
- @brief Returns the object represented in the receiver, or nil on error. 
- 
- Returns a a scalar object represented by the string's JSON fragment representation.
- 
- @deprecated Given we bill ourselves as a "strict" JSON library, this method should be removed.
- */
-- (id)JSONFragmentValue;
-
-/**
- @brief Returns the NSDictionary or NSArray represented by the current string's JSON representation.
- 
- Returns the dictionary or array represented in the receiver, or nil on error.
-
- Returns the NSDictionary or NSArray represented by the current string's JSON representation.
- */
-- (id)JSONValue;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/NSString+SBJSON.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/NSString+SBJSON.m
deleted file mode 100644 (file)
index 41a5a85..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/NSString+SBJSON.m
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- Copyright (C) 2007-2009 Stig Brautaset. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- 
- * Neither the name of the author nor the names of its contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "NSString+SBJSON.h"
-#import "SBJsonParser.h"
-
-@implementation NSString (NSString_SBJSON)
-
-- (id)JSONFragmentValue
-{
-    SBJsonParser *jsonParser = [SBJsonParser new];    
-    id repr = [jsonParser fragmentWithString:self];    
-    if (!repr)
-        NSLog(@"-JSONFragmentValue failed. Error trace is: %@", [jsonParser errorTrace]);
-    [jsonParser release];
-    return repr;
-}
-
-- (id)JSONValue
-{
-    SBJsonParser *jsonParser = [SBJsonParser new];
-    id repr = [jsonParser objectWithString:self];
-    if (!repr)
-        NSLog(@"-JSONValue failed. Error trace is: %@", [jsonParser errorTrace]);
-    [jsonParser release];
-    return repr;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLLanguage.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLLanguage.h
deleted file mode 100644 (file)
index 3b28ed8..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLLanguage.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLEnum.h"
-
-@interface SDLLanguage : SDLEnum {}
-
-+(SDLLanguage*) valueOf:(NSString*) value;
-+(NSMutableArray*) values;
-
-+(SDLLanguage*) EN_US;
-+(SDLLanguage*) ES_MX;
-+(SDLLanguage*) FR_CA;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLLanguage.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLLanguage.m
deleted file mode 100644 (file)
index da684c7..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLLanguage.m
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLLanguage.h"
-
-SDLLanguage* SDLLanguage_EN_US = nil;
-SDLLanguage* SDLLanguage_ES_MX = nil;
-SDLLanguage* SDLLanguage_FR_CA = nil;
-
-NSMutableArray* SDLLanguage_values = nil;
-@implementation SDLLanguage
-
-+(SDLLanguage*) valueOf:(NSString*) value {
-    for (SDLLanguage* item in SDLLanguage.values) {
-        if ([item.value isEqualToString:value]) {
-            return item;
-        }
-    }
-    return nil;
-}
-
-+(NSMutableArray*) values {
-    if (SDLLanguage_values == nil) {
-        SDLLanguage_values = [[NSMutableArray alloc] initWithObjects:
-                SDLLanguage.EN_US,
-                SDLLanguage.ES_MX,
-                SDLLanguage.FR_CA,
-                nil];
-    }
-    return SDLLanguage_values;
-}
-
-+(SDLLanguage*) EN_US {
-       if (SDLLanguage_EN_US == nil) {
-                       SDLLanguage_EN_US = [[SDLLanguage alloc] initWithValue:@"EN-US"];
-       }
-       return SDLLanguage_EN_US;
-}
-
-+(SDLLanguage*) ES_MX {
-       if (SDLLanguage_ES_MX == nil) {
-                       SDLLanguage_ES_MX = [[SDLLanguage alloc] initWithValue:@"ES-MX"];
-       }
-       return SDLLanguage_ES_MX;
-}
-
-+(SDLLanguage*) FR_CA {
-       if (SDLLanguage_FR_CA == nil) {
-                       SDLLanguage_FR_CA = [[SDLLanguage alloc] initWithValue:@"FR-CA"];
-       }
-       return SDLLanguage_FR_CA;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMediaClockFormat.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMediaClockFormat.m
deleted file mode 100644 (file)
index 3b4472a..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLMediaClockFormat.m
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLMediaClockFormat.h"
-
-SDLMediaClockFormat* SDLMediaClockFormat_CLOCK1 = nil;
-SDLMediaClockFormat* SDLMediaClockFormat_CLOCK2 = nil;
-SDLMediaClockFormat* SDLMediaClockFormat_CLOCKTEXT1 = nil;
-SDLMediaClockFormat* SDLMediaClockFormat_CLOCKTEXT2 = nil;
-SDLMediaClockFormat* SDLMediaClockFormat_CLOCKTEXT3 = nil;
-
-NSMutableArray* SDLMediaClockFormat_values = nil;
-@implementation SDLMediaClockFormat
-
-+(SDLMediaClockFormat*) valueOf:(NSString*) value {
-    for (SDLMediaClockFormat* item in SDLMediaClockFormat.values) {
-        if ([item.value isEqualToString:value]) {
-            return item;
-        }
-    }
-    return nil;
-}
-
-+(NSMutableArray*) values {
-    if (SDLMediaClockFormat_values == nil) {
-        SDLMediaClockFormat_values = [[NSMutableArray alloc] initWithObjects:
-                SDLMediaClockFormat.CLOCK1,
-                SDLMediaClockFormat.CLOCK2,
-                SDLMediaClockFormat.CLOCKTEXT1,
-                SDLMediaClockFormat.CLOCKTEXT2,
-                SDLMediaClockFormat.CLOCKTEXT3,
-                nil];
-    }
-    return SDLMediaClockFormat_values;
-}
-
-+(SDLMediaClockFormat*) CLOCK1 {
-       if (SDLMediaClockFormat_CLOCK1 == nil) {
-                       SDLMediaClockFormat_CLOCK1 = [[SDLMediaClockFormat alloc] initWithValue:@"CLOCK1"];
-       }
-       return SDLMediaClockFormat_CLOCK1;
-}
-
-+(SDLMediaClockFormat*) CLOCK2 {
-       if (SDLMediaClockFormat_CLOCK2 == nil) {
-                       SDLMediaClockFormat_CLOCK2 = [[SDLMediaClockFormat alloc] initWithValue:@"CLOCK2"];
-       }
-       return SDLMediaClockFormat_CLOCK2;
-}
-
-+(SDLMediaClockFormat*) CLOCKTEXT1 {
-       if (SDLMediaClockFormat_CLOCKTEXT1 == nil) {
-                       SDLMediaClockFormat_CLOCKTEXT1 = [[SDLMediaClockFormat alloc] initWithValue:@"CLOCKTEXT1"];
-       }
-       return SDLMediaClockFormat_CLOCKTEXT1;
-}
-
-+(SDLMediaClockFormat*) CLOCKTEXT2 {
-       if (SDLMediaClockFormat_CLOCKTEXT2 == nil) {
-                       SDLMediaClockFormat_CLOCKTEXT2 = [[SDLMediaClockFormat alloc] initWithValue:@"CLOCKTEXT2"];
-       }
-       return SDLMediaClockFormat_CLOCKTEXT2;
-}
-
-+(SDLMediaClockFormat*) CLOCKTEXT3 {
-       if (SDLMediaClockFormat_CLOCKTEXT3 == nil) {
-                       SDLMediaClockFormat_CLOCKTEXT3 = [[SDLMediaClockFormat alloc] initWithValue:@"CLOCKTEXT3"];
-       }
-       return SDLMediaClockFormat_CLOCKTEXT3;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnButtonEvent.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnButtonEvent.h
deleted file mode 100644 (file)
index 0a4ed61..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnButtonEvent.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLRPCNotification.h"
-
-#import "SDLButtonName.h"
-#import "SDLButtonEventMode.h"
-
-@interface SDLOnButtonEvent : SDLRPCNotification {}
-
--(id) init;
--(id) initWithDictionary:(NSMutableDictionary*) dict;
-
-@property(assign) SDLButtonName* buttonName;
-@property(assign) SDLButtonEventMode* buttonEventMode;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnButtonPress.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnButtonPress.h
deleted file mode 100644 (file)
index 972f571..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnButtonPress.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLRPCNotification.h"
-
-#import "SDLButtonName.h"
-#import "SDLButtonPressMode.h"
-
-@interface SDLOnButtonPress : SDLRPCNotification {}
-
--(id) init;
--(id) initWithDictionary:(NSMutableDictionary*) dict;
-
-@property(assign) SDLButtonName* buttonName;
-@property(assign) SDLButtonPressMode* buttonPressMode;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnEncodedSyncPData.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnEncodedSyncPData.h
deleted file mode 100644 (file)
index 5f89766..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnEncodedSyncPData.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLRPCNotification.h"
-
-@interface SDLOnEncodedSyncPData: SDLRPCNotification {}
-
--(id) init;
--(id) initWithDictionary:(NSMutableDictionary*) dict;
-
-@property(assign) NSMutableArray* data;
-
-@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnEncodedSyncPData.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnEncodedSyncPData.m
deleted file mode 100644 (file)
index d2a524a..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLOnEncodedSyncPData.m
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLOnEncodedSyncPData.h"
-#import "SDLNames.h"
-
-@implementation SDLOnEncodedSyncPData
-
--(id) init {
-    if (self = [super initWithName:NAMES_OnEncodedSyncPData]) {}
-    return self;
-}
-
--(id) initWithDictionary:(NSMutableDictionary*) dict {
-    if (self = [super initWithDictionary:dict]) {}
-    return self;
-}
-
--(void) setData:(NSMutableArray*) data {
-    if (data != nil) {
-        [parameters setObject:data forKey:NAMES_data];
-    } else {
-        [parameters removeObjectForKey:NAMES_data];
-    }
-}
-
--(NSMutableArray*) data {
-    NSMutableArray* obj = [parameters objectForKey:NAMES_data];
-       return (NSMutableArray*)obj;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLRegisterAppInterface.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLRegisterAppInterface.h
deleted file mode 100644 (file)
index a26b213..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLRegisterAppInterface.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
-
-#import "SDLMsgVersion.h"
-#import "SDLLanguage.h"
-
-@interface SDLRegisterAppInterface : SDLRPCRequest {}
-
--(id) init;
--(id) initWithDictionary:(NSMutableDictionary*) dict;
-
-@property(assign) SDLMsgVersion* syncMsgVersion;
-@property(assign) NSString* appName;
-@property(assign) NSString* ngnMediaScreenAppName;
-@property(assign) NSMutableArray* vrSynonyms;
-@property(assign) NSNumber* isMediaApplication;
-@property(assign) SDLLanguage* languageDesired;
-@property(assign) NSString* autoActivateID;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLRegisterAppInterface.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLRegisterAppInterface.m
deleted file mode 100644 (file)
index 6b0e043..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLRegisterAppInterface.m
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLRegisterAppInterface.h"
-#import "SDLNames.h"
-
-@implementation SDLRegisterAppInterface
-
--(id) init {
-    if (self = [super initWithName:NAMES_RegisterAppInterface]) {}
-    return self;
-}
-
--(id) initWithDictionary:(NSMutableDictionary*) dict {
-    if (self = [super initWithDictionary:dict]) {}
-    return self;
-}
-
--(void) setSyncMsgVersion:(SDLMsgVersion*) syncMsgVersion {
-    if (syncMsgVersion != nil) {
-        [parameters setObject:syncMsgVersion forKey:NAMES_syncMsgVersion];
-    } else {
-        [parameters removeObjectForKey:NAMES_syncMsgVersion];
-    }
-}
-
--(SDLMsgVersion*) syncMsgVersion {
-    NSObject* obj = [parameters objectForKey:NAMES_syncMsgVersion];
-    if ([obj isKindOfClass:SDLMsgVersion.class]) {
-        return (SDLMsgVersion*)obj;
-    } else {
-        return [[[SDLMsgVersion alloc] initWithDictionary:(NSMutableDictionary*)obj] autorelease];
-    }
-}
-
--(void) setAppName:(NSString*) appName {
-    if (appName != nil) {
-        [parameters setObject:appName forKey:NAMES_appName];
-    } else {
-        [parameters removeObjectForKey:NAMES_appName];
-    }
-}
-
--(NSString*) appName {
-    return [parameters objectForKey:NAMES_appName];
-}
-
--(void) setNgnMediaScreenAppName:(NSString*) ngnMediaScreenAppName {
-    if (ngnMediaScreenAppName != nil) {
-        [parameters setObject:ngnMediaScreenAppName forKey:NAMES_ngnMediaScreenAppName];
-    } else {
-        [parameters removeObjectForKey:NAMES_ngnMediaScreenAppName];
-    }
-}
-
--(NSString*) ngnMediaScreenAppName {
-    return [parameters objectForKey:NAMES_ngnMediaScreenAppName];
-}
-
--(void) setVrSynonyms:(NSMutableArray*) vrSynonyms {
-    if (vrSynonyms != nil) {
-        [parameters setObject:vrSynonyms forKey:NAMES_vrSynonyms];
-    } else {
-        [parameters removeObjectForKey:NAMES_vrSynonyms];
-    }
-}
-
--(NSMutableArray*) vrSynonyms { 
-    return [parameters objectForKey:NAMES_vrSynonyms];
-}
-
--(void) setIsMediaApplication:(NSNumber*) isMediaApplication {
-    if (isMediaApplication != nil) {
-        [parameters setObject:isMediaApplication forKey:NAMES_isMediaApplication];
-    } else {
-        [parameters removeObjectForKey:NAMES_isMediaApplication];
-    }
-}
-
--(NSNumber*) isMediaApplication {
-    return [parameters objectForKey:NAMES_isMediaApplication];
-}
-
--(void) setLanguageDesired:(SDLLanguage*) languageDesired {
-    if (languageDesired != nil) {
-        [parameters setObject:languageDesired forKey:NAMES_languageDesired];
-    } else {
-        [parameters removeObjectForKey:NAMES_languageDesired];
-    }
-}
-
--(SDLLanguage*) languageDesired {
-    NSObject* obj = [parameters objectForKey:NAMES_languageDesired];
-    if ([obj isKindOfClass:SDLLanguage.class]) {
-        return (SDLLanguage*)obj;
-    } else { 
-        return [SDLLanguage valueOf:(NSString*)obj];
-    }
-}
-
--(void) setAutoActivateID:(NSString*) autoActivateID {
-    if (autoActivateID != nil) {
-        [parameters setObject:autoActivateID forKey:NAMES_autoActivateID];
-    } else {
-        [parameters removeObjectForKey:NAMES_autoActivateID];
-    }
-}
-
--(NSString*) autoActivateID {
-    return [parameters objectForKey:NAMES_autoActivateID];
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLRegisterAppInterfaceResponse.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLRegisterAppInterfaceResponse.h
deleted file mode 100644 (file)
index 5b0010e..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLRegisterAppInterfaceResponse.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLRPCResponse.h"
-
-#import "SDLResult.h"
-#import "SDLMsgVersion.h"
-#import "SDLLanguage.h"
-#import "SDLDisplayCapabilities.h"
-#import "SDLButtonCapabilities.h"
-#import "SDLHMIZoneCapabilities.h"
-#import "SDLSpeechCapabilities.h"
-#import "SDLVRCapabilities.h"
-
-@interface SDLRegisterAppInterfaceResponse : SDLRPCResponse {}
-
--(id) init;
--(id) initWithDictionary:(NSMutableDictionary*) dict;
-
-@property(assign) SDLMsgVersion* syncMsgVersion;
-@property(assign) NSString* autoActivateID;
-@property(assign) SDLLanguage* language;
-@property(assign) SDLDisplayCapabilities* displayCapabilities;
-@property(assign) NSMutableArray* buttonCapabilities;
-@property(assign) NSMutableArray* hmiZoneCapabilities;
-@property(assign) NSMutableArray* speechCapabilities;
-@property(assign) NSMutableArray* vrCapabilities;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLShow.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLShow.h
deleted file mode 100644 (file)
index 41c4f7b..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLShow.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLRPCRequest.h"
-
-#import "SDLTextAlignment.h"
-
-@interface SDLShow : SDLRPCRequest {}
-
--(id) init;
--(id) initWithDictionary:(NSMutableDictionary*) dict;
-
-@property(assign) NSString* mainField1;
-@property(assign) NSString* mainField2;
-@property(assign) SDLTextAlignment* alignment;
-@property(assign) NSString* statusBar;
-@property(assign) NSString* mediaClock;
-@property(assign) NSString* mediaTrack;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLShow.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLShow.m
deleted file mode 100644 (file)
index cd388e8..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLShow.m
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLShow.h"
-#import "SDLNames.h"
-
-@implementation SDLShow
-
--(id) init {
-    if (self = [super initWithName:NAMES_Show]) {}
-    return self;
-}
-
--(id) initWithDictionary:(NSMutableDictionary*) dict {
-    if (self = [super initWithDictionary:dict]) {}
-    return self;
-}
-
--(void) setMainField1:(NSString*) mainField1 {
-    if (mainField1 != nil) {
-        [parameters setObject:mainField1 forKey:NAMES_mainField1];
-    } else {
-        [parameters removeObjectForKey:NAMES_mainField1];
-    }
-}
-
--(NSString*) mainField1 {
-    return [parameters objectForKey:NAMES_mainField1];
-}
-
--(void) setMainField2:(NSString*) mainField2 {
-    if (mainField2 != nil) {
-        [parameters setObject:mainField2 forKey:NAMES_mainField2];
-    } else {
-        [parameters removeObjectForKey:NAMES_mainField2];
-    }
-}
-
--(NSString*) mainField2 {
-    return [parameters objectForKey:NAMES_mainField2];
-}
-
--(void) setAlignment:(SDLTextAlignment*) alignment {
-    if (alignment != nil) {
-        [parameters setObject:alignment forKey:NAMES_alignment];
-    } else {
-        [parameters removeObjectForKey:NAMES_alignment];
-    }
-}
-
--(SDLTextAlignment*) alignment {
-    NSObject* obj = [parameters objectForKey:NAMES_alignment];
-    if ([obj isKindOfClass:SDLTextAlignment.class]) {
-        return (SDLTextAlignment*)obj;
-    } else { 
-        return [SDLTextAlignment valueOf:(NSString*)obj];
-    }
-}
-
--(void) setStatusBar:(NSString*) statusBar {
-    if (statusBar != nil) {
-        [parameters setObject:statusBar forKey:NAMES_statusBar];
-    } else {
-        [parameters removeObjectForKey:NAMES_statusBar];
-    }
-}
-
--(NSString*) statusBar {
-    return [parameters objectForKey:NAMES_statusBar];
-}
-
--(void) setMediaClock:(NSString*) mediaClock {
-    if (mediaClock != nil) {
-        [parameters setObject:mediaClock forKey:NAMES_mediaClock];
-    } else {
-        [parameters removeObjectForKey:NAMES_mediaClock];
-    }
-}
-
--(NSString*) mediaClock {
-    return [parameters objectForKey:NAMES_mediaClock];
-}
-
--(void) setMediaTrack:(NSString*) mediaTrack {
-    if (mediaTrack != nil) {
-        [parameters setObject:mediaTrack forKey:NAMES_mediaTrack];
-    } else {
-        [parameters removeObjectForKey:NAMES_mediaTrack];
-    }
-}
-
--(NSString*) mediaTrack {
-    return [parameters objectForKey:NAMES_mediaTrack];
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSystemContext.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSystemContext.h
deleted file mode 100644 (file)
index 6fa1b1f..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSystemContext.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLEnum.h"
-
-@interface SDLSystemContext : SDLEnum {}
-
-+(SDLSystemContext*) valueOf:(NSString*) value;
-+(NSMutableArray*) values;
-
-+(SDLSystemContext*) SYSCTXT_MAIN;
-+(SDLSystemContext*) SYSCTXT_VRSESSION;
-+(SDLSystemContext*) SYSCTXT_MENU;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSystemContext.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSystemContext.m
deleted file mode 100644 (file)
index f89aa0d..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLSystemContext.m
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLSystemContext.h"
-
-SDLSystemContext* SDLSystemContext_SYSCTXT_MAIN = nil;
-SDLSystemContext* SDLSystemContext_SYSCTXT_VRSESSION = nil;
-SDLSystemContext* SDLSystemContext_SYSCTXT_MENU = nil;
-
-NSMutableArray* SDLSystemContext_values = nil;
-@implementation SDLSystemContext
-
-+(SDLSystemContext*) valueOf:(NSString*) value {
-    for (SDLSystemContext* item in SDLSystemContext.values) {
-        if ([item.value isEqualToString:value]) {
-            return item;
-        }
-    }
-    return nil;
-}
-
-+(NSMutableArray*) values {
-    if (SDLSystemContext_values == nil) {
-        SDLSystemContext_values = [[NSMutableArray alloc] initWithObjects:
-                SDLSystemContext.SYSCTXT_MAIN,
-                SDLSystemContext.SYSCTXT_VRSESSION,
-                SDLSystemContext.SYSCTXT_MENU,
-                nil];
-    }
-    return SDLSystemContext_values;
-}
-
-+(SDLSystemContext*) SYSCTXT_MAIN {
-       if (SDLSystemContext_SYSCTXT_MAIN == nil) {
-                       SDLSystemContext_SYSCTXT_MAIN = [[SDLSystemContext alloc] initWithValue:@"MAIN"];
-       }
-       return SDLSystemContext_SYSCTXT_MAIN;
-}
-
-+(SDLSystemContext*) SYSCTXT_VRSESSION {
-       if (SDLSystemContext_SYSCTXT_VRSESSION == nil) {
-                       SDLSystemContext_SYSCTXT_VRSESSION = [[SDLSystemContext alloc] initWithValue:@"VRSESSION"];
-       }
-       return SDLSystemContext_SYSCTXT_VRSESSION;
-}
-
-+(SDLSystemContext*) SYSCTXT_MENU {
-       if (SDLSystemContext_SYSCTXT_MENU == nil) {
-                       SDLSystemContext_SYSCTXT_MENU = [[SDLSystemContext alloc] initWithValue:@"MENU"];
-       }
-       return SDLSystemContext_SYSCTXT_MENU;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTBTState.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTBTState.h
deleted file mode 100644 (file)
index 65c5096..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTBTState.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLEnum.h"   
-
-@interface SDLTBTState : SDLEnum{}
-
-+(SDLTBTState*) valueOf:(NSString*) value;
-
-+(NSMutableArray*) values;                                 
-
-+(SDLTBTState*) ROUTE_UPDATE_REQUEST; 
-+(SDLTBTState*) ROUTE_ACCEPTED;
-+(SDLTBTState*) ROUTE_REFUSED; 
-+(SDLTBTState*) ROUTE_CANCELLED;
-
-@end
-
-

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTBTState.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTBTState.m
deleted file mode 100644 (file)
index 8d0ea2d..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTBTState.m
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLTBTState.h"
-
-SDLTBTState* SDLTBTState_ROUTE_UPDATE_REQUEST = nil;
-SDLTBTState* SDLTBTState_ROUTE_ACCEPTED = nil;
-SDLTBTState* SDLTBTState_ROUTE_REFUSED = nil;
-SDLTBTState* SDLTBTState_ROUTE_CANCELLED = nil;
-NSMutableArray* SDLTBTState_values = nil; 
-
-@implementation SDLTBTState
-
-+(SDLTBTState*) valueOf:(NSString*) value {                       
-       for (SDLTBTState* item in SDLTBTState.values) {    
-               if ([item.value isEqualToString:value]) { 
-                       return item; 
-               } 
-       } 
-       return nil; 
-}
-
-+(NSMutableArray *) values {           
-       if (SDLTBTState_values == nil) {
-               SDLTBTState_values = [[NSMutableArray alloc] initWithObjects: 
-                                                                       SDLTBTState.ROUTE_UPDATE_REQUEST,
-                                                                       SDLTBTState.ROUTE_ACCEPTED,
-                                                                       SDLTBTState.ROUTE_REFUSED,
-                                                                       SDLTBTState.ROUTE_CANCELLED, 
-                                                                       nil];                        
-       } 
-       return SDLTBTState_values;
-}
-
-+(SDLTBTState*) ROUTE_UPDATE_REQUEST {                                                                         
-       if (SDLTBTState_ROUTE_UPDATE_REQUEST == nil) {
-               SDLTBTState_ROUTE_UPDATE_REQUEST = [[SDLTBTState alloc] initWithValue:@"ROUTE_UPDATE_REQUEST"];
-       } 
-       return SDLTBTState_ROUTE_UPDATE_REQUEST;
-}
-
-+(SDLTBTState*) ROUTE_ACCEPTED {                                                                               
-       if (SDLTBTState_ROUTE_ACCEPTED == nil) {
-               SDLTBTState_ROUTE_ACCEPTED = [[SDLTBTState alloc] initWithValue:@"ROUTE_ACCEPTED"];
-       } 
-       return SDLTBTState_ROUTE_ACCEPTED;
-}
-
-+(SDLTBTState*) ROUTE_REFUSED {                                                                                
-       if (SDLTBTState_ROUTE_REFUSED == nil) {
-               SDLTBTState_ROUTE_REFUSED = [[SDLTBTState alloc] initWithValue:@"ROUTE_REFUSED"];
-       } 
-       return SDLTBTState_ROUTE_REFUSED;
-}
-
-+(SDLTBTState*) ROUTE_CANCELLED {
-       if (SDLTBTState_ROUTE_CANCELLED  == nil) {
-               SDLTBTState_ROUTE_CANCELLED  = [[SDLTBTState alloc] initWithValue:@"ROUTE_CANCELLED "];
-       } 
-       return SDLTBTState_ROUTE_CANCELLED;  
-}
-
-@end
-
-

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextFieldName.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextFieldName.h
deleted file mode 100644 (file)
index 880e954..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextFieldName.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLEnum.h"
-
-@interface SDLTextFieldName : SDLEnum {}
-
-+(SDLTextFieldName*) valueOf:(NSString*) value;
-+(NSMutableArray*) values;
-
-+(SDLTextFieldName*) mainField1;
-+(SDLTextFieldName*) mainField2;
-+(SDLTextFieldName*) statusBar;
-+(SDLTextFieldName*) mediaClock;
-+(SDLTextFieldName*) mediaTrack;
-+(SDLTextFieldName*) alertText1;
-+(SDLTextFieldName*) alertText2;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextFieldName.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextFieldName.m
deleted file mode 100644 (file)
index ee7f014..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLTextFieldName.m
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLTextFieldName.h"
-
-SDLTextFieldName* SDLTextFieldName_mainField1 = nil;
-SDLTextFieldName* SDLTextFieldName_mainField2 = nil;
-SDLTextFieldName* SDLTextFieldName_statusBar = nil;
-SDLTextFieldName* SDLTextFieldName_mediaClock = nil;
-SDLTextFieldName* SDLTextFieldName_mediaTrack = nil;
-SDLTextFieldName* SDLTextFieldName_alertText1 = nil;
-SDLTextFieldName* SDLTextFieldName_alertText2 = nil;
-
-NSMutableArray* SDLTextFieldName_values = nil;
-@implementation SDLTextFieldName
-
-+(SDLTextFieldName*) valueOf:(NSString*) value {
-    for (SDLTextFieldName* item in SDLTextFieldName.values) {
-        if ([item.value isEqualToString:value]) {
-            return item;
-        }
-    }
-    return nil;
-}
-
-+(NSMutableArray*) values {
-    if (SDLTextFieldName_values == nil) {
-        SDLTextFieldName_values = [[NSMutableArray alloc] initWithObjects:
-                SDLTextFieldName.mainField1,
-                SDLTextFieldName.mainField2,
-                SDLTextFieldName.statusBar,
-                SDLTextFieldName.mediaClock,
-                SDLTextFieldName.mediaTrack,
-                SDLTextFieldName.alertText1,
-                SDLTextFieldName.alertText2,
-                nil];
-    }
-    return SDLTextFieldName_values;
-}
-
-+(SDLTextFieldName*) mainField1 {
-       if (SDLTextFieldName_mainField1 == nil) {
-                       SDLTextFieldName_mainField1 = [[SDLTextFieldName alloc] initWithValue:@"mainField1"];
-       }
-       return SDLTextFieldName_mainField1;
-}
-
-+(SDLTextFieldName*) mainField2 {
-       if (SDLTextFieldName_mainField2 == nil) {
-                       SDLTextFieldName_mainField2 = [[SDLTextFieldName alloc] initWithValue:@"mainField2"];
-       }
-       return SDLTextFieldName_mainField2;
-}
-
-+(SDLTextFieldName*) statusBar {
-       if (SDLTextFieldName_statusBar == nil) {
-                       SDLTextFieldName_statusBar = [[SDLTextFieldName alloc] initWithValue:@"statusBar"];
-       }
-       return SDLTextFieldName_statusBar;
-}
-
-+(SDLTextFieldName*) mediaClock {
-       if (SDLTextFieldName_mediaClock == nil) {
-                       SDLTextFieldName_mediaClock = [[SDLTextFieldName alloc] initWithValue:@"mediaClock"];
-       }
-       return SDLTextFieldName_mediaClock;
-}
-
-+(SDLTextFieldName*) mediaTrack {
-       if (SDLTextFieldName_mediaTrack == nil) {
-                       SDLTextFieldName_mediaTrack = [[SDLTextFieldName alloc] initWithValue:@"mediaTrack"];
-       }
-       return SDLTextFieldName_mediaTrack;
-}
-
-+(SDLTextFieldName*) alertText1 {
-       if (SDLTextFieldName_alertText1 == nil) {
-                       SDLTextFieldName_alertText1 = [[SDLTextFieldName alloc] initWithValue:@"alertText1"];
-       }
-       return SDLTextFieldName_alertText1;
-}
-
-+(SDLTextFieldName*) alertText2 {
-       if (SDLTextFieldName_alertText2 == nil) {
-                       SDLTextFieldName_alertText2 = [[SDLTextFieldName alloc] initWithValue:@"alertText2"];
-       }
-       return SDLTextFieldName_alertText2;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLVRCapabilities.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLVRCapabilities.h
deleted file mode 100644 (file)
index 4aa2a47..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLVRCapabilities.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLEnum.h"
-
-@interface SDLVRCapabilities : SDLEnum {}
-
-+(SDLVRCapabilities*) valueOf:(NSString*) value;
-+(NSMutableArray*) values;
-
-+(SDLVRCapabilities*) Text;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLVRCapabilities.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLVRCapabilities.m
deleted file mode 100644 (file)
index 2cab853..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/RPC/SDLVRCapabilities.m
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLVRCapabilities.h"
-
-SDLVRCapabilities* SDLVRCapabilities_Text = nil;
-
-NSMutableArray* SDLVRCapabilities_values = nil;
-@implementation SDLVRCapabilities
-
-+(SDLVRCapabilities*) valueOf:(NSString*) value {
-    for (SDLVRCapabilities* item in SDLVRCapabilities.values) {
-        if ([item.value isEqualToString:value]) {
-            return item;
-        }
-    }
-    return nil;
-}
-
-+(NSMutableArray*) values {
-    if (SDLVRCapabilities_values == nil) {
-        SDLVRCapabilities_values = [[NSMutableArray alloc] initWithObjects:
-                SDLVRCapabilities.Text,
-                nil];
-    }
-    return SDLVRCapabilities_values;
-}
-
-+(SDLVRCapabilities*) Text {
-       if (SDLVRCapabilities_Text == nil) {
-                       SDLVRCapabilities_Text = [[SDLVRCapabilities alloc] initWithValue:@"Text"];
-       }
-       return SDLVRCapabilities_Text;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJSON.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJSON.h
deleted file mode 100644 (file)
index 43d63c3..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJSON.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- Copyright (C) 2007-2009 Stig Brautaset. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- 
- * Neither the name of the author nor the names of its contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-#import "SBJsonParser.h"
-#import "SBJsonWriter.h"
-
-/**
- @brief Facade for SBJsonWriter/SBJsonParser.
-
- Requests are forwarded to instances of SBJsonWriter and SBJsonParser.
- */
-@interface SBJSON : SBJsonBase <SBJsonParser, SBJsonWriter> {
-
-@private    
-    SBJsonParser *jsonParser;
-    SBJsonWriter *jsonWriter;
-}
-
-
-/// Return the fragment represented by the given string
-- (id)fragmentWithString:(NSString*)jsonrep
-                   error:(NSError**)error;
-
-/// Return the object represented by the given string
-- (id)objectWithString:(NSString*)jsonrep
-                 error:(NSError**)error;
-
-/// Parse the string and return the represented object (or scalar)
-- (id)objectWithString:(id)value
-           allowScalar:(BOOL)x
-                        error:(NSError**)error;
-
-
-/// Return JSON representation of an array  or dictionary
-- (NSString*)stringWithObject:(id)value
-                        error:(NSError**)error;
-
-/// Return JSON representation of any legal JSON value
-- (NSString*)stringWithFragment:(id)value
-                          error:(NSError**)error;
-
-/// Return JSON representation (or fragment) for the given object
-- (NSString*)stringWithObject:(id)value
-                  allowScalar:(BOOL)x
-                                       error:(NSError**)error;
-
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJSON.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJSON.m
deleted file mode 100644 (file)
index 2a30f1a..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJSON.m
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- Copyright (C) 2007-2009 Stig Brautaset. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- 
- * Neither the name of the author nor the names of its contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "SBJSON.h"
-
-@implementation SBJSON
-
-- (id)init {
-    self = [super init];
-    if (self) {
-        jsonWriter = [SBJsonWriter new];
-        jsonParser = [SBJsonParser new];
-        [self setMaxDepth:512];
-
-    }
-    return self;
-}
-
-- (void)dealloc {
-    [jsonWriter release];
-    [jsonParser release];
-    [super dealloc];
-}
-
-#pragma mark Writer 
-
-
-- (NSString *)stringWithObject:(id)obj {
-    NSString *repr = [jsonWriter stringWithObject:obj];
-    if (repr)
-        return repr;
-    
-    [errorTrace release];
-    errorTrace = [[jsonWriter errorTrace] mutableCopy];
-    return nil;
-}
-
-/**
- Returns a string containing JSON representation of the passed in value, or nil on error.
- If nil is returned and @p error is not NULL, @p *error can be interrogated to find the cause of the error.
- 
- @param value any instance that can be represented as a JSON fragment
- @param allowScalar wether to return json fragments for scalar objects
- @param error used to return an error by reference (pass NULL if this is not desired)
- 
-@deprecated Given we bill ourselves as a "strict" JSON library, this method should be removed.
- */
-- (NSString*)stringWithObject:(id)value allowScalar:(BOOL)allowScalar error:(NSError**)error {
-    
-    NSString *json = allowScalar ? [jsonWriter stringWithFragment:value] : [jsonWriter stringWithObject:value];
-    if (json)
-        return json;
-
-    [errorTrace release];
-    errorTrace = [[jsonWriter errorTrace] mutableCopy];
-    
-    if (error)
-        *error = [errorTrace lastObject];
-    return nil;
-}
-
-/**
- Returns a string containing JSON representation of the passed in value, or nil on error.
- If nil is returned and @p error is not NULL, @p error can be interrogated to find the cause of the error.
- 
- @param value any instance that can be represented as a JSON fragment
- @param error used to return an error by reference (pass NULL if this is not desired)
- 
- @deprecated Given we bill ourselves as a "strict" JSON library, this method should be removed.
- */
-- (NSString*)stringWithFragment:(id)value error:(NSError**)error {
-    return [self stringWithObject:value
-                      allowScalar:YES
-                            error:error];
-}
-
-/**
- Returns a string containing JSON representation of the passed in value, or nil on error.
- If nil is returned and @p error is not NULL, @p error can be interrogated to find the cause of the error.
- 
- @param value a NSDictionary or NSArray instance
- @param error used to return an error by reference (pass NULL if this is not desired)
- */
-- (NSString*)stringWithObject:(id)value error:(NSError**)error {
-    return [self stringWithObject:value
-                      allowScalar:NO
-                            error:error];
-}
-
-#pragma mark Parsing
-
-- (id)objectWithString:(NSString *)repr {
-    id obj = [jsonParser objectWithString:repr];
-    if (obj)
-        return obj;
-
-    [errorTrace release];
-    errorTrace = [[jsonParser errorTrace] mutableCopy];
-    
-    return nil;
-}
-
-/**
- Returns the object represented by the passed-in string or nil on error. The returned object can be
- a string, number, boolean, null, array or dictionary.
- 
- @param value the json string to parse
- @param allowScalar whether to return objects for JSON fragments
- @param error used to return an error by reference (pass NULL if this is not desired)
- 
- @deprecated Given we bill ourselves as a "strict" JSON library, this method should be removed.
- */
-- (id)objectWithString:(id)value allowScalar:(BOOL)allowScalar error:(NSError**)error {
-
-    id obj = allowScalar ? [jsonParser fragmentWithString:value] : [jsonParser objectWithString:value];
-    if (obj)
-        return obj;
-    
-    [errorTrace release];
-    errorTrace = [[jsonParser errorTrace] mutableCopy];
-
-    if (error)
-        *error = [errorTrace lastObject];
-    return nil;
-}
-
-/**
- Returns the object represented by the passed-in string or nil on error. The returned object can be
- a string, number, boolean, null, array or dictionary.
- 
- @param repr the json string to parse
- @param error used to return an error by reference (pass NULL if this is not desired)
- 
- @deprecated Given we bill ourselves as a "strict" JSON library, this method should be removed. 
- */
-- (id)fragmentWithString:(NSString*)repr error:(NSError**)error {
-    return [self objectWithString:repr
-                      allowScalar:YES
-                            error:error];
-}
-
-/**
- Returns the object represented by the passed-in string or nil on error. The returned object
- will be either a dictionary or an array.
- 
- @param repr the json string to parse
- @param error used to return an error by reference (pass NULL if this is not desired)
- */
-- (id)objectWithString:(NSString*)repr error:(NSError**)error {
-    return [self objectWithString:repr
-                      allowScalar:NO
-                            error:error];
-}
-
-
-
-#pragma mark Properties - parsing
-
-- (NSUInteger)maxDepth {
-    return jsonParser.maxDepth;
-}
-
-- (void)setMaxDepth:(NSUInteger)d {
-     jsonWriter.maxDepth = jsonParser.maxDepth = d;
-}
-
-
-#pragma mark Properties - writing
-
-- (BOOL)humanReadable {
-    return jsonWriter.humanReadable;
-}
-
-- (void)setHumanReadable:(BOOL)x {
-    jsonWriter.humanReadable = x;
-}
-
-- (BOOL)sortKeys {
-    return jsonWriter.sortKeys;
-}
-
-- (void)setSortKeys:(BOOL)x {
-    jsonWriter.sortKeys = x;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonBase.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonBase.h
deleted file mode 100644 (file)
index 7b10844..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonBase.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- 
- * Neither the name of the author nor the names of its contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-
-extern NSString * SBJSONErrorDomain;
-
-
-enum {
-    EUNSUPPORTED = 1,
-    EPARSENUM,
-    EPARSE,
-    EFRAGMENT,
-    ECTRL,
-    EUNICODE,
-    EDEPTH,
-    EESCAPE,
-    ETRAILCOMMA,
-    ETRAILGARBAGE,
-    EEOF,
-    EINPUT
-};
-
-/**
- @brief Common base class for parsing & writing.
-
- This class contains the common error-handling code and option between the parser/writer.
- */
-@interface SBJsonBase : NSObject {
-    NSMutableArray *errorTrace;
-
-@protected
-    NSUInteger depth, maxDepth;
-}
-
-/**
- @brief The maximum recursing depth.
- 
- Defaults to 512. If the input is nested deeper than this the input will be deemed to be
- malicious and the parser returns nil, signalling an error. ("Nested too deep".) You can
- turn off this security feature by setting the maxDepth value to 0.
- */
-@property NSUInteger maxDepth;
-
-/**
- @brief Return an error trace, or nil if there was no errors.
- 
- Note that this method returns the trace of the last method that failed.
- You need to check the return value of the call you're making to figure out
- if the call actually failed, before you know call this method.
- */
- @property(copy,readonly) NSArray* errorTrace;
-
-/// @internal for use in subclasses to add errors to the stack trace
-- (void)addErrorWithCode:(NSUInteger)code description:(NSString*)str;
-
-/// @internal for use in subclasess to clear the error before a new parsing attempt
-- (void)clearErrorTrace;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonBase.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonBase.m
deleted file mode 100644 (file)
index 6684325..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonBase.m
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- 
- * Neither the name of the author nor the names of its contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "SBJsonBase.h"
-NSString * SBJSONErrorDomain = @"org.brautaset.JSON.ErrorDomain";
-
-
-@implementation SBJsonBase
-
-@synthesize errorTrace;
-@synthesize maxDepth;
-
-- (id)init {
-    self = [super init];
-    if (self)
-        self.maxDepth = 512;
-    return self;
-}
-
-- (void)dealloc {
-    [errorTrace release];
-    [super dealloc];
-}
-
-- (void)addErrorWithCode:(NSUInteger)code description:(NSString*)str {
-    NSDictionary *userInfo;
-    if (!errorTrace) {
-        errorTrace = [NSMutableArray new];
-        userInfo = [NSDictionary dictionaryWithObject:str forKey:NSLocalizedDescriptionKey];
-        
-    } else {
-        userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
-                    str, NSLocalizedDescriptionKey,
-                    [errorTrace lastObject], NSUnderlyingErrorKey,
-                    nil];
-    }
-    
-    NSError *error = [NSError errorWithDomain:SBJSONErrorDomain code:code userInfo:userInfo];
-
-    [self willChangeValueForKey:@"errorTrace"];
-    [errorTrace addObject:error];
-    [self didChangeValueForKey:@"errorTrace"];
-}
-
-- (void)clearErrorTrace {
-    [self willChangeValueForKey:@"errorTrace"];
-    [errorTrace release];
-    errorTrace = nil;
-    [self didChangeValueForKey:@"errorTrace"];
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonParser.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonParser.h
deleted file mode 100644 (file)
index e95304d..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonParser.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- 
- * Neither the name of the author nor the names of its contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-#import "SBJsonBase.h"
-
-/**
-  @brief Options for the parser class.
- 
- This exists so the SBJSON facade can implement the options in the parser without having to re-declare them.
- */
-@protocol SBJsonParser
-
-/**
- @brief Return the object represented by the given string.
- 
- Returns the object represented by the passed-in string or nil on error. The returned object can be
- a string, number, boolean, null, array or dictionary.
- 
- @param repr the json string to parse
- */
-- (id)objectWithString:(NSString *)repr;
-
-@end
-
-
-/**
- @brief The JSON parser class.
- 
- JSON is mapped to Objective-C types in the following way:
- 
- @li Null -> NSNull
- @li String -> NSMutableString
- @li Array -> NSMutableArray
- @li Object -> NSMutableDictionary
- @li Boolean -> NSNumber (initialised with -initWithBool:)
- @li Number -> NSDecimalNumber
- 
- Since Objective-C doesn't have a dedicated class for boolean values, these turns into NSNumber
- instances. These are initialised with the -initWithBool: method, and 
- round-trip back to JSON properly. (They won't silently suddenly become 0 or 1; they'll be
- represented as 'true' and 'false' again.)
- 
- JSON numbers turn into NSDecimalNumber instances,
- as we can thus avoid any loss of precision. (JSON allows ridiculously large numbers.)
- 
- */
-@interface SBJsonParser : SBJsonBase <SBJsonParser> {
-    
-@private
-    const char *c;
-}
-
-@end
-
-// don't use - exists for backwards compatibility with 2.1.x only. Will be removed in 2.3.
-@interface SBJsonParser (Private)
-- (id)fragmentWithString:(id)repr;
-@end
-
-

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonParser.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonParser.m
deleted file mode 100644 (file)
index 0fdfb36..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonParser.m
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- 
- * Neither the name of the author nor the names of its contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "SBJsonParser.h"
-
-@interface SBJsonParser ()
-
-- (BOOL)scanValue:(NSObject **)o;
-
-- (BOOL)scanRestOfArray:(NSMutableArray **)o;
-- (BOOL)scanRestOfDictionary:(NSMutableDictionary **)o;
-- (BOOL)scanRestOfNull:(NSNull **)o;
-- (BOOL)scanRestOfFalse:(NSNumber **)o;
-- (BOOL)scanRestOfTrue:(NSNumber **)o;
-- (BOOL)scanRestOfString:(NSMutableString **)o;
-
-// Cannot manage without looking at the first digit
-- (BOOL)scanNumber:(NSNumber **)o;
-
-- (BOOL)scanHexQuad:(unichar *)x;
-- (BOOL)scanUnicodeChar:(unichar *)x;
-
-- (BOOL)scanIsAtEnd;
-
-@end
-
-#define skipWhitespace(c) while (isspace(*c)) c++
-#define skipDigits(c) while (isdigit(*c)) c++
-
-
-@implementation SBJsonParser
-
-static char ctrl[0x22];
-
-+ (void)initialize
-{
-    ctrl[0] = '\"';
-    ctrl[1] = '\\';
-    for (int i = 1; i < 0x20; i++)
-        ctrl[i+1] = i;
-    ctrl[0x21] = 0;    
-}
-
-/**
- @deprecated This exists in order to provide fragment support in older APIs in one more version.
- It should be removed in the next major version.
- */
-- (id)fragmentWithString:(id)repr {
-    [self clearErrorTrace];
-    
-    if (!repr) {
-        [self addErrorWithCode:EINPUT description:@"Input was 'nil'"];
-        return nil;
-    }
-    
-    depth = 0;
-    c = [repr UTF8String];
-    
-    id o;
-    if (![self scanValue:&o]) {
-        return nil;
-    }
-    
-    // We found some valid JSON. But did it also contain something else?
-    if (![self scanIsAtEnd]) {
-        [self addErrorWithCode:ETRAILGARBAGE description:@"Garbage after JSON"];
-        return nil;
-    }
-        
-    NSAssert1(o, @"Should have a valid object from %@", repr);
-    return o;    
-}
-
-- (id)objectWithString:(NSString *)repr {
-
-    id o = [self fragmentWithString:repr];
-    if (!o)
-        return nil;
-    
-    // Check that the object we've found is a valid JSON container.
-    if (![o isKindOfClass:[NSDictionary class]] && ![o isKindOfClass:[NSArray class]]) {
-        [self addErrorWithCode:EFRAGMENT description:@"Valid fragment, but not JSON"];
-        return nil;
-    }
-
-    return o;
-}
-
-/*
- In contrast to the public methods, it is an error to omit the error parameter here.
- */
-- (BOOL)scanValue:(NSObject **)o
-{
-    skipWhitespace(c);
-    
-    switch (*c++) {
-        case '{':
-            return [self scanRestOfDictionary:(NSMutableDictionary **)o];
-            break;
-        case '[':
-            return [self scanRestOfArray:(NSMutableArray **)o];
-            break;
-        case '"':
-            return [self scanRestOfString:(NSMutableString **)o];
-            break;
-        case 'f':
-            return [self scanRestOfFalse:(NSNumber **)o];
-            break;
-        case 't':
-            return [self scanRestOfTrue:(NSNumber **)o];
-            break;
-        case 'n':
-            return [self scanRestOfNull:(NSNull **)o];
-            break;
-        case '-':
-        case '0'...'9':
-            c--; // cannot verify number correctly without the first character
-            return [self scanNumber:(NSNumber **)o];
-            break;
-        case '+':
-            [self addErrorWithCode:EPARSENUM description: @"Leading + disallowed in number"];
-            return NO;
-            break;
-        case 0x0:
-            [self addErrorWithCode:EEOF description:@"Unexpected end of string"];
-            return NO;
-            break;
-        default:
-            [self addErrorWithCode:EPARSE description: @"Unrecognised leading character"];
-            return NO;
-            break;
-    }
-    
-    NSAssert(0, @"Should never get here");
-    return NO;
-}
-
-- (BOOL)scanRestOfTrue:(NSNumber **)o
-{
-    if (!strncmp(c, "rue", 3)) {
-        c += 3;
-        *o = [NSNumber numberWithBool:YES];
-        return YES;
-    }
-    [self addErrorWithCode:EPARSE description:@"Expected 'true'"];
-    return NO;
-}
-
-- (BOOL)scanRestOfFalse:(NSNumber **)o
-{
-    if (!strncmp(c, "alse", 4)) {
-        c += 4;
-        *o = [NSNumber numberWithBool:NO];
-        return YES;
-    }
-    [self addErrorWithCode:EPARSE description: @"Expected 'false'"];
-    return NO;
-}
-
-- (BOOL)scanRestOfNull:(NSNull **)o {
-    if (!strncmp(c, "ull", 3)) {
-        c += 3;
-        *o = [NSNull null];
-        return YES;
-    }
-    [self addErrorWithCode:EPARSE description: @"Expected 'null'"];
-    return NO;
-}
-
-- (BOOL)scanRestOfArray:(NSMutableArray **)o {
-    if (maxDepth && ++depth > maxDepth) {
-        [self addErrorWithCode:EDEPTH description: @"Nested too deep"];
-        return NO;
-    }
-    
-    *o = [NSMutableArray arrayWithCapacity:8];
-    
-    for (; *c ;) {
-        id v;
-        
-        skipWhitespace(c);
-        if (*c == ']' && c++) {
-            depth--;
-            return YES;
-        }
-        
-        if (![self scanValue:&v]) {
-            [self addErrorWithCode:EPARSE description:@"Expected value while parsing array"];
-            return NO;
-        }
-        
-        [*o addObject:v];
-        
-        skipWhitespace(c);
-        if (*c == ',' && c++) {
-            skipWhitespace(c);
-            if (*c == ']') {
-                [self addErrorWithCode:ETRAILCOMMA description: @"Trailing comma disallowed in array"];
-                return NO;
-            }
-        }        
-    }
-    
-    [self addErrorWithCode:EEOF description: @"End of input while parsing array"];
-    return NO;
-}
-
-- (BOOL)scanRestOfDictionary:(NSMutableDictionary **)o 
-{
-    if (maxDepth && ++depth > maxDepth) {
-        [self addErrorWithCode:EDEPTH description: @"Nested too deep"];
-        return NO;
-    }
-    
-    *o = [NSMutableDictionary dictionaryWithCapacity:7];
-    
-    for (; *c ;) {
-        id k, v;
-        
-        skipWhitespace(c);
-        if (*c == '}' && c++) {
-            depth--;
-            return YES;
-        }    
-        
-        if (!(*c == '\"' && c++ && [self scanRestOfString:&k])) {
-            [self addErrorWithCode:EPARSE description: @"Object key string expected"];
-            return NO;
-        }
-        
-        skipWhitespace(c);
-        if (*c != ':') {
-            [self addErrorWithCode:EPARSE description: @"Expected ':' separating key and value"];
-            return NO;
-        }
-        
-        c++;
-        if (![self scanValue:&v]) {
-            NSString *string = [NSString stringWithFormat:@"Object value expected for key: %@", k];
-            [self addErrorWithCode:EPARSE description: string];
-            return NO;
-        }
-        
-        [*o setObject:v forKey:k];
-        
-        skipWhitespace(c);
-        if (*c == ',' && c++) {
-            skipWhitespace(c);
-            if (*c == '}') {
-                [self addErrorWithCode:ETRAILCOMMA description: @"Trailing comma disallowed in object"];
-                return NO;
-            }
-        }        
-    }
-    
-    [self addErrorWithCode:EEOF description: @"End of input while parsing object"];
-    return NO;
-}
-
-- (BOOL)scanRestOfString:(NSMutableString **)o 
-{
-    *o = [NSMutableString stringWithCapacity:16];
-    do {
-        // First see if there's a portion we can grab in one go. 
-        // Doing this caused a massive speedup on the long string.
-        size_t len = strcspn(c, ctrl);
-        if (len) {
-            // check for 
-            id t = [[NSString alloc] initWithBytesNoCopy:(char*)c
-                                                  length:len
-                                                encoding:NSUTF8StringEncoding
-                                            freeWhenDone:NO];
-            if (t) {
-                [*o appendString:t];
-                [t release];
-                c += len;
-            }
-        }
-        
-        if (*c == '"') {
-            c++;
-            return YES;
-            
-        } else if (*c == '\\') {
-            unichar uc = *++c;
-            switch (uc) {
-                case '\\':
-                case '/':
-                case '"':
-                    break;
-                    
-                case 'b':   uc = '\b';  break;
-                case 'n':   uc = '\n';  break;
-                case 'r':   uc = '\r';  break;
-                case 't':   uc = '\t';  break;
-                case 'f':   uc = '\f';  break;                    
-                    
-                case 'u':
-                    c++;
-                    if (![self scanUnicodeChar:&uc]) {
-                        [self addErrorWithCode:EUNICODE description: @"Broken unicode character"];
-                        return NO;
-                    }
-                    c--; // hack.
-                    break;
-                default:
-                    [self addErrorWithCode:EESCAPE description: [NSString stringWithFormat:@"Illegal escape sequence '0x%x'", uc]];
-                    return NO;
-                    break;
-            }
-            CFStringAppendCharacters((CFMutableStringRef)*o, &uc, 1);
-            c++;
-            
-        } else if (*c < 0x20) {
-            [self addErrorWithCode:ECTRL description: [NSString stringWithFormat:@"Unescaped control character '0x%x'", *c]];
-            return NO;
-            
-        } else {
-            NSLog(@"should not be able to get here");
-        }
-    } while (*c);
-    
-    [self addErrorWithCode:EEOF description:@"Unexpected EOF while parsing string"];
-    return NO;
-}
-
-- (BOOL)scanUnicodeChar:(unichar *)x
-{
-    unichar hi, lo;
-    
-    if (![self scanHexQuad:&hi]) {
-        [self addErrorWithCode:EUNICODE description: @"Missing hex quad"];
-        return NO;        
-    }
-    
-    if (hi >= 0xd800) {     // high surrogate char?
-        if (hi < 0xdc00) {  // yes - expect a low char
-            
-            if (!(*c == '\\' && ++c && *c == 'u' && ++c && [self scanHexQuad:&lo])) {
-                [self addErrorWithCode:EUNICODE description: @"Missing low character in surrogate pair"];
-                return NO;
-            }
-            
-            if (lo < 0xdc00 || lo >= 0xdfff) {
-                [self addErrorWithCode:EUNICODE description:@"Invalid low surrogate char"];
-                return NO;
-            }
-            
-            hi = (hi - 0xd800) * 0x400 + (lo - 0xdc00) + 0x10000;
-            
-        } else if (hi < 0xe000) {
-            [self addErrorWithCode:EUNICODE description:@"Invalid high character in surrogate pair"];
-            return NO;
-        }
-    }
-    
-    *x = hi;
-    return YES;
-}
-
-- (BOOL)scanHexQuad:(unichar *)x
-{
-    *x = 0;
-    for (int i = 0; i < 4; i++) {
-        unichar uc = *c;
-        c++;
-        int d = (uc >= '0' && uc <= '9')
-        ? uc - '0' : (uc >= 'a' && uc <= 'f')
-        ? (uc - 'a' + 10) : (uc >= 'A' && uc <= 'F')
-        ? (uc - 'A' + 10) : -1;
-        if (d == -1) {
-            [self addErrorWithCode:EUNICODE description:@"Missing hex digit in quad"];
-            return NO;
-        }
-        *x *= 16;
-        *x += d;
-    }
-    return YES;
-}
-
-- (BOOL)scanNumber:(NSNumber **)o
-{
-    const char *ns = c;
-    
-    // The logic to test for validity of the number formatting is relicensed
-    // from JSON::XS with permission from its author Marc Lehmann.
-    // (Available at the CPAN: http://search.cpan.org/dist/JSON-XS/ .)
-    
-    if ('-' == *c)
-        c++;
-    
-    if ('0' == *c && c++) {        
-        if (isdigit(*c)) {
-            [self addErrorWithCode:EPARSENUM description: @"Leading 0 disallowed in number"];
-            return NO;
-        }
-        
-    } else if (!isdigit(*c) && c != ns) {
-        [self addErrorWithCode:EPARSENUM description: @"No digits after initial minus"];
-        return NO;
-        
-    } else {
-        skipDigits(c);
-    }
-    
-    // Fractional part
-    if ('.' == *c && c++) {
-        
-        if (!isdigit(*c)) {
-            [self addErrorWithCode:EPARSENUM description: @"No digits after decimal point"];
-            return NO;
-        }        
-        skipDigits(c);
-    }
-    
-    // Exponential part
-    if ('e' == *c || 'E' == *c) {
-        c++;
-        
-        if ('-' == *c || '+' == *c)
-            c++;
-        
-        if (!isdigit(*c)) {
-            [self addErrorWithCode:EPARSENUM description: @"No digits after exponent"];
-            return NO;
-        }
-        skipDigits(c);
-    }
-    
-    id str = [[NSString alloc] initWithBytesNoCopy:(char*)ns
-                                            length:c - ns
-                                          encoding:NSUTF8StringEncoding
-                                      freeWhenDone:NO];
-    [str autorelease];
-    if (str && (*o = [NSDecimalNumber decimalNumberWithString:str]))
-        return YES;
-    
-    [self addErrorWithCode:EPARSENUM description: @"Failed creating decimal instance"];
-    return NO;
-}
-
-- (BOOL)scanIsAtEnd
-{
-    skipWhitespace(c);
-    return !*c;
-}
-
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonWriter.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonWriter.h
deleted file mode 100644 (file)
index f6f5e17..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonWriter.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- 
- * Neither the name of the author nor the names of its contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-#import "SBJsonBase.h"
-
-/**
- @brief Options for the writer class.
- 
- This exists so the SBJSON facade can implement the options in the writer without having to re-declare them.
- */
-@protocol SBJsonWriter
-
-/**
- @brief Whether we are generating human-readable (multiline) JSON.
- 
- Set whether or not to generate human-readable JSON. The default is NO, which produces
- JSON without any whitespace. (Except inside strings.) If set to YES, generates human-readable
- JSON with linebreaks after each array value and dictionary key/value pair, indented two
- spaces per nesting level.
- */
-@property BOOL humanReadable;
-
-/**
- @brief Whether or not to sort the dictionary keys in the output.
- 
- If this is set to YES, the dictionary keys in the JSON output will be in sorted order.
- (This is useful if you need to compare two structures, for example.) The default is NO.
- */
-@property BOOL sortKeys;
-
-/**
- @brief Return JSON representation (or fragment) for the given object.
- 
- Returns a string containing JSON representation of the passed in value, or nil on error.
- If nil is returned and @p error is not NULL, @p *error can be interrogated to find the cause of the error.
- 
- @param value any instance that can be represented as a JSON fragment
- 
- */
-- (NSString*)stringWithObject:(id)value;
-
-@end
-
-
-/**
- @brief The JSON writer class.
- 
- Objective-C types are mapped to JSON types in the following way:
- 
- @li NSNull -> Null
- @li NSString -> String
- @li NSArray -> Array
- @li NSDictionary -> Object
- @li NSNumber (-initWithBool:) -> Boolean
- @li NSNumber -> Number
- 
- In JSON the keys of an object must be strings. NSDictionary keys need
- not be, but attempting to convert an NSDictionary with non-string keys
- into JSON will throw an exception.
- 
- NSNumber instances created with the +initWithBool: method are
- converted into the JSON boolean "true" and "false" values, and vice
- versa. Any other NSNumber instances are converted to a JSON number the
- way you would expect.
- 
- */
-@interface SBJsonWriter : SBJsonBase <SBJsonWriter> {
-
-@private
-    BOOL sortKeys, humanReadable;
-}
-
-@end
-
-// don't use - exists for backwards compatibility. Will be removed in 2.3.
-@interface SBJsonWriter (Private)
-- (NSString*)stringWithFragment:(id)value;
-@end
-
-/**
- @brief Allows generation of JSON for otherwise unsupported classes.
- 
- If you have a custom class that you want to create a JSON representation for you can implement
- this method in your class. It should return a representation of your object defined
- in terms of objects that can be translated into JSON. For example, a Person
- object might implement it like this:
- 
- @code
- - (id)jsonProxyObject {
-    return [NSDictionary dictionaryWithObjectsAndKeys:
-        name, @"name",
-        phone, @"phone",
-        email, @"email",
-        nil];
- }
- @endcode
- 
- */
-@interface NSObject (SBProxyForJson)
-- (id)proxyForJson;
-@end
-

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonWriter.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonWriter.m
deleted file mode 100644 (file)
index 03718b9..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SBJsonWriter.m
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- Copyright (C) 2009 Stig Brautaset. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- 
- * Neither the name of the author nor the names of its contributors may be used
-   to endorse or promote products derived from this software without specific
-   prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "SBJsonWriter.h"
-
-@interface SBJsonWriter ()
-
-- (BOOL)appendValue:(id)fragment into:(NSMutableString*)json;
-- (BOOL)appendArray:(NSArray*)fragment into:(NSMutableString*)json;
-- (BOOL)appendDictionary:(NSDictionary*)fragment into:(NSMutableString*)json;
-- (BOOL)appendString:(NSString*)fragment into:(NSMutableString*)json;
-
-- (NSString*)indent;
-
-@end
-
-@implementation SBJsonWriter
-
-@synthesize sortKeys;
-@synthesize humanReadable;
-
-/**
- @deprecated This exists in order to provide fragment support in older APIs in one more version.
- It should be removed in the next major version.
- */
-- (NSString*)stringWithFragment:(id)value {
-    [self clearErrorTrace];
-    depth = 0;
-    NSMutableString *json = [NSMutableString stringWithCapacity:128];
-    
-    if ([self appendValue:value into:json])
-        return json;
-    
-    return nil;
-}
-
-
-- (NSString*)stringWithObject:(id)value {
-    
-    if ([value isKindOfClass:[NSDictionary class]] || [value isKindOfClass:[NSArray class]]) {
-        return [self stringWithFragment:value];
-    }
-
-    [self clearErrorTrace];
-    [self addErrorWithCode:EFRAGMENT description:@"Not valid type for JSON"];
-    return nil;
-}
-
-
-- (NSString*)indent {
-    return [@"\n" stringByPaddingToLength:1 + 2 * depth withString:@" " startingAtIndex:0];
-}
-
-- (BOOL)appendValue:(id)fragment into:(NSMutableString*)json {
-    if ([fragment isKindOfClass:[NSDictionary class]]) {
-        if (![self appendDictionary:fragment into:json])
-            return NO;
-        
-    } else if ([fragment isKindOfClass:[NSArray class]]) {
-        if (![self appendArray:fragment into:json])
-            return NO;
-        
-    } else if ([fragment isKindOfClass:[NSString class]]) {
-        if (![self appendString:fragment into:json])
-            return NO;
-        
-    } else if ([fragment isKindOfClass:[NSNumber class]]) {
-        if ('c' == *[fragment objCType])
-            [json appendString:[fragment boolValue] ? @"true" : @"false"];
-        else
-            [json appendString:[fragment stringValue]];
-        
-    } else if ([fragment isKindOfClass:[NSNull class]]) {
-        [json appendString:@"null"];
-    } else if ([fragment respondsToSelector:@selector(proxyForJson)]) {
-        [self appendValue:[fragment proxyForJson] into:json];
-        
-    } else {
-        [self addErrorWithCode:EUNSUPPORTED description:[NSString stringWithFormat:@"JSON serialisation not supported for %@", [fragment class]]];
-        return NO;
-    }
-    return YES;
-}
-
-- (BOOL)appendArray:(NSArray*)fragment into:(NSMutableString*)json {
-    if (maxDepth && ++depth > maxDepth) {
-        [self addErrorWithCode:EDEPTH description: @"Nested too deep"];
-        return NO;
-    }
-    [json appendString:@"["];
-    
-    BOOL addComma = NO;    
-    for (id value in fragment) {
-        if (addComma)
-            [json appendString:@","];
-        else
-            addComma = YES;
-        
-        if ([self humanReadable])
-            [json appendString:[self indent]];
-        
-        if (![self appendValue:value into:json]) {
-            return NO;
-        }
-    }
-    
-    depth--;
-    if ([self humanReadable] && [fragment count])
-        [json appendString:[self indent]];
-    [json appendString:@"]"];
-    return YES;
-}
-
-- (BOOL)appendDictionary:(NSDictionary*)fragment into:(NSMutableString*)json {
-    if (maxDepth && ++depth > maxDepth) {
-        [self addErrorWithCode:EDEPTH description: @"Nested too deep"];
-        return NO;
-    }
-    [json appendString:@"{"];
-    
-    NSString *colon = [self humanReadable] ? @" : " : @":";
-    BOOL addComma = NO;
-    NSArray *keys = [fragment allKeys];
-    if (self.sortKeys)
-        keys = [keys sortedArrayUsingSelector:@selector(compare:)];
-    
-    for (id value in keys) {
-        if (addComma)
-            [json appendString:@","];
-        else
-            addComma = YES;
-        
-        if ([self humanReadable])
-            [json appendString:[self indent]];
-        
-        if (![value isKindOfClass:[NSString class]]) {
-            [self addErrorWithCode:EUNSUPPORTED description: @"JSON object key must be string"];
-            return NO;
-        }
-        
-        if (![self appendString:value into:json])
-            return NO;
-        
-        [json appendString:colon];
-        if (![self appendValue:[fragment objectForKey:value] into:json]) {
-            [self addErrorWithCode:EUNSUPPORTED description:[NSString stringWithFormat:@"Unsupported value for key %@ in object", value]];
-            return NO;
-        }
-    }
-    
-    depth--;
-    if ([self humanReadable] && [fragment count])
-        [json appendString:[self indent]];
-    [json appendString:@"}"];
-    return YES;    
-}
-
-- (BOOL)appendString:(NSString*)fragment into:(NSMutableString*)json {
-    
-    static NSMutableCharacterSet *kEscapeChars;
-    if( ! kEscapeChars ) {
-        kEscapeChars = [[NSMutableCharacterSet characterSetWithRange: NSMakeRange(0,32)] retain];
-        [kEscapeChars addCharactersInString: @"\"\\"];
-    }
-    
-    [json appendString:@"\""];
-    
-    NSRange esc = [fragment rangeOfCharacterFromSet:kEscapeChars];
-    if ( !esc.length ) {
-        // No special chars -- can just add the raw string:
-        [json appendString:fragment];
-        
-    } else {
-        NSUInteger length = [fragment length];
-        for (NSUInteger i = 0; i < length; i++) {
-            unichar uc = [fragment characterAtIndex:i];
-            switch (uc) {
-                case '"':   [json appendString:@"\\\""];       break;
-                case '\\':  [json appendString:@"\\\\"];       break;
-                case '\t':  [json appendString:@"\\t"];        break;
-                case '\n':  [json appendString:@"\\n"];        break;
-                case '\r':  [json appendString:@"\\r"];        break;
-                case '\b':  [json appendString:@"\\b"];        break;
-                case '\f':  [json appendString:@"\\f"];        break;
-                default:    
-                    if (uc < 0x20) {
-                        [json appendFormat:@"\\u%04x", uc];
-                    } else {
-                        CFStringAppendCharacters((CFMutableStringRef)json, &uc, 1);
-                    }
-                    break;
-                    
-            }
-        }
-    }
-    
-    [json appendString:@"\""];
-    return YES;
-}
-
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLConsoleController.xib b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLConsoleController.xib
deleted file mode 100644 (file)
index 7e34442..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLConsoleController.xib
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
-       <data>
-               <int key="IBDocument.SystemTarget">1024</int>
-               <string key="IBDocument.SystemVersion">10F569</string>
-               <string key="IBDocument.InterfaceBuilderVersion">804</string>
-               <string key="IBDocument.AppKitVersion">1038.29</string>
-               <string key="IBDocument.HIToolboxVersion">461.00</string>
-               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">123</string>
-               </object>
-               <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-                       <bool key="EncodedWithXMLCoder">YES</bool>
-               </object>
-               <object class="NSArray" key="IBDocument.PluginDependencies">
-                       <bool key="EncodedWithXMLCoder">YES</bool>
-                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-               </object>
-               <object class="NSMutableDictionary" key="IBDocument.Metadata">
-                       <bool key="EncodedWithXMLCoder">YES</bool>
-                       <object class="NSArray" key="dict.sortedKeys" id="0">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                       </object>
-                       <object class="NSMutableArray" key="dict.values">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                       </object>
-               </object>
-               <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-                       <bool key="EncodedWithXMLCoder">YES</bool>
-                       <object class="IBProxyObject" id="372490531">
-                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                       </object>
-                       <object class="IBProxyObject" id="975951072">
-                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                       </object>
-                       <object class="IBUITableView" id="873029372">
-                               <nil key="NSNextResponder"/>
-                               <int key="NSvFlags">274</int>
-                               <string key="NSFrameSize">{320, 460}</string>
-                               <object class="NSColor" key="IBUIBackgroundColor">
-                                       <int key="NSColorSpace">3</int>
-                                       <bytes key="NSWhite">MQA</bytes>
-                               </object>
-                               <bool key="IBUIOpaque">NO</bool>
-                               <bool key="IBUIClipsSubviews">YES</bool>
-                               <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                               <bool key="IBUIBouncesZoom">NO</bool>
-                               <int key="IBUISeparatorStyle">1</int>
-                               <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
-                               <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
-                               <float key="IBUIRowHeight">44</float>
-                               <float key="IBUISectionHeaderHeight">22</float>
-                               <float key="IBUISectionFooterHeight">22</float>
-                       </object>
-               </object>
-               <object class="IBObjectContainer" key="IBDocument.Objects">
-                       <object class="NSMutableArray" key="connectionRecords">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchOutletConnection" key="connection">
-                                               <string key="label">view</string>
-                                               <reference key="source" ref="372490531"/>
-                                               <reference key="destination" ref="873029372"/>
-                                       </object>
-                                       <int key="connectionID">5</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchOutletConnection" key="connection">
-                                               <string key="label">dataSource</string>
-                                               <reference key="source" ref="873029372"/>
-                                               <reference key="destination" ref="372490531"/>
-                                       </object>
-                                       <int key="connectionID">6</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchOutletConnection" key="connection">
-                                               <string key="label">delegate</string>
-                                               <reference key="source" ref="873029372"/>
-                                               <reference key="destination" ref="372490531"/>
-                                       </object>
-                                       <int key="connectionID">7</int>
-                               </object>
-                       </object>
-                       <object class="IBMutableOrderedSet" key="objectRecords">
-                               <object class="NSArray" key="orderedObjects">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
-                                               <reference key="object" ref="0"/>
-                                               <reference key="children" ref="1000"/>
-                                               <nil key="parent"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
-                                               <reference key="object" ref="372490531"/>
-                                               <reference key="parent" ref="0"/>
-                                               <string key="objectName">File's Owner</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
-                                               <reference key="object" ref="975951072"/>
-                                               <reference key="parent" ref="0"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
-                                               <reference key="object" ref="873029372"/>
-                                               <reference key="parent" ref="0"/>
-                                       </object>
-                               </object>
-                       </object>
-                       <object class="NSMutableDictionary" key="flattenedProperties">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="NSArray" key="dict.sortedKeys">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                       <string>-1.CustomClassName</string>
-                                       <string>-2.CustomClassName</string>
-                                       <string>4.IBEditorWindowLastContentRect</string>
-                                       <string>4.IBPluginDependency</string>
-                               </object>
-                               <object class="NSMutableArray" key="dict.values">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                       <string>FMConsoleController</string>
-                                       <string>UIResponder</string>
-                                       <string>{{329, 504}, {320, 480}}</string>
-                                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               </object>
-                       </object>
-                       <object class="NSMutableDictionary" key="unlocalizedProperties">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <reference key="dict.sortedKeys" ref="0"/>
-                               <object class="NSMutableArray" key="dict.values">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                               </object>
-                       </object>
-                       <nil key="activeLocalization"/>
-                       <object class="NSMutableDictionary" key="localizations">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <reference key="dict.sortedKeys" ref="0"/>
-                               <object class="NSMutableArray" key="dict.values">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                               </object>
-                       </object>
-                       <nil key="sourceID"/>
-                       <int key="maxID">7</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">FMConsoleController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBUserSource</string>
-                                               <string key="minorKey"/>
-                                       </object>
-                               </object>
-                       </object>
-               </object>
-               <int key="IBDocument.localizationMode">0</int>
-               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
-                       <integer value="3000" key="NS.object.0"/>
-               </object>
-               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-               <nil key="IBDocument.LastKnownRelativeProjectPath"/>
-               <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">123</string>
-       </data>
-</archive>

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIDecoder.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIDecoder.h
deleted file mode 100644 (file)
index 3b7193b..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIDecoder.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-
-@protocol SDLIDecoder
-
--(NSDictionary*) decode:(NSData*) msgBytes;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIEncoder.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIEncoder.h
deleted file mode 100644 (file)
index ccddb79..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIEncoder.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-
-@protocol SDLIEncoder
-
--(NSData*) encodeDictionary:(NSDictionary*) dict;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIProxy.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIProxy.h
deleted file mode 100644 (file)
index 85ae9e4..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLIProxy.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLITransport.h"
-#import "SDLProxyListener.h"
-#import "SDLRPCMessage.h"
-#import "SDLIProtocol.h"
-
-@protocol SDLIProxy
--(id)   initWithTransport:(NSObject<SDLITransport>*) transport protocol:(NSObject<SDLIProtocol>*) protocol delegate:(NSObject<SDLProxyListener>*) delegate;
-
--(void) dispose;
--(void) addDelegate:(NSObject<SDLProxyListener>*) delegate;
-
--(void) sendRPCRequest:(SDLRPCMessage*) msg;
--(void) handleRpcMessage:(NSDictionary*) msg;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJsonDecoder.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJsonDecoder.h
deleted file mode 100644 (file)
index 24baa0f..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJsonDecoder.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLIDecoder.h"
-
-@interface SDLJsonDecoder : NSObject<SDLIDecoder> {}
-
-+(NSObject<SDLIDecoder>*) instance;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJsonDecoder.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJsonDecoder.m
deleted file mode 100644 (file)
index 99575f1..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJsonDecoder.m
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLJsonDecoder.h"
-#import "SDLNames.h"
-#import "JSON.h"
-
-@implementation SDLJsonDecoder
-
-static NSObject<SDLIDecoder>* jsonDecoderInstance;
-
-+(NSObject<SDLIDecoder>*) instance {
-       if (jsonDecoderInstance == nil) {
-               jsonDecoderInstance = [[SDLJsonDecoder alloc] init];
-       }
-       return jsonDecoderInstance;
-}
-
--(NSDictionary*) decode:(NSData*) msgBytes{
-       NSString* jsonString = [[[NSString alloc] initWithData:msgBytes encoding:NSUTF8StringEncoding] autorelease];
-       SBJSON* sbjson = [SBJSON new];
-       NSError* error;
-       NSDictionary* jsonObject = [sbjson objectWithString:jsonString error:&error];
-    [sbjson release];
-       return jsonObject;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJsonEncoder.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJsonEncoder.h
deleted file mode 100644 (file)
index 184a8d6..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJsonEncoder.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLIEncoder.h"
-
-@interface SDLJsonEncoder : NSObject<SDLIEncoder> {}
-
-+(NSObject<SDLIEncoder>*) instance;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJsonEncoder.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJsonEncoder.m
deleted file mode 100644 (file)
index b91dd76..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLJsonEncoder.m
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLJsonEncoder.h"
-#import "SDLNames.h"
-#import "JSON.h"
-#import "SDLDebugTool.h"
-
-@implementation SDLJsonEncoder
-
-static NSObject<SDLIEncoder>* jsonEncoderInstance;
-
-+(NSObject<SDLIEncoder>*) instance {
-       if (jsonEncoderInstance == nil) {
-               jsonEncoderInstance = [[SDLJsonEncoder alloc] init];
-       }
-       return jsonEncoderInstance;
-}
-
--(NSData*) encodeDictionary:(NSDictionary*) dict {
-       NSData* ret = nil;
-       SBJSON* sbjson = [SBJSON new];
-       NSError* error;
-       NSString* jsonString = [sbjson stringWithObject:dict error:&error];
-    [sbjson release];
-    
-       ret = [jsonString dataUsingEncoding: NSUTF8StringEncoding];
-       return ret;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLNames.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLNames.h
deleted file mode 100644 (file)
index e953fc9..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLNames.h
+++ /dev/null
@@ -1,166 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-
-#define NAMES_request @"request"
-#define NAMES_response @"response"
-#define NAMES_notification @"notification"
-#define NAMES_operation_name @"name"
-#define NAMES_parameters @"parameters"
-
-#define NAMES_RegisterAppInterface @"RegisterAppInterface"
-#define NAMES_UnregisterAppInterface @"UnregisterAppInterface"
-#define NAMES_Alert @"Alert"
-#define NAMES_Show @"Show"
-#define NAMES_Speak @"Speak"
-#define NAMES_AddCommand @"AddCommand"
-#define NAMES_EncodedSyncPData @"EncodedSyncPData"
-#define NAMES_DeleteCommand @"DeleteCommand"
-#define NAMES_AddSubMenu @"AddSubMenu"
-#define NAMES_DeleteSubMenu @"DeleteSubMenu"
-#define NAMES_CreateInteractionChoiceSet @"CreateInteractionChoiceSet"
-#define NAMES_DeleteInteractionChoiceSet @"DeleteInteractionChoiceSet"
-#define NAMES_PerformInteraction @"PerformInteraction"
-#define NAMES_DialNumber @"DialNumber"
-#define NAMES_SubscribeButton @"SubscribeButton"
-#define NAMES_UnsubscribeButton @"UnsubscribeButton"
-#define NAMES_Subscribe @"Subscribe"
-#define NAMES_Unsubscribe @"Unsubscribe"
-#define NAMES_SetMediaClockTimer @"SetMediaClockTimer"
-#define NAMES_SetGlobalProperties @"SetGlobalProperties"
-#define NAMES_ResetGlobalProperties @"ResetGlobalProperties"
-#define NAMES_GetDID @"GetDID"
-#define NAMES_GetDTCs @"GetDTCs"
-#define NAMES_GetFile @"GetFile"
-#define NAMES_PutFile @"PutFile"
-#define NAMES_EndAudioCapture @"EndAudioCapture"
-#define NAMES_OnHMIStatus @"OnHMIStatus"
-#define NAMES_OnEncodedSyncPData @"OnEncodedSyncPData"
-#define NAMES_OnTBTClientState @"OnTBTClientState"
-#define NAMES_OnDriverDistraction @"OnDriverDistraction"
-#define NAMES_OnButtonEvent @"OnButtonEvent"
-#define NAMES_OnButtonPress @"OnButtonPress"
-#define NAMES_OnCommand @"OnCommand"
-#define NAMES_OnAppInterfaceUnregistered @"OnAppInterfaceUnregistered"
-#define NAMES_PerformAudioCapture @"PerformAudioCapture"
-#define NAMES_GenericResponse @"GenericResponse"
-
-#define NAMES_success @"success"
-#define NAMES_resultCode @"resultCode"
-#define NAMES_info @"info"
-
-#define NAMES_reason @"reason"
-#define NAMES_state @"state"
-#define NAMES_cmdID @"cmdID"
-#define NAMES_choiceID @"choiceID"
-#define NAMES_menuParams @"menuParams"
-#define NAMES_parentID @"parentID"
-#define NAMES_position @"position"
-#define NAMES_menuName @"menuName"
-#define NAMES_vrCommands @"vrCommands"
-#define NAMES_hmiLevel @"hmiLevel"
-#define NAMES_language @"language"
-#define NAMES_languageDesired @"languageDesired"
-#define NAMES_triggerSource @"triggerSource"
-#define NAMES_subscriptionType @"subscriptionType"
-#define NAMES_data @"data"
-#define NAMES_correlationID @"correlationID"
-#define NAMES_syncMsgVersion @"syncMsgVersion"
-#define NAMES_majorVersion @"majorVersion"
-#define NAMES_minorVersion @"minorVersion"
-#define NAMES_appName @"appName"
-#define NAMES_ngnMediaScreenAppName @"ngnMediaScreenAppName"
-#define NAMES_isMediaApplication @"isMediaApplication"
-#define NAMES_vrSynonym @"vrSynonym"
-#define NAMES_vrSynonyms @"vrSynonyms"
-#define NAMES_usesVehicleData @"usesVehicleData"
-#define NAMES_displayText @"displayText"
-#define NAMES_text @"text"
-#define NAMES_type @"type"
-#define NAMES_ttsChunks @"ttsChunks"
-#define NAMES_playTone @"playTone"
-#define NAMES_duration @"duration"
-#define NAMES_mainField1 @"mainField1"
-#define NAMES_mainField2 @"mainField2"
-#define NAMES_statusBar @"statusBar"
-#define NAMES_name @"name"
-#define NAMES_menuID @"menuID"
-#define NAMES_longPress @"longPress"
-#define NAMES_shortPress @"shortPress"
-#define NAMES_subscriptionID @"subscriptionID"
-#define NAMES_buttonName @"buttonName"
-#define NAMES_buttonPressMode @"buttonPressMode"
-#define NAMES_buttonEventMode @"buttonEventMode"
-#define NAMES_minutes @"minutes"
-#define NAMES_seconds @"seconds"
-#define NAMES_startTime @"startTime"
-#define NAMES_updateMode @"updateMode"
-#define NAMES_mediaClock @"mediaClock"
-#define NAMES_initialText @"initialText"
-#define NAMES_initialPrompt @"initialPrompt"
-#define NAMES_helpPrompt @"helpPrompt"
-#define NAMES_timeoutPrompt @"timeoutPrompt"
-#define NAMES_timeout @"timeout"
-#define NAMES_choiceSet @"choiceSet"
-#define NAMES_interactionMode @"interactionMode"
-#define NAMES_vehicleDataParams @"vehicleDataParams"
-#define NAMES_minimalUpdateInterval @"minimalUpdateInterval"
-#define NAMES_result @"result"
-#define NAMES_alertText1 @"alertText1"
-#define NAMES_alertText2 @"alertText2"
-#define NAMES_shortPressAvailable @"shortPressAvailable"
-#define NAMES_longPressAvailable @"longPressAvailable"
-#define NAMES_upDownAvailable @"upDownAvailable"
-#define NAMES_width @"width"
-#define NAMES_height @"height"
-#define NAMES_characterSet @"characterSet"
-#define NAMES_displayType @"displayType"
-#define NAMES_mediaClockFormats @"mediaClockFormats"
-#define NAMES_textFields @"textFields"
-#define NAMES_autoActivateID @"autoActivateID"
-#define NAMES_vehicleDataCapabilities @"vehicleDataCapabilities"
-#define NAMES_speechCapabilities @"speechCapabilities"
-#define NAMES_vrCapabilities @"vrCapabilities"
-#define NAMES_buttonCapabilities @"buttonCapabilities"
-#define NAMES_displayCapabilities @"displayCapabilities"
-#define NAMES_hmiZoneCapabilities @"hmiZoneCapabilities"
-#define NAMES_interactionChoiceSetID @"interactionChoiceSetID"
-#define NAMES_audioFileName @"audioFileName"
-#define NAMES_gpsPositionValid @"gpsPositionValid"
-#define NAMES_longitudeDegrees @"longitudeDegrees"
-#define NAMES_latitudeDegrees @"latitudeDegrees"
-#define NAMES_utcYear @"utcYear"
-#define NAMES_utcMonth @"utcMonth"
-#define NAMES_utcDay @"utcDay"
-#define NAMES_utcHours @"utcHours"
-#define NAMES_utcMinutes @"utcMinutes"
-#define NAMES_utcSeconds @"utcSeconds"
-#define NAMES_compassDirection @"compassDirection"
-#define NAMES_pdop @"pdop"
-#define NAMES_vdop @"vdop"
-#define NAMES_hdop @"hdop"
-#define NAMES_actual @"actual"
-#define NAMES_satellites @"satellites"
-#define NAMES_dimension @"dimension"
-#define NAMES_altitude @"altitude"
-#define NAMES_heading @"heading"
-#define NAMES_speed @"speed"
-#define NAMES_gpsData @"gpsData"
-#define NAMES_number @"number"
-#define NAMES_syncFileName @"syncFileName"
-#define NAMES_localFileName @"localFileName"
-#define NAMES_maxDuration @"maxDuration"
-#define NAMES_timerMode @"timerMode"
-#define NAMES_interactionChoiceSetIDList @"interactionChoiceSetIDList"
-#define NAMES_status @"status"
-#define NAMES_pressure @"pressure"
-#define NAMES_hours @"hours"
-#define NAMES_rows @"rows"
-#define NAMES_audioQuality @"audioQuality"
-#define NAMES_systemContext @"systemContext"
-#define NAMES_audioStreamingState @"audioStreamingState"
-#define NAMES_mediaTrack @"mediaTrack"
-#define NAMES_alignment @"alignment"
-#define NAMES_properties @"properties"

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocol.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocol.m
deleted file mode 100644 (file)
index 954dce0..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocol.m
+++ /dev/null
@@ -1,392 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLProtocol.h"
-#import "SDLBitConverter.h"
-#import "SDLDebugTool.h"
-#import "SDLProtocolFrameHeaderFactory.h"
-#import <UIKit/UIKit.h>
-
-#define HEADER_BUF_LENGTH 8
-#define MTU_SIZE 512
-
-@implementation SDLProtocol
-
--(id) init {
-       if (self = [super init]) {
-               msgLock = [[NSObject alloc] init];
-               headerBuf = nil;
-               dataBuf = nil;
-               currentHeader = nil;
-               [self resetHeaderAndData];
-               frameAssemblerForSessionID = [[NSMutableDictionary alloc] initWithCapacity:2];
-       }
-       return self;
-}
-
--(void) resetHeaderAndData {
-    [headerBuf release];
-
-       haveHeader = NO;
-       int headerSize = HEADER_BUF_LENGTH * sizeof(Byte);
-       headerBuf = [[NSMutableData alloc] initWithCapacity:headerSize];        
-
-    [dataBuf release];
-    dataBuf = nil;
-
-    [currentHeader release];
-    currentHeader = nil;
-}
-
-
-- (void) doAlertMessage:(NSString*) message withTitle:(NSString*) title{
-       UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:title message:message delegate:self cancelButtonTitle:@"OK" otherButtonTitles:nil];
-       [alertView show];
-       [alertView release];
-       
-}//end action
-
--(FrameAssembler*) getFrameAssemblerForFrameHeader:(SDLProtocolFrameHeader*) header {
-       id sessionIDKey = [NSNumber numberWithInt:header.sessionID];
-    
-       FrameAssembler *ret = [frameAssemblerForSessionID objectForKey:sessionIDKey];
-
-       if (ret == nil) {
-               if (header.sessionType == SDLSessionType_RPC) {
-                       ret = [[FrameAssembler alloc] initWithListeners:protocolListeners];
-               } else if (header.sessionType == SDLSessionType_BulkData) {
-                       ret = [[BulkAssembler alloc] initWithListeners:protocolListeners];
-               }
-        
-               [frameAssemblerForSessionID setObject:ret forKey:sessionIDKey];
-        return [ret autorelease];
-       }
-       return ret;
-}
-
--(void) handleBytesFromTransport:(Byte *)receivedBytes length:(long)receivedBytesLength {
-       long receivedBytesReadPos = 0;
-       // If I don't yet know the message size, grab those bytes.
-       if (!haveHeader) {
-               // If I can't get the size, just get the bytes that are there.
-               int sizeBytesNeeded = HEADER_BUF_LENGTH - headerBuf.length;
-               if (receivedBytesLength < sizeBytesNeeded) {
-                       [headerBuf appendBytes:receivedBytes + receivedBytesReadPos length:receivedBytesLength];
-                       return;
-               } else {
-            // If I got the size, allocate the buffer
-                       [headerBuf appendBytes:receivedBytes + receivedBytesReadPos length:sizeBytesNeeded];
-                       receivedBytesReadPos += sizeBytesNeeded;
-                       haveHeader = true;
-                       dataBufFinalLength = [SDLBitConverter intFromByteArray:(Byte*)headerBuf.bytes offset:4];
-            
-            [dataBuf release];
-            dataBuf = nil;
-
-                       dataBuf = [[NSMutableData alloc] initWithCapacity:dataBufFinalLength];
-                       currentHeader = [[SDLProtocolFrameHeaderFactory parseHeader:headerBuf] retain];
-               }
-               
-       }
-       
-       int bytesLeft = receivedBytesLength - receivedBytesReadPos;
-       int bytesNeeded = dataBufFinalLength - dataBuf.length;
-       // If I don't have enough bytes for the message, just grab what's there.
-       if (bytesLeft < bytesNeeded) {
-               [dataBuf appendBytes:receivedBytes + receivedBytesReadPos length:bytesLeft];
-               return;
-       } else {
-        // Fill the buffer and call the handler!
-               [dataBuf appendBytes:receivedBytes + receivedBytesReadPos length:bytesNeeded];
-               receivedBytesReadPos += bytesNeeded;
-               FrameAssembler *assembler = [self getFrameAssemblerForFrameHeader:currentHeader];
-               [assembler handleFrame:currentHeader data:dataBuf];
-               [self resetHeaderAndData];
-               
-               //If there are any bytes left, recurse.
-               int moreBytesLeft = receivedBytesLength - receivedBytesReadPos;
-               if (moreBytesLeft > 0) {
-                       [self handleBytesFromTransport:receivedBytes + receivedBytesReadPos  length:moreBytesLeft];
-               }
-       }
-}
-
--(NSData*) assembleHeaderBytes:(SDLProtocolFrameHeader*) msg {
-       UInt32 header = 0;
-       header |= msg.version;
-       header <<= 1;
-       header |= (msg.compressed ? 1 : 0);
-       header <<= 3;
-       header |= msg.frameType;
-       header <<= 8;
-       header |= msg.sessionType;
-       header <<= 8;
-       header |= msg.frameData;
-       header <<= 8;
-       header |= msg.sessionID;
-       
-       Byte* mallocPtr = malloc(HEADER_BUF_LENGTH);
-       if (mallocPtr == nil) {
-               @throw [NSException exceptionWithName:@"OutOfMemoryException" reason:@"malloc failed" userInfo:nil];
-       }
-       NSData* ret = [[NSData alloc] initWithBytesNoCopy:mallocPtr length:HEADER_BUF_LENGTH];
-
-       memcpy((void*)ret.bytes, [SDLBitConverter intToByteArray:header].bytes, 4);
-       memcpy((void*)ret.bytes + 4, [SDLBitConverter intToByteArray:msg.dataSize].bytes, 4);
-       
-       return [ret autorelease];
-}
-
--(void) sendFrameToTransport:(SDLProtocolFrameHeader *)header withData:(NSData*) data {
-       if (data == nil || data.length == 0){
-               [transport sendBytes:[self assembleHeaderBytes:header]];
-       } else {
-               NSMutableData* toSend = [NSMutableData dataWithCapacity:data.length + HEADER_BUF_LENGTH];
-               
-               [toSend appendData:[self assembleHeaderBytes:header]];
-               
-               [toSend appendData:data];
-               
-               [transport sendBytes:toSend];
-       }
-       
-}
-
--(void) sendFrameToTransport:(SDLProtocolFrameHeader *)header {
-       [self sendFrameToTransport:header withData:nil];
-}
-
--(void) sendFrameToTransport:(SDLProtocolFrameHeader *)header withData:(NSData*) data offset:(NSInteger) offset length:(NSInteger) length{
-       
-       NSMutableData* toSend = [NSMutableData dataWithCapacity:length + HEADER_BUF_LENGTH];
-       
-       [toSend appendData:[self assembleHeaderBytes:header]];
-       
-       [toSend appendBytes:data.bytes + offset length:length];
-       
-       [transport sendBytes:toSend];
-       
-}
-
--(void) sendData:(NSData*)data sessionType:(SDLSessionType)sessionType sessionID:(Byte)sessionID {
-       int maxDataSize = MTU_SIZE - HEADER_BUF_LENGTH;
-       
-       @synchronized (msgLock) {
-        if (data.length < maxDataSize) {
-            
-            SDLProtocolFrameHeader *singleHeader = [SDLProtocolFrameHeaderFactory singleFrameWithSessionType:sessionType sessionID:sessionID dataSize:data.length];
-            
-            [self sendFrameToTransport:singleHeader withData:data];
-        } else {
-            SDLProtocolFrameHeader *firstHeader = [SDLProtocolFrameHeaderFactory firstFrameWithSessionType:sessionType sessionID:sessionID];
-            
-            // Assemble first frame.
-            int frameCount = data.length / maxDataSize;
-            if (data.length % maxDataSize > 0) {
-                frameCount++;
-            }
-            NSMutableData *firstFrameData = [NSMutableData dataWithCapacity:8];
-            // First four bytes are data size.
-            [firstFrameData appendData:[SDLBitConverter intToByteArray:data.length]];
-            // Second four bytes are frame count.
-            [firstFrameData appendData:[SDLBitConverter intToByteArray:frameCount]];
-            
-            [self sendFrameToTransport:firstHeader withData:firstFrameData];
-            
-            int currentOffset = 0;
-            
-            for (int i = 0; i < frameCount; i++) {
-                int bytesToWrite = data.length - currentOffset;
-                if (bytesToWrite > maxDataSize) { bytesToWrite = maxDataSize
-                    ; }
-                SDLProtocolFrameHeader *consecHeader = [SDLProtocolFrameHeaderFactory consecutiveFrameWithSessionType:sessionType sessionID:sessionID dataSize:bytesToWrite];
-                [self sendFrameToTransport:consecHeader withData:data offset:currentOffset length:bytesToWrite];
-                currentOffset += bytesToWrite;
-                
-            }
-        }
-               
-       }
-}
-
-
--(void) sendStartSessionWithType:(SDLSessionType) sessionType {
-       SDLProtocolFrameHeader *header = [SDLProtocolFrameHeaderFactory startSessionWithSessionType:sessionType];
-       
-       @synchronized (msgLock) {
-               [self sendFrameToTransport:header];
-       }
-}
-
--(void) sendEndSessionWithType:(SDLSessionType)sessionType sessionID:(Byte)sessionID {
-       SDLProtocolFrameHeader *header = [SDLProtocolFrameHeaderFactory endSessionWithSessionType:sessionType sessionID:sessionID];
-       @synchronized (msgLock) {
-               [self sendFrameToTransport:header];
-       }
-}
-
-
--(void) dealloc {
-
-    [headerBuf release];
-    headerBuf = nil;
-
-    [dataBuf release];
-    dataBuf = nil;
-
-    [currentHeader release];
-    currentHeader = nil;
-
-    [frameAssemblerForSessionID release];
-    frameAssemblerForSessionID = nil;
-
-    [msgLock release];
-    msgLock = nil;
-       
-       [super dealloc];
-}
-
-@end
-
-@implementation FrameAssembler
-
--(id) initWithListeners:(NSArray*)theListeners{
-       if (self = [super init]) {
-               listeners = [theListeners retain];
-       }
-       return self;
-}
-
--(void) handleFirstFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data {
-       //The message is new, so let's figure out how big it is.
-       hasFirstFrame = true;
-       totalSize = [SDLBitConverter intFromByteArray:(Byte*)data.bytes offset:0] - 8;
-       framesRemaining = [SDLBitConverter intFromByteArray:(Byte*)data.bytes offset:4];
-    
-    [accumulator release];
-    accumulator = nil;
-    
-       accumulator = [[NSMutableData dataWithCapacity:totalSize] retain];
-       
-}
-
--(void) handleSecondFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data {
-       [self handleRemainingFrame:header data:data];
-}
-
--(void) handleRemainingFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data {
-       [accumulator appendData:data];
-       [self notifyIfFinished:header];
-       
-}
-
--(void) notifyIfFinished:(SDLProtocolFrameHeader*) header {
-       if (framesRemaining == 0) {
-               SDLProtocolMessage *message = [[SDLProtocolMessage alloc] init];
-               message.messageType = SDLMessageType_Data;
-               message.sessionType = header.sessionType;
-               message.sessionID = header.sessionID;
-               message.data = accumulator;
-               
-               NSArray* localListeners = nil;
-               @synchronized (listeners) {
-                       localListeners = [listeners copy];
-               }
-                       
-               for (NSObject<SDLProtocolListener> *listener in localListeners) {
-                       [listener onProtocolMessageReceived:message];
-               }
-               [localListeners release];
-        
-        [message release];
-               
-               hasFirstFrame = false;
-               hasSecondFrame = false;
-
-        [accumulator release];
-        accumulator = nil;
-
-       }
-}
-
--(void) handleMultiFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data {
-       if (!hasFirstFrame) {
-               hasFirstFrame = true;
-               [self handleFirstFrame:header data:data];
-       } else if (!hasSecondFrame) {
-               hasSecondFrame = true;
-               framesRemaining--;
-               [self handleSecondFrame:header data:data ];
-       } else {
-               framesRemaining--;
-               [self handleRemainingFrame:header data:data];
-       }
-       
-}
-
--(void) handleFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data {
-       if (header.frameType == SDLFrameType_First || header.frameType == SDLFrameType_Consecutive) {
-               [self handleMultiFrame:header data:data];
-       } else {
-               SDLProtocolMessage *message = [[SDLProtocolMessage alloc] init];
-               message.messageType = [self messageTypeForFrameHeader:header];
-               message.sessionType = header.sessionType;
-               message.sessionID = header.sessionID;
-               message.data = data;
-               
-               NSArray* localListeners = nil;
-               @synchronized (listeners) {
-                       localListeners = [listeners copy];
-               }
-               
-               for (NSObject<SDLProtocolListener> *listener in localListeners) {
-                       [listener onProtocolMessageReceived:message];
-               }
-               [localListeners release];
-        
-        [message release];
-       }
-}
-       
--(SDLMessageType) messageTypeForFrameHeader:(SDLProtocolFrameHeader*)header {
-       if (header.frameType == SDLFrameType_Control) {
-               if (header.frameData == SDLFrameData_StartSession) {
-                       return SDLMessageType_StartSession;
-               } else if (header.frameData == SDLFrameData_StartSessionACK) {
-                       return SDLMessageType_StartSessionACK;
-               } else if (header.frameData == SDLFrameData_StartSessionNACK) {
-                       return SDLMessageType_StartSessionNACK;
-               } else {
-            //if (frameData == FrameData.EndSession.value())
-                       return SDLMessageType_EndSession;
-               }
-       } else {
-               return SDLMessageType_Data;
-       }
-}
-
--(void) dealloc {
-
-    [accumulator release];
-    accumulator = nil;
-    
-    [listeners release];
-    listeners = nil;
-    
-    [super dealloc];
-}
-
-@end
-
-@implementation BulkAssembler
-
--(void) handleSecondFrame:(SDLProtocolFrameHeader*) header data:(NSData*) data {
-       bulkCorrId = [SDLBitConverter intFromByteArray:(Byte*)data.bytes offset:4];
-       [accumulator appendBytes:data.bytes + 8 length:header.dataSize - 8];
-       [self notifyIfFinished:header];
-}
-
-@end
-
-

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolFrameHeader.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolFrameHeader.m
deleted file mode 100644 (file)
index a73fb63..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolFrameHeader.m
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLProtocolMessage.h"
-
-@implementation SDLProtocolFrameHeader
-
-@synthesize version;
-@synthesize compressed;
-@synthesize frameType;
-@synthesize sessionType;
-@synthesize frameData;
-@synthesize sessionID;
-@synthesize dataSize;
-
--(id) init {
-       if (self = [super init]) {
-               version = 1;
-               compressed = false;
-               frameType = SDLFrameType_Control;
-               sessionType = SDLSessionType_RPC;
-               frameData = 0;
-               sessionID = 0;
-               
-               dataSize = 0;
-       }
-       return self;
-}
-                               
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolFrameHeaderFactory.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolFrameHeaderFactory.m
deleted file mode 100644 (file)
index 494aee4..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolFrameHeaderFactory.m
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLProtocolFrameHeaderFactory.h"
-#import "SDLBitConverter.h"
-
-@implementation SDLProtocolFrameHeaderFactory
-
-+(SDLProtocolFrameHeader*) parseHeader:(NSData*) header {
-       SDLProtocolFrameHeader* msg = [[[SDLProtocolFrameHeader alloc] init] autorelease];
-       
-       Byte version = (Byte)(((Byte*)header.bytes)[0] >> 4);
-       BOOL compressed = (1 == ((((Byte*)header.bytes)[0] & 0x08) >> 3));
-       Byte frameType = (Byte)(((Byte*)header.bytes)[0] & 0x07);
-       Byte sessionType = ((Byte*)header.bytes)[1];
-       Byte frameData = ((Byte*)header.bytes)[2];
-       Byte sessionID = ((Byte*)header.bytes)[3];
-       UInt32 dataSize = [SDLBitConverter intFromByteArray:((Byte*)header.bytes) offset:4];
-       
-       msg.version = version;
-       msg.compressed = compressed;
-       msg.frameType = frameType;
-       msg.sessionType = sessionType;
-       msg.frameData = frameData;
-       msg.sessionID = sessionID;
-       msg.dataSize = dataSize;
-       
-       return msg;
-}
-
-+(SDLProtocolFrameHeader*) startSessionWithSessionType:(SDLSessionType) sessionType {
-       SDLProtocolFrameHeader* msg = [[[SDLProtocolFrameHeader alloc] init] autorelease];
-       msg.frameType = SDLFrameType_Control;
-       msg.sessionType = sessionType;
-       msg.frameData = SDLFrameData_StartSession;
-       
-       return msg;
-}
-
-
-+(SDLProtocolFrameHeader*) endSessionWithSessionType:(SDLSessionType)sessionType sessionID:(Byte)sessionID {
-       SDLProtocolFrameHeader* header = [[[SDLProtocolFrameHeader alloc] init] autorelease];
-       header.frameType = SDLFrameType_Control;
-       header.frameData = SDLFrameData_EndSession;
-       header.sessionType = sessionType;
-       header.sessionID = sessionID;
-
-       return header;
-}
-+(SDLProtocolFrameHeader*) singleFrameWithSessionType:(SDLSessionType) sessionType sessionID:(Byte) sessionID dataSize:(NSInteger) dataSize {
-       SDLProtocolFrameHeader* header = [[[SDLProtocolFrameHeader alloc] init] autorelease];
-       header.frameType = SDLFrameType_Single;
-       header.sessionType = sessionType;
-       header.sessionID = sessionID;
-       header.dataSize = dataSize;
-       
-       return header;
-}
-
-+(SDLProtocolFrameHeader*) firstFrameWithSessionType:(SDLSessionType) sessionType sessionID:(Byte) sessionID{
-       SDLProtocolFrameHeader* header = [[[SDLProtocolFrameHeader alloc] init] autorelease];
-       header.frameType = SDLFrameType_First;
-       header.sessionType = sessionType;
-       header.sessionID = sessionID;
-       header.dataSize = 8;
-       
-       return header;
-}
-
-+(SDLProtocolFrameHeader*) consecutiveFrameWithSessionType:(SDLSessionType) sessionType sessionID:(Byte) sessionID dataSize:(NSInteger) dataSize {
-       SDLProtocolFrameHeader* header = [[[SDLProtocolFrameHeader alloc] init] autorelease];
-       header.frameType = SDLFrameType_Consecutive;
-       header.sessionType = sessionType;
-       header.sessionID = sessionID;
-       header.dataSize = dataSize;
-       
-       return header;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolListener.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolListener.h
deleted file mode 100644 (file)
index 0cdb481..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolListener.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLProtocolMessage.h"
-
-@protocol SDLProtocolListener
-
--(void) onProtocolMessageReceived:(SDLProtocolMessage*) msg;
-
--(void) onProtocolOpened;
--(void) onProtocolClosed;
--(void) onError:(NSString*) info exception:(NSException*) e;
-
-@end
-

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolMessage.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolMessage.h
deleted file mode 100644 (file)
index 182dc5b..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolMessage.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLProtocolFrameHeader.h"
-
-typedef enum SDLMessageType {
-       SDLMessageType_StartSession = 0x01,
-       SDLMessageType_StartSessionACK = 0x02,
-       SDLMessageType_StartSessionNACK = 0x03,
-       SDLMessageType_EndSession = 0x04,
-       
-       SDLMessageType_Data = 0x05
-} SDLMessageType;
-
-@interface SDLProtocolMessage : NSObject {
-       SDLMessageType messageType;
-       SDLSessionType sessionType;
-       Byte sessionID;
-       
-       NSData* data;
-}
-
-@property(assign) SDLMessageType messageType;
-@property(assign) SDLSessionType sessionType;
-@property(assign) Byte sessionID;
-
-@property(retain) NSData* data;
-
-@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolMessage.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolMessage.m
deleted file mode 100644 (file)
index 3589b98..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProtocolMessage.m
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLProtocolMessage.h"
-
-@implementation SDLProtocolMessage
-
-@synthesize messageType;
-@synthesize sessionType;
-@synthesize sessionID;
-@synthesize data;
-
--(id) init {
-       if (self = [super init]) {
-               messageType = SDLMessageType_Data;
-               sessionType = SDLSessionType_RPC;
-               sessionID = 0;
-               data = nil;
-       }
-       return self;
-}
-
--(void) dealloc {
-    [data release];
-    [super dealloc];
-}
-                               
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxy.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxy.h
deleted file mode 100644 (file)
index c9d7808..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxy.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLITransport.h"
-#import "SDLIProtocol.h"
-#import "SDLProxyListener.h"
-#import "SDLRPCRequestFactory.h"
-#import "SDLIProxy.h"
-
-@interface SDLProxy : NSObject<SDLProtocolListener> {
-       NSObject<SDLITransport>* transport;
-       NSObject<SDLIProtocol>* protocol;
-       NSMutableArray* proxyListeners;
-       Byte rpcSessionID;
-       Byte bulkSessionID;
-       
-    NSTimer* handshakeTimer;
-    
-       BOOL isConnected;
-    BOOL alreadyDestructed;
-}
-
--(id)  initWithTransport:(NSObject<SDLITransport>*) transport protocol:(NSObject<SDLIProtocol>*) protocol delegate:(NSObject<SDLProxyListener>*) delegate;
-
--(void) dispose;
--(void) addDelegate:(NSObject<SDLProxyListener>*) delegate;
-
--(void) sendRPCRequest:(SDLRPCMessage*) msg;
--(void) handleRpcMessage:(NSDictionary*) msg;
--(NSObject<SDLITransport>*)getTransport;
--(NSObject<SDLIProtocol>*)getProtocol;
--(void)destroyHandshakeTimer;
-
-+(void)enableSiphonDebug;
-+(void)disableSiphonDebug;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxy.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxy.m
deleted file mode 100644 (file)
index 41e0792..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxy.m
+++ /dev/null
@@ -1,325 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import <ExternalAccessory/ExternalAccessory.h>
-
-#import "SDLProxy.h"
-#import "SDLNames.h"
-#import "SDLJsonEncoder.h"
-#import "SDLJsonDecoder.h"
-#import "SDLLanguage.h"
-#import "SDLDebugTool.h"
-#import <objc/runtime.h>
-#import "SDLSiphonServer.h"
-
-@interface SDLCallback : NSObject {
-       NSObject* target;
-       SEL selector;
-       NSObject* parameter;
-}
-
-@property (nonatomic, retain) NSObject* target;
-@property (nonatomic, assign) SEL selector;
-@property (nonatomic, retain) NSObject* parameter;
-
-@end
-
-@implementation SDLCallback
-@synthesize target;
-@synthesize selector;
-@synthesize parameter;
-
--(void) dealloc {
-       [target release];
-       [parameter release];
-       
-       [super dealloc];
-}
-
-@end
-
-@interface SDLProxy ()
-
--(void) notifyProxyClosed;
--(void) handleProtocolMessage:(SDLProtocolMessage*) msgData;
--(void) performCallback:(SDLCallback*) callback;
-
-@end
-
-@implementation SDLProxy
-
-const float handshakeTime = 10.0;
-const float notifyProxyClosedDelay = 0.1;
-
-- (void)handshakeTimerFired {
-    [self destroyHandshakeTimer];
-    [self performSelector:@selector(notifyProxyClosed) withObject:nil afterDelay:notifyProxyClosedDelay];
-}
-
--(id) initWithTransport:(NSObject<SDLITransport>*) theTransport protocol:(NSObject<SDLIProtocol>*) theProtocol delegate:(NSObject<SDLProxyListener>*) theDelegate {
-       if (self = [super init]) {        
-        [[EAAccessoryManager sharedAccessoryManager] registerForLocalNotifications];
-        
-        proxyListeners = [[NSMutableArray alloc] initWithObjects:theDelegate, nil];
-        protocol = [theProtocol retain];
-        transport = [theTransport retain];
-        rpcSessionID = 0;
-        
-        alreadyDestructed = NO;
-        
-        [transport addTransportListener:protocol];
-        [protocol addProtocolListener:self];
-        protocol.transport = transport;
-            
-        [transport connect];
-
-       return self;
-    }
-    return self;
-}
-
--(void)destroyHandshakeTimer {
-    if (handshakeTimer != nil) {
-        [handshakeTimer invalidate];
-        [handshakeTimer release];
-        handshakeTimer = nil;
-    }
-}
-
--(void) destructObjects {
-    if(!alreadyDestructed) {
-        [self destroyHandshakeTimer];
-        
-        [transport release];
-        transport = nil;
-        
-        [protocol release];
-        protocol = nil;
-        
-        [proxyListeners release];
-        proxyListeners = nil;
-        
-        alreadyDestructed = YES;
-
-    }
-}
-
--(void) dispose {
-    [self destructObjects];
-}
-
--(void) dealloc {
-    [self destructObjects];
-       [super dealloc];
-}
-
--(NSObject<SDLITransport>*)getTransport {
-    return transport;
-}
-
--(NSObject<SDLIProtocol>*)getProtocol {
-    return protocol;
-}
-
--(void) addDelegate:(NSObject<SDLProxyListener>*) delegate {
-       @synchronized(proxyListeners) {
-               [proxyListeners addObject:delegate];
-       }
-}
-
-
--(void) sendRPCRequest:(SDLRPCMessage*) msg {
-       @try {
-        [SDLDebugTool logInfo:@"Proxy: sendRPCRequest: encoding message: %@", msg];
-               NSData* msgData = [[SDLJsonEncoder instance] encodeDictionary:[msg serializeAsDictionary]];
-               [protocol sendData:msgData sessionType:SDLSessionType_RPC sessionID:rpcSessionID];
-       } @catch (NSException * e) {
-               [SDLDebugTool logException:e withMessage:@"Proxy: sendRPCRequest: Failed to send RPC request: %@", msg.name];
-       } @finally {}
-}
-        
-- (void) onProtocolMessageReceived:(SDLProtocolMessage*) msgData {
-       
-       @try {
-               [self handleProtocolMessage:msgData];
-       } @catch (NSException * e) {
-               [SDLDebugTool logException:e withMessage:@"Proxy: onProtocolMessageReceived: Failed to handle protocol message."];
-       } @finally {}
-}
-
--(void) handleProtocolMessage:(SDLProtocolMessage*) msgData {
-    // It's possible to run into a scenario in which SYNC fails to send a StartSessionACK. This issue will be caught by the timer that's waiting for a RegisterAppInterfaceResponse. If no RAIResponse is received, a call to onProxyClosed will occur.
-       if (msgData.messageType == SDLMessageType_StartSessionACK) {
-        if (msgData.sessionType == SDLSessionType_RPC) {
-            rpcSessionID = msgData.sessionID;
-            [SDLDebugTool logInfo:@"Got rpcSessionID = %i", rpcSessionID];
-                       
-                       NSArray *localListeners = nil;
-                       @synchronized (proxyListeners) {
-                               localListeners = [proxyListeners copy];
-                       }
-                       
-            for (NSObject<SDLProxyListener> *listener in localListeners) {
-                [listener onProxyOpened];
-            }
-                       
-                       [localListeners release];
-        } else if (msgData.sessionType == SDLSessionType_BulkData) {
-            bulkSessionID = msgData.sessionID;
-            [SDLDebugTool logInfo:@"Proxy: handleProtocolMessage: Got bulkSessionID = %i", bulkSessionID];
-        }
-       }
-       
-       if (msgData.data.length > 0) {
-               NSDictionary *msg = [[SDLJsonDecoder instance] decode:msgData.data];
-               [self handleRpcMessage:msg];
-       }
-
-}
-
--(void) neverCalled {
-       [[SDLAddCommandResponse alloc] release];
-       [[SDLAddSubMenuResponse alloc] release];
-       [[SDLAlertResponse alloc] release];
-       [[SDLCreateInteractionChoiceSetResponse alloc] release];
-       [[SDLDeleteCommandResponse alloc] release];
-       [[SDLDeleteInteractionChoiceSetResponse alloc] release];
-       [[SDLDeleteSubMenuResponse alloc] release];
-       [[SDLOnHMIStatus alloc] release];
-       [[SDLOnButtonEvent alloc] release];
-       [[SDLOnButtonPress alloc] release];
-       [[SDLEncodedSyncPDataResponse alloc] release];
-       [[SDLOnCommand alloc] release];
-       [[SDLOnAppInterfaceUnregistered alloc] release];
-       [[SDLPerformInteractionResponse alloc] release];
-       [[SDLRegisterAppInterfaceResponse alloc] release];
-       [[SDLSetGlobalPropertiesResponse alloc] release];
-       [[SDLResetGlobalPropertiesResponse alloc] release];
-       [[SDLSetMediaClockTimerResponse alloc] release];
-       [[SDLShowResponse alloc] release];
-       [[SDLSpeakResponse alloc] release];
-       [[SDLSubscribeButtonResponse alloc] release];
-       [[SDLUnregisterAppInterfaceResponse alloc] release];
-       [[SDLUnsubscribeButtonResponse alloc] release];
-    [[SDLGenericResponse alloc] release];
-    [[SDLOnDriverDistraction alloc] release];
-    [[SDLOnEncodedSyncPData alloc] release];
-    [[SDLOnTBTClientState alloc] release];
-}
-
--(void) handleRpcMessage:(NSDictionary*) msg {
-       
-       NSString* messageType = [[msg keyEnumerator] nextObject];
-       NSDictionary* function = [msg objectForKey:messageType];
-       NSString* functionName = [function objectForKey:NAMES_operation_name];
-       if ([functionName isEqualToString:NAMES_OnAppInterfaceUnregistered] 
-                       || [functionName isEqualToString:NAMES_UnregisterAppInterface]) {
-               [self notifyProxyClosed];
-               return;
-       }
-    
-       if ([messageType isEqualToString:NAMES_response]) {
-        [SDLDebugTool logInfo:@"Proxy: handleRpcMessage: Receiving: %@", functionName];
-               bool notGenericResponseMessage = ![functionName isEqualToString:@"GenericResponse"];
-               if(notGenericResponseMessage) functionName = [NSString stringWithFormat:@"%@Response", functionName];
-       }
-    
-    // Turn off the timer, the handshake has succeeded
-    if ([functionName isEqualToString:@"RegisterAppInterfaceResponse"]) {
-        [self destroyHandshakeTimer];
-    }
-    
-       NSString* functionClassName = [NSString stringWithFormat:@"SDL%@", functionName];
-       Class functionClass = objc_getClass([functionClassName cStringUsingEncoding:NSUTF8StringEncoding]);
-    
-    // functionObject doesn't leak because performSelector returns a pointer to the same instance that class_createInstance() creates
-       NSObject* functionObject = (id)class_createInstance(functionClass, 0);
-    NSObject* rpcCallbackObject = [functionObject performSelector:@selector(initWithDictionary:) withObject:msg];
-       
-       NSString* handlerName = [NSString stringWithFormat:@"on%@:", functionName];
-
-       SEL handlerSelector = NSSelectorFromString(handlerName);
-       
-       NSArray *localListeners = nil;
-       @synchronized (proxyListeners) {
-               localListeners = [proxyListeners copy];
-       }
-       
-       for (NSObject<SDLProxyListener> *listener in localListeners) {
-               if ([listener respondsToSelector:handlerSelector]) {
-                       SDLCallback* callback = [[SDLCallback alloc] init];
-                       callback.target = listener;
-                       callback.selector = handlerSelector;
-                       callback.parameter = rpcCallbackObject;
-                       [self performSelectorOnMainThread:@selector(performCallback:) withObject:callback waitUntilDone:NO];
-                       // [callback release]; Moved to performCallback to avoid thread race condition
-               } else {
-                       [SDLDebugTool logInfo:@"Proxy: handleRpcMessage: Proxy listener doesn't respond to selector: %@", handlerName];
-               }
-       }
-       [localListeners release];
-}
-
--(void) performCallback:(SDLCallback*) callback {
-       @try {
-               [callback.target performSelector:callback.selector withObject:callback.parameter];
-       } @catch (NSException * e) {
-               [SDLDebugTool logException:e withMessage:@"Exception thrown during call to %@ with object %@", callback.target, callback.parameter];
-       } @finally {
-               [callback release];
-       }
-}
-
--(void) onProtocolClosed {
-       [self notifyProxyClosed];
-}
-
--(void) notifyProxyClosed {
-       if (isConnected) {
-               isConnected = NO;
-               NSArray *localListeners = nil;
-               @synchronized (proxyListeners) {
-                       localListeners = [proxyListeners copy];
-               }
-               
-               for (NSObject<SDLProxyListener> *listener in localListeners) {
-                       [listener performSelectorOnMainThread:@selector(onProxyClosed) withObject:nil waitUntilDone:NO];
-               }
-               [localListeners release];
-       }
-}
-
--(void) onError:(NSString*) info exception:(NSException*) e {
-       
-       NSArray *localListeners = nil;
-       @synchronized (proxyListeners) {
-               localListeners = [proxyListeners copy];
-       }
-       
-       for (NSObject<SDLProxyListener> *listener in localListeners) {
-               [listener performSelectorOnMainThread:@selector(onError:) withObject:e waitUntilDone:NO];
-       }
-       [localListeners release];
-}
-
-
-
-- (void) onProtocolOpened {
-       isConnected = YES;
-       [protocol sendStartSessionWithType:SDLSessionType_RPC];
-    [self destroyHandshakeTimer];
-    handshakeTimer = [NSTimer scheduledTimerWithTimeInterval:handshakeTime target:self selector:@selector(handshakeTimerFired) userInfo:nil repeats:NO];
-    [handshakeTimer retain];
-}
-
-+(void)enableSiphonDebug {
-    [SDLSiphonServer enableSiphonDebug];
-}
-
-+(void)disableSiphonDebug {
-    [SDLSiphonServer disableSiphonDebug];
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxyListener.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxyListener.h
deleted file mode 100644 (file)
index a791345..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLProxyListener.h
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "RPC/SDLAddCommandResponse.h"
-#import "RPC/SDLAddSubMenuResponse.h"
-#import "RPC/SDLEncodedSyncPDataResponse.h"
-#import "RPC/SDLAlertResponse.h"
-#import "RPC/SDLCreateInteractionChoiceSetResponse.h"
-#import "RPC/SDLDeleteCommandResponse.h"
-#import "RPC/SDLDeleteInteractionChoiceSetResponse.h"
-#import "RPC/SDLDeleteSubMenuResponse.h"
-#import "RPC/SDLOnHMIStatus.h"
-#import "RPC/SDLOnButtonEvent.h"
-#import "RPC/SDLOnButtonPress.h"
-#import "RPC/SDLOnCommand.h"
-#import "RPC/SDLOnEncodedSyncPData.h"
-#import "RPC/SDLOnTBTClientState.h"
-#import "RPC/SDLOnDriverDistraction.h"
-#import "RPC/SDLOnAppInterfaceUnregistered.h"
-#import "RPC/SDLPerformInteractionResponse.h"
-#import "RPC/SDLRegisterAppInterfaceResponse.h"
-#import "RPC/SDLSetGlobalPropertiesResponse.h"
-#import "RPC/SDLResetGlobalPropertiesResponse.h"
-#import "RPC/SDLSetMediaClockTimerResponse.h"
-#import "RPC/SDLShowResponse.h"
-#import "RPC/SDLSpeakResponse.h"
-#import "RPC/SDLSubscribeButtonResponse.h"
-#import "RPC/SDLUnregisterAppInterfaceResponse.h"
-#import "RPC/SDLUnsubscribeButtonResponse.h"
-#import "RPC/SDLGenericResponse.h"
-
-@protocol SDLProxyListener 
-
--(void) onOnHMIStatus:(SDLOnHMIStatus*) notification;
--(void) onOnEncodedSyncPData:(SDLOnEncodedSyncPData*) notification;
--(void) onOnTBTClientState:(SDLOnTBTClientState*) notification;
--(void) onOnDriverDistraction:(SDLOnDriverDistraction*) notification;
--(void) onOnButtonEvent:(SDLOnButtonEvent*) notification;
--(void) onOnButtonPress:(SDLOnButtonPress*) notification;
--(void) onOnCommand:(SDLOnCommand*) notification;
--(void) onOnAppInterfaceUnregistered:(SDLOnAppInterfaceUnregistered*) notification;
-
--(void) onAddCommandResponse:(SDLAddCommandResponse*) response;
--(void) onAddSubMenuResponse:(SDLAddSubMenuResponse*) response;
--(void) onAlertResponse:(SDLAlertResponse*) response;
--(void) onCreateInteractionChoiceSetResponse:(SDLCreateInteractionChoiceSetResponse*) response;
--(void) onDeleteCommandResponse:(SDLDeleteCommandResponse*) response;
--(void) onDeleteInteractionChoiceSetResponse:(SDLDeleteInteractionChoiceSetResponse*) response;
--(void) onDeleteSubMenuResponse:(SDLDeleteSubMenuResponse*) response;
--(void) onEncodedSyncPDataResponse:(SDLEncodedSyncPDataResponse*) response;
--(void) onPerformInteractionResponse:(SDLPerformInteractionResponse*) response;
--(void) onRegisterAppInterfaceResponse:(SDLRegisterAppInterfaceResponse*) response;
--(void) onSetGlobalPropertiesResponse:(SDLSetGlobalPropertiesResponse*) response;
--(void) onResetGlobalPropertiesResponse:(SDLResetGlobalPropertiesResponse*) response;
--(void) onSetMediaClockTimerResponse:(SDLSetMediaClockTimerResponse*) response;
--(void) onShowResponse:(SDLShowResponse*) response;
--(void) onSpeakResponse:(SDLSpeakResponse*) response;
--(void) onSubscribeButtonResponse:(SDLSubscribeButtonResponse*) response;
--(void) onUnregisterAppInterfaceResponse:(SDLUnregisterAppInterfaceResponse*) response;
--(void) onUnsubscribeButtonResponse:(SDLUnsubscribeButtonResponse*) response;
--(void) onGenericResponse:(SDLGenericResponse*) response;
-
--(void) onProxyOpened;
--(void) onProxyClosed;
--(void) onError:(NSException*) e;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCNotification.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCNotification.h
deleted file mode 100644 (file)
index 58e0153..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCNotification.h
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLRPCMessage.h"
-
-@interface SDLRPCNotification : SDLRPCMessage {}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCNotification.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCNotification.m
deleted file mode 100644 (file)
index e27fe13..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCNotification.m
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLRPCNotification.h"
-
-@implementation SDLRPCNotification
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCRequestFactory.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCRequestFactory.h
deleted file mode 100644 (file)
index f90f089..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCRequestFactory.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "RPC/SDLRegisterAppInterface.h"
-#import "RPC/SDLUnregisterAppInterface.h"
-#import "RPC/SDLAlert.h"
-#import "RPC/SDLSpeak.h"
-#import "RPC/SDLShow.h"
-#import "RPC/SDLSetMediaClockTimer.h"
-#import "RPC/SDLEncodedSyncPData.h"
-#import "RPC/SDLAddCommand.h"
-#import "RPC/SDLDeleteCommand.h"
-#import "RPC/SDLCreateInteractionChoiceSet.h"
-#import "RPC/SDLDeleteInteractionChoiceSet.h"
-#import "RPC/SDLPerformInteraction.h"
-#import "RPC/SDLAddSubMenu.h"
-#import "RPC/SDLDeleteSubMenu.h"
-#import "RPC/SDLSubscribeButton.h"
-#import "RPC/SDLUnsubscribeButton.h"
-#import "RPC/SDLResetGlobalProperties.h"
-#import "RPC/SDLSetGlobalProperties.h"
-
-@interface SDLRPCRequestFactory : NSObject {}
-
-+(SDLRegisterAppInterface*) buildRegisterAppInterfaceWithAppName:(NSString*) appName;
-+(SDLRegisterAppInterface*) buildRegisterAppInterfaceWithAppName:(NSString*) appName isMediaApp:(NSNumber*) isMediaApp autoActivateID:(NSString*) autoActivateID;
-
-+(SDLUnregisterAppInterface*) buildUnregisterAppInterfaceWithCorrelationID:(NSNumber*) correlationID;
-
-+(SDLAlert*) buildAlertWithTTS:(NSString*) ttsText alertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 playTone:(NSNumber*) playTone duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID;
-+(SDLAlert*) buildAlertWithTTSChunks:(NSArray*) ttsChunks alertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 playTone:(NSNumber*) playTone duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID;
-+(SDLAlert*) buildAlertWithAlertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID;
-+(SDLAlert*) buildAlertWithTTS:(NSString*) ttsText playTone:(NSNumber*) playTone correlationID:(NSNumber*) correlationID;
-+(SDLAlert*) buildAlertWithTTSChunks:(NSArray*) ttsChunks playTone:(NSNumber*) playTone correlationID:(NSNumber*) correlationID;
-
-+(SDLSpeak*) buildSpeakWithTTS:(NSString*) ttsText correlationID:(NSNumber*) correlationID;
-+(SDLSpeak*) buildSpeakWithTTSChunks:(NSArray*) ttsChunks correlationID:(NSNumber*) correlationID;
-
-+(SDLShow*) buildShowWithMainField1:(NSString*) mainField1 mainField2: (NSString*) mainField2 alignment:(SDLTextAlignment*) textAlignment correlationID:(NSNumber*) correlationID;
-+(SDLShow*) buildShowWithMainField1:(NSString*) mainField1 mainField2: (NSString*) mainField2 statusBar:(NSString*) statusBar mediaClock:(NSString*) mediaClock mediaTrack:(NSString*) mediaTrack alignment:(SDLTextAlignment*) textAlignment correlationID:(NSNumber*) correlationID;
-
-+(SDLSetMediaClockTimer*) buildSetMediaClockTimerWithHours:(NSNumber*) hours minutes:(NSNumber*) minutes seconds:(NSNumber*) seconds updateMode:(SDLUpdateMode*) updateMode correlationID:(NSNumber*) correlationID;
-+(SDLSetMediaClockTimer*) buildSetMediaClockTimerWithUpdateMode:(SDLUpdateMode*) updateMode correlationID:(NSNumber*) correlationID;
-
-+(SDLAddCommand*) buildAddCommandWithID:(NSNumber*) cmdID menuName:(NSString*) menuName parentID:(NSNumber*) parentID position:(NSNumber*) position vrCommands:(NSArray*) vrCommands correlationID:(NSNumber*) correlationID;
-+(SDLAddCommand*) buildAddCommandWithID:(NSNumber*) cmdID vrCommands:(NSArray*) vrCommands correlationID:(NSNumber*) correlationID;
-+(SDLAddCommand*) buildAddCommandWithID:(NSNumber*) cmdID menuName:(NSString*) menuName vrCommands:(NSArray*) vrCommands correlationID:(NSNumber*) correlationID;
-
-+(SDLDeleteCommand*) buildDeleteCommandWithID:(NSNumber*) cmdID correlationID:(NSNumber*) correlationID;
-
-+(SDLAddSubMenu*) buildAddSubMenuWithID:(NSNumber*) menuID menuName:(NSString*) menuName position:(NSNumber*) position correlationID:(NSNumber*) correlationID;
-+(SDLAddSubMenu*) buildAddSubMenuWithID:(NSNumber*) menuID menuName:(NSString*) menuName correlationID:(NSNumber*) correlationID;
-
-+(SDLDeleteSubMenu*) buildDeleteSubMenuWithID:(NSNumber*) menuID correlationID:(NSNumber*) correlationID;
-
-+(SDLCreateInteractionChoiceSet*) buildCreateInteractionChoiceSetWithID:(NSNumber*)interactionChoiceSetID choiceSet:(NSArray*) choices correlationID:(NSNumber*) correlationID;
-
-+(SDLDeleteInteractionChoiceSet*) buildDeleteInteractionChoiceSetWithID:(NSNumber*)interactionChoiceSetID correlationID:(NSNumber*) correlationID;
-
-+(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSArray*)initialChunks initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpChunks:(NSArray*)helpChunks timeoutChunks:(NSArray*)timeoutChunks interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout correlationID:(NSNumber*) correlationID;
-+(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSString*)initialPrompt initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpPrompt:(NSString*)helpPrompt timeoutPrompt:(NSString*)timeoutPrompt interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout correlationID:(NSNumber*) correlationID;
-+(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSString*)initialPrompt initialText:(NSString*)initialText interactionChoiceSetID:(NSNumber*) interactionChoiceSetID correlationID:(NSNumber*) correlationID;
-       
-+(SDLSubscribeButton*) buildSubscribeButtonWithName:(SDLButtonName*) buttonName correlationID:(NSNumber*) correlationID;
-
-+(SDLUnsubscribeButton*) buildUnsubscribeButtonWithName:(SDLButtonName*) buttonName correlationID:(NSNumber*) correlationID;
-
-+(SDLEncodedSyncPData*) buildEncodedSyncPDataWithData:(NSMutableArray*) data correlationID:(NSNumber*) correlationID;
-
-+(SDLSetGlobalProperties*) buildSetGlobalPropertiesWithHelpText:(NSString*) helpText timeoutText:(NSString*) timeoutText correlationID:(NSNumber*) correlationID;
-
-+(SDLResetGlobalProperties*) buildResetGlobalPropertiesWithProperties:(NSArray*) properties correlationID:(NSNumber*) correlationID;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCRequestFactory.m b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCRequestFactory.m
deleted file mode 100644 (file)
index 4f530e8..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLRPCRequestFactory.m
+++ /dev/null
@@ -1,279 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLRPCRequestFactory.h"
-#import "RPC/SDLMenuParams.h"
-#import "SDLTTSChunkFactory.h"
-
-#define NGN_MEDIA_SCREEN_APP_NAME_MAX_LENGTH 5
-
-@implementation SDLRPCRequestFactory
-
-+(SDLRegisterAppInterface*) buildRegisterAppInterfaceWithAppName:(NSString*) appName {
-       return [SDLRPCRequestFactory buildRegisterAppInterfaceWithAppName:appName isMediaApp:[NSNumber numberWithBool:NO] autoActivateID:@""];
-}
-
-+(SDLRegisterAppInterface*) buildRegisterAppInterfaceWithAppName:(NSString*) appName isMediaApp:(NSNumber*) isMediaApp autoActivateID:(NSString*) autoActivateID  {
-               
-       SDLRegisterAppInterface* msg = [[[SDLRegisterAppInterface alloc] init] autorelease];
-       msg.correlationID = [NSNumber numberWithInt:1];
-       msg.appName = appName;
-       SDLMsgVersion* version = [[[SDLMsgVersion alloc] init] autorelease];
-       version.majorVersion = [NSNumber numberWithInt:1];
-       version.minorVersion = [NSNumber numberWithInt:1];
-       msg.syncMsgVersion = version;
-       NSString* ngnMediaAppName = [[appName copy] autorelease];
-       if (ngnMediaAppName.length > NGN_MEDIA_SCREEN_APP_NAME_MAX_LENGTH) {
-               ngnMediaAppName = [ngnMediaAppName substringToIndex:NGN_MEDIA_SCREEN_APP_NAME_MAX_LENGTH];
-       }
-       msg.ngnMediaScreenAppName = ngnMediaAppName;
-       NSMutableArray* syns = [NSMutableArray arrayWithObject:appName];
-       msg.vrSynonyms = syns;
-       msg.autoActivateID = autoActivateID;
-       msg.isMediaApplication = isMediaApp;
-       msg.languageDesired = SDLLanguage.EN_US;
-       
-       return msg;
-       
-}
-
-+(SDLUnregisterAppInterface*) buildUnregisterAppInterfaceWithCorrelationID:(NSNumber*) correlationID  {
-       SDLUnregisterAppInterface* msg = [[[SDLUnregisterAppInterface alloc] init] autorelease];
-       msg.correlationID = correlationID;
-       return msg;
-}
-
-+(SDLAlert*) buildAlertWithTTS:(NSString*) ttsText alertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 playTone:(NSNumber*) playTone duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID {
-       SDLTTSChunk* simpleChunk = [[[SDLTTSChunk alloc] init] autorelease];
-       simpleChunk.text = ttsText;
-       simpleChunk.type = SDLSpeechCapabilities.TEXT;
-       NSArray* ttsChunks = [NSArray arrayWithObject:simpleChunk];
-       return [SDLRPCRequestFactory buildAlertWithTTSChunks:ttsChunks alertText1:alertText1 alertText2:alertText2 playTone:playTone duration:duration correlationID:correlationID];
-}
-
-+(SDLAlert*) buildAlertWithTTSChunks:(NSArray*) ttsChunks alertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 playTone:(NSNumber*) playTone duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID {
-       SDLAlert* msg = [[[SDLAlert alloc] init] autorelease];
-       msg.correlationID = correlationID;
-       msg.alertText1 = alertText1;
-       msg.alertText2 = alertText2;
-       msg.ttsChunks = [[ttsChunks mutableCopy] autorelease];
-       msg.playTone = playTone;
-       msg.duration = duration;
-       
-       return msg;
-}
-
-+(SDLAlert*) buildAlertWithAlertText1:(NSString*) alertText1 alertText2:(NSString*) alertText2 duration:(NSNumber*) duration correlationID:(NSNumber*) correlationID  {
-       return [SDLRPCRequestFactory buildAlertWithTTSChunks:nil alertText1: alertText1 alertText2:alertText2 playTone:nil duration:duration correlationID:correlationID];
-}
-+(SDLAlert*) buildAlertWithTTS:(NSString*) ttsText playTone:(NSNumber*) playTone correlationID:(NSNumber*) 
-    correlationID{ 
-       return [SDLRPCRequestFactory buildAlertWithTTS:ttsText alertText1:nil alertText2:nil playTone:playTone duration:nil correlationID:correlationID];
-}
-+(SDLAlert*) buildAlertWithTTSChunks:(NSArray*) ttsChunks playTone:(NSNumber*) playTone correlationID:(NSNumber*) correlationID  {     
-       return [SDLRPCRequestFactory buildAlertWithTTSChunks:ttsChunks alertText1:nil alertText2:nil playTone:playTone duration:nil correlationID:correlationID];
-}
-
-+(SDLSpeak*) buildSpeakWithTTS:(NSString*) ttsText correlationID:(NSNumber*) correlationID  {
-       SDLTTSChunk* simpleChunk = [[[SDLTTSChunk alloc] init] autorelease];
-       simpleChunk.text = ttsText;
-       simpleChunk.type = SDLSpeechCapabilities.TEXT;
-       NSArray* ttsChunks = [NSMutableArray arrayWithObject:simpleChunk];
-       return [SDLRPCRequestFactory buildSpeakWithTTSChunks:ttsChunks correlationID:correlationID];
-       
-}
-
-+(SDLSpeak*) buildSpeakWithTTSChunks:(NSArray*) ttsChunks correlationID:(NSNumber*) correlationID  {
-       SDLSpeak* msg = [[[SDLSpeak alloc] init] autorelease];
-       msg.correlationID = correlationID;
-       msg.ttsChunks = [[ttsChunks mutableCopy] autorelease];
-       
-       return msg;
-}
-
-
-+(SDLShow*) buildShowWithMainField1:(NSString*) mainField1 mainField2: (NSString*) mainField2 alignment:(SDLTextAlignment*) alignment correlationID:(NSNumber*) correlationID  {
-       return [SDLRPCRequestFactory buildShowWithMainField1:mainField1 mainField2:mainField2 statusBar:nil mediaClock:nil mediaTrack:nil alignment:alignment correlationID:correlationID];
-}
-
-+(SDLShow*) buildShowWithMainField1:(NSString*) mainField1 mainField2: (NSString*) mainField2 statusBar:(NSString*) statusBar mediaClock:(NSString*) mediaClock mediaTrack:(NSString*) mediaTrack alignment:(SDLTextAlignment*) textAlignment correlationID:(NSNumber*) correlationID  {
-       SDLShow* msg = [[[SDLShow alloc] init] autorelease];
-       msg.correlationID = correlationID;
-       msg.mainField1 = mainField1;
-       msg.mainField2 = mainField2;
-       msg.statusBar = statusBar;
-       msg.mediaClock = mediaClock;
-       msg.mediaTrack = mediaTrack;
-       msg.alignment = textAlignment;
-       
-       return msg;
-}
-
-+(SDLSetMediaClockTimer*) buildSetMediaClockTimerWithHours:(NSNumber*) hours minutes:(NSNumber*) minutes seconds:(NSNumber*) seconds updateMode:(SDLUpdateMode*) updateMode correlationID:(NSNumber*) correlationID  {
-       SDLSetMediaClockTimer* msg = [[[SDLSetMediaClockTimer alloc] init] autorelease];
-       SDLStartTime* startTime = [[[SDLStartTime alloc] init] autorelease];
-       startTime.hours = hours;
-       startTime.minutes = minutes;
-       startTime.seconds = seconds;
-       msg.startTime = startTime;
-       msg.updateMode = updateMode;
-       msg.correlationID = correlationID;
-       
-       return msg;
-}
-+(SDLSetMediaClockTimer*) buildSetMediaClockTimerWithUpdateMode:(SDLUpdateMode*) updateMode correlationID:(NSNumber*) correlationID  {
-       SDLSetMediaClockTimer* msg = [[[SDLSetMediaClockTimer alloc] init] autorelease];
-       
-       msg.updateMode = updateMode;
-       msg.correlationID = correlationID;
-       
-       return msg;
-}
-
-+(SDLAddCommand*) buildAddCommandWithID:(NSNumber*) cmdID menuName:(NSString*) menuName parentID:(NSNumber*) parentID position:(NSNumber*) position vrCommands:(NSArray*) vrCommands correlationID:(NSNumber*) correlationID {
-       SDLAddCommand* msg = [[[SDLAddCommand alloc] init] autorelease];
-       msg.correlationID = correlationID;
-
-       msg.cmdID = cmdID;
-
-       if (menuName != nil || parentID != nil || position != nil) {
-               SDLMenuParams* menuParams = [[[SDLMenuParams alloc] init] autorelease];
-               menuParams.menuName = menuName;
-               menuParams.parentID = parentID;
-               menuParams.position = position;
-               msg.menuParams = menuParams;
-       }
-       msg.vrCommands = [[vrCommands mutableCopy] autorelease];
-
-       return msg;
-}
-
-+(SDLAddCommand*) buildAddCommandWithID:(NSNumber*) cmdID vrCommands:(NSArray*) vrCommands correlationID:(NSNumber*) correlationID {
-       return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:nil vrCommands:vrCommands correlationID:correlationID];
-}
-
-+(SDLAddCommand*) buildAddCommandWithID:(NSNumber*) cmdID menuName:(NSString*) menuName vrCommands:(NSArray*) vrCommands correlationID:(NSNumber*) correlationID {
-       return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:menuName parentID:nil position:nil vrCommands:vrCommands correlationID:correlationID];
-}
-
-
-+(SDLDeleteCommand*) buildDeleteCommandWithID:(NSNumber*) cmdID correlationID:(NSNumber*) correlationID  {
-       SDLDeleteCommand *msg = [[[SDLDeleteCommand alloc] init] autorelease];
-       msg.cmdID = cmdID;
-       msg.correlationID = correlationID;
-       return msg;
-}
-
-+(SDLAddSubMenu*) buildAddSubMenuWithID:(NSNumber*) menuID menuName:(NSString*) menuName correlationID:(NSNumber*) correlationID  {
-       return [SDLRPCRequestFactory buildAddSubMenuWithID:menuID menuName:menuName position:nil 
-                                        correlationID:correlationID];
-}
-
-+(SDLAddSubMenu*) buildAddSubMenuWithID:(NSNumber*) menuID menuName:(NSString*) menuName position:(NSNumber*) position correlationID:(NSNumber*) correlationID {
-       SDLAddSubMenu* msg = [[[SDLAddSubMenu alloc] init] autorelease];
-       msg.correlationID = correlationID;
-       msg.menuID = menuID;
-       msg.menuName = menuName;
-       msg.position = position;
-       
-       return msg;
-}
-+(SDLDeleteSubMenu*) buildDeleteSubMenuWithID:(NSNumber*) menuID correlationID:(NSNumber*) correlationID { 
-       SDLDeleteSubMenu *msg = [[[SDLDeleteSubMenu alloc] init] autorelease];
-       msg.menuID = menuID;
-       msg.correlationID = correlationID;
-
-       return msg;
-}
-
-+(SDLCreateInteractionChoiceSet*) buildCreateInteractionChoiceSetWithID:(NSNumber*)interactionChoiceSetID choiceSet:(NSArray*) choices correlationID:(NSNumber*) correlationID  {
-       SDLCreateInteractionChoiceSet *msg = [[[SDLCreateInteractionChoiceSet alloc] init] autorelease];
-       msg.interactionChoiceSetID = interactionChoiceSetID;
-       msg.choiceSet = [[choices mutableCopy] autorelease];
-       msg.correlationID = correlationID;
-       
-       return msg;
-}
-
-+(SDLDeleteInteractionChoiceSet*) buildDeleteInteractionChoiceSetWithID:(NSNumber*)interactionChoiceSetID correlationID:(NSNumber*) correlationID  { 
-       SDLDeleteInteractionChoiceSet *msg = [[[SDLDeleteInteractionChoiceSet alloc] init] autorelease];
-       msg.interactionChoiceSetID = interactionChoiceSetID;
-       msg.correlationID = correlationID;
-       
-       return msg;
-}
-
-+(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSArray*)initialChunks initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpChunks:(NSArray*)helpChunks timeoutChunks:(NSArray*)timeoutChunks interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout correlationID:(NSNumber*) correlationID  {
-       SDLPerformInteraction *msg = [[[SDLPerformInteraction alloc] init] autorelease];
-       msg.initialPrompt = [[initialChunks mutableCopy] autorelease];
-       msg.initialText = initialText;
-       msg.interactionChoiceSetIDList = [[interactionChoiceSetIDList mutableCopy] autorelease];
-       msg.helpPrompt = [[helpChunks mutableCopy] autorelease];
-       msg.timeoutPrompt = [[timeoutChunks mutableCopy] autorelease];
-       msg.interactionMode = interactionMode;
-       msg.timeout = timeout;
-       msg.correlationID = correlationID;
-       
-       return msg;
-}
-+(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSString*)initialPrompt initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpPrompt:(NSString*)helpPrompt timeoutPrompt:(NSString*)timeoutPrompt interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout correlationID:(NSNumber*) correlationID  { 
-       NSArray* initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt];
-       NSArray* helpChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpPrompt];
-       NSArray* timeoutChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutPrompt];
-       
-       
-       return [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:interactionMode timeout:timeout correlationID:correlationID];
-}
-+(SDLPerformInteraction*) buildPerformInteractionWithInitialPrompt:(NSString*)initialPrompt initialText:(NSString*)initialText interactionChoiceSetID:(NSNumber*) interactionChoiceSetID correlationID:(NSNumber*) correlationID  {
-       NSArray *interactionChoiceSetIDList = [NSArray arrayWithObject:interactionChoiceSetID];
-       NSArray* initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt];
-       
-       return [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:nil timeoutChunks:nil interactionMode:SDLInteractionMode.BOTH timeout:nil correlationID:correlationID];
-}
-
-
-+(SDLSubscribeButton*) buildSubscribeButtonWithName:(SDLButtonName*) buttonName correlationID:(NSNumber*) correlationID {
-       SDLSubscribeButton* msg = [[[SDLSubscribeButton alloc] init] autorelease];
-       msg.correlationID = correlationID;
-       msg.buttonName = buttonName;
-       
-       return msg;
-}
-
-+(SDLEncodedSyncPData*) buildEncodedSyncPDataWithData:(NSMutableArray*) data correlationID:(NSNumber*) correlationID {
-       SDLEncodedSyncPData *msg = [[[SDLEncodedSyncPData alloc] init] autorelease];
-       msg.data = data;
-       msg.correlationID = correlationID;
-       
-       return msg;
-}
-
-+(SDLUnsubscribeButton*) buildUnsubscribeButtonWithName:(SDLButtonName*) buttonName correlationID:(NSNumber*) correlationID {
-       SDLUnsubscribeButton *msg = [[[SDLUnsubscribeButton alloc] init] autorelease];
-       msg.buttonName = buttonName;
-       msg.correlationID = correlationID;
-       
-       return msg;
-}
-
-+(SDLSetGlobalProperties*) buildSetGlobalPropertiesWithHelpText:(NSString*) helpText timeoutText:(NSString*) timeoutText correlationID:(NSNumber*) correlationID {
-       SDLSetGlobalProperties* msg = [[[SDLSetGlobalProperties alloc] init] autorelease];
-       msg.helpPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpText];
-       msg.timeoutPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutText];
-       
-       msg.correlationID = correlationID;
-       
-       return msg;
-}
-
-+(SDLResetGlobalProperties*) buildResetGlobalPropertiesWithProperties:(NSArray*) properties correlationID:(NSNumber*) correlationID {
-       SDLResetGlobalProperties* msg = [[[SDLResetGlobalProperties alloc] init] autorelease];
-       msg.properties = [[properties mutableCopy] autorelease];
-       
-       msg.correlationID = correlationID;
-       
-       return msg;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTCPTransport.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTCPTransport.h
deleted file mode 100644 (file)
index 2b813e2..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLTCPTransport.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import "SDLAbstractTransport.h"
-
-@interface SDLTCPTransport : SDLAbstractTransport {
-       CFSocketRef socket;
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLVersion.h b/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLVersion.h
deleted file mode 100644 (file)
index fadda62..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/Classes/SDLVersion.h
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#ifndef __VERSION_H__
-#define __VERSION_H__
-
-#define VERSION_STRING @"1.0.0"
-
-#endif /* __VERSION_H__ */

diff --git a/SDL_iOS/SmartDeviceLinkProxy/SmartDeviceLinkProxy.xcodeproj/project.pbxproj b/SDL_iOS/SmartDeviceLinkProxy/SmartDeviceLinkProxy.xcodeproj/project.pbxproj
deleted file mode 100644 (file)
index b33fda9..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/SmartDeviceLinkProxy.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,1214 +0,0 @@
-// !$*UTF8*$!
-{
-       archiveVersion = 1;
-       classes = {
-       };
-       objectVersion = 46;
-       objects = {
-
-/* Begin PBXBuildFile section */
-               1825E726146D88D100B4CFAE /* SDLSiphonServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1825E724146D88D100B4CFAE /* SDLSiphonServer.h */; };
-               1825E727146D88D100B4CFAE /* SDLSiphonServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 1825E725146D88D100B4CFAE /* SDLSiphonServer.m */; };
-               185095E2148EBDA6008E1780 /* SDLDriverDistractionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 185095D4148EBDA6008E1780 /* SDLDriverDistractionState.h */; };
-               185095E3148EBDA6008E1780 /* SDLDriverDistractionState.m in Sources */ = {isa = PBXBuildFile; fileRef = 185095D5148EBDA6008E1780 /* SDLDriverDistractionState.m */; };
-               185095E4148EBDA6008E1780 /* SDLEncodedSyncPData.h in Headers */ = {isa = PBXBuildFile; fileRef = 185095D6148EBDA6008E1780 /* SDLEncodedSyncPData.h */; };
-               185095E5148EBDA6008E1780 /* SDLEncodedSyncPData.m in Sources */ = {isa = PBXBuildFile; fileRef = 185095D7148EBDA6008E1780 /* SDLEncodedSyncPData.m */; };
-               185095E6148EBDA6008E1780 /* SDLEncodedSyncPDataResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 185095D8148EBDA6008E1780 /* SDLEncodedSyncPDataResponse.h */; };
-               185095E7148EBDA6008E1780 /* SDLEncodedSyncPDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 185095D9148EBDA6008E1780 /* SDLEncodedSyncPDataResponse.m */; };
-               185095E8148EBDA6008E1780 /* SDLOnDriverDistraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 185095DA148EBDA6008E1780 /* SDLOnDriverDistraction.h */; };
-               185095E9148EBDA6008E1780 /* SDLOnDriverDistraction.m in Sources */ = {isa = PBXBuildFile; fileRef = 185095DB148EBDA6008E1780 /* SDLOnDriverDistraction.m */; };
-               185095EA148EBDA6008E1780 /* SDLOnEncodedSyncPData.h in Headers */ = {isa = PBXBuildFile; fileRef = 185095DC148EBDA6008E1780 /* SDLOnEncodedSyncPData.h */; };
-               185095EB148EBDA6008E1780 /* SDLOnEncodedSyncPData.m in Sources */ = {isa = PBXBuildFile; fileRef = 185095DD148EBDA6008E1780 /* SDLOnEncodedSyncPData.m */; };
-               185095EC148EBDA6008E1780 /* SDLOnTBTClientState.h in Headers */ = {isa = PBXBuildFile; fileRef = 185095DE148EBDA6008E1780 /* SDLOnTBTClientState.h */; };
-               185095ED148EBDA6008E1780 /* SDLOnTBTClientState.m in Sources */ = {isa = PBXBuildFile; fileRef = 185095DF148EBDA6008E1780 /* SDLOnTBTClientState.m */; };
-               185095EE148EBDA6008E1780 /* SDLTBTState.h in Headers */ = {isa = PBXBuildFile; fileRef = 185095E0148EBDA6008E1780 /* SDLTBTState.h */; };
-               185095EF148EBDA6008E1780 /* SDLTBTState.m in Sources */ = {isa = PBXBuildFile; fileRef = 185095E1148EBDA6008E1780 /* SDLTBTState.m */; };
-               27214DCF150693A9008C1798 /* SDLVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 27214DCE150693A9008C1798 /* SDLVersion.h */; };
-               7297D07212F1B5DF00EE4FBC /* SDLIProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 7297D07012F1B5DF00EE4FBC /* SDLIProxy.h */; };
-               8134B0A71210866D0070668B /* SDLRPCRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 8134B0A51210866D0070668B /* SDLRPCRequest.h */; };
-               8134B0A81210866D0070668B /* SDLRPCRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8134B0A61210866D0070668B /* SDLRPCRequest.m */; };
-               8134B0AB1210868B0070668B /* SDLRPCResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 8134B0A91210868B0070668B /* SDLRPCResponse.h */; };
-               8134B0AC1210868B0070668B /* SDLRPCResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 8134B0AA1210868B0070668B /* SDLRPCResponse.m */; };
-               8134B0AF1210869C0070668B /* SDLRPCNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 8134B0AD1210869C0070668B /* SDLRPCNotification.h */; };
-               8134B0B01210869C0070668B /* SDLRPCNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 8134B0AE1210869C0070668B /* SDLRPCNotification.m */; };
-               814DF65412AD5AEA00006788 /* SDLJingle.h in Headers */ = {isa = PBXBuildFile; fileRef = 814DF65212AD5AEA00006788 /* SDLJingle.h */; };
-               814DF65512AD5AEA00006788 /* SDLJingle.m in Sources */ = {isa = PBXBuildFile; fileRef = 814DF65312AD5AEA00006788 /* SDLJingle.m */; };
-               814FAA1E11E3815100AD7FF3 /* SDLIAPTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 814FAA1C11E3815100AD7FF3 /* SDLIAPTransport.h */; };
-               814FAA1F11E3815100AD7FF3 /* SDLIAPTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 814FAA1D11E3815100AD7FF3 /* SDLIAPTransport.m */; };
-               814FAA4411E38ED400AD7FF3 /* ExternalAccessory.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 814FAA4311E38ED400AD7FF3 /* ExternalAccessory.framework */; };
-               814FABB111E4D4E400AD7FF3 /* SDLProtocolFrameHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 814FABAF11E4D4E400AD7FF3 /* SDLProtocolFrameHeader.h */; };
-               814FABB211E4D4E400AD7FF3 /* SDLProtocolFrameHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 814FABB011E4D4E400AD7FF3 /* SDLProtocolFrameHeader.m */; };
-               8150481311F62DF300208A24 /* SDLRPCRequestFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 8150481111F62DF300208A24 /* SDLRPCRequestFactory.h */; };
-               8150481411F62DF300208A24 /* SDLRPCRequestFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 8150481211F62DF300208A24 /* SDLRPCRequestFactory.m */; };
-               8150487C11F6352500208A24 /* SDLProxyFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 8150487A11F6352500208A24 /* SDLProxyFactory.h */; };
-               8150487D11F6352500208A24 /* SDLProxyFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 8150487B11F6352500208A24 /* SDLProxyFactory.m */; };
-               815F874C11DCEEDA006E4379 /* SDLEnum.h in Headers */ = {isa = PBXBuildFile; fileRef = 815F86CF11DCEEDA006E4379 /* SDLEnum.h */; };
-               815F874D11DCEEDA006E4379 /* SDLEnum.m in Sources */ = {isa = PBXBuildFile; fileRef = 815F86D011DCEEDA006E4379 /* SDLEnum.m */; };
-               815F874E11DCEEDA006E4379 /* SDLRPCMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 815F86D111DCEEDA006E4379 /* SDLRPCMessage.h */; };
-               815F874F11DCEEDA006E4379 /* SDLRPCMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 815F86D211DCEEDA006E4379 /* SDLRPCMessage.m */; };
-               815F87C611DCEEDA006E4379 /* SDLProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 815F874A11DCEEDA006E4379 /* SDLProtocol.h */; };
-               815F87C711DCEEDA006E4379 /* SDLProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 815F874B11DCEEDA006E4379 /* SDLProtocol.m */; };
-               81758B0B1237FCBE00EF4CAC /* SDLProxyListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 81758B0A1237FCBE00EF4CAC /* SDLProxyListener.h */; };
-               819E532711F7534200946AC2 /* SDLTTSChunkFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 819E532511F7534200946AC2 /* SDLTTSChunkFactory.h */; };
-               819E532811F7534200946AC2 /* SDLTTSChunkFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 819E532611F7534200946AC2 /* SDLTTSChunkFactory.m */; };
-               819EEAA6125A1CF40027947D /* SDLAddCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA1C125A1CF40027947D /* SDLAddCommand.h */; };
-               819EEAA7125A1CF40027947D /* SDLAddCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA1D125A1CF40027947D /* SDLAddCommand.m */; };
-               819EEAA8125A1CF40027947D /* SDLAddCommandResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA1E125A1CF40027947D /* SDLAddCommandResponse.h */; };
-               819EEAA9125A1CF40027947D /* SDLAddCommandResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA1F125A1CF40027947D /* SDLAddCommandResponse.m */; };
-               819EEAAA125A1CF40027947D /* SDLAddSubMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA20125A1CF40027947D /* SDLAddSubMenu.h */; };
-               819EEAAB125A1CF40027947D /* SDLAddSubMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA21125A1CF40027947D /* SDLAddSubMenu.m */; };
-               819EEAAC125A1CF40027947D /* SDLAddSubMenuResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA22125A1CF40027947D /* SDLAddSubMenuResponse.h */; };
-               819EEAAD125A1CF40027947D /* SDLAddSubMenuResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA23125A1CF40027947D /* SDLAddSubMenuResponse.m */; };
-               819EEAAE125A1CF40027947D /* SDLAlert.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA24125A1CF40027947D /* SDLAlert.h */; };
-               819EEAAF125A1CF40027947D /* SDLAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA25125A1CF40027947D /* SDLAlert.m */; };
-               819EEAB0125A1CF40027947D /* SDLAlertResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA26125A1CF40027947D /* SDLAlertResponse.h */; };
-               819EEAB1125A1CF40027947D /* SDLAlertResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA27125A1CF40027947D /* SDLAlertResponse.m */; };
-               819EEAB2125A1CF40027947D /* SDLAppInterfaceUnregisteredReason.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA28125A1CF40027947D /* SDLAppInterfaceUnregisteredReason.h */; };
-               819EEAB3125A1CF40027947D /* SDLAppInterfaceUnregisteredReason.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA29125A1CF40027947D /* SDLAppInterfaceUnregisteredReason.m */; };
-               819EEAB4125A1CF40027947D /* SDLAudioStreamingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA2A125A1CF40027947D /* SDLAudioStreamingState.h */; };
-               819EEAB5125A1CF40027947D /* SDLAudioStreamingState.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA2B125A1CF40027947D /* SDLAudioStreamingState.m */; };
-               819EEAB6125A1CF40027947D /* SDLButtonCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA2C125A1CF40027947D /* SDLButtonCapabilities.h */; };
-               819EEAB7125A1CF40027947D /* SDLButtonCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA2D125A1CF40027947D /* SDLButtonCapabilities.m */; };
-               819EEAB8125A1CF40027947D /* SDLButtonEventMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA2E125A1CF40027947D /* SDLButtonEventMode.h */; };
-               819EEAB9125A1CF40027947D /* SDLButtonEventMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA2F125A1CF40027947D /* SDLButtonEventMode.m */; };
-               819EEABA125A1CF40027947D /* SDLButtonName.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA30125A1CF40027947D /* SDLButtonName.h */; };
-               819EEABB125A1CF40027947D /* SDLButtonName.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA31125A1CF40027947D /* SDLButtonName.m */; };
-               819EEABC125A1CF40027947D /* SDLButtonPressMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA32125A1CF40027947D /* SDLButtonPressMode.h */; };
-               819EEABD125A1CF40027947D /* SDLButtonPressMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA33125A1CF40027947D /* SDLButtonPressMode.m */; };
-               819EEABE125A1CF40027947D /* SDLCharacterSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA34125A1CF40027947D /* SDLCharacterSet.h */; };
-               819EEABF125A1CF40027947D /* SDLCharacterSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA35125A1CF40027947D /* SDLCharacterSet.m */; };
-               819EEAC0125A1CF40027947D /* SDLChoice.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA36125A1CF40027947D /* SDLChoice.h */; };
-               819EEAC1125A1CF40027947D /* SDLChoice.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA37125A1CF40027947D /* SDLChoice.m */; };
-               819EEAC2125A1CF40027947D /* SDLCreateInteractionChoiceSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA38125A1CF40027947D /* SDLCreateInteractionChoiceSet.h */; };
-               819EEAC3125A1CF40027947D /* SDLCreateInteractionChoiceSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA39125A1CF40027947D /* SDLCreateInteractionChoiceSet.m */; };
-               819EEAC4125A1CF40027947D /* SDLCreateInteractionChoiceSetResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA3A125A1CF40027947D /* SDLCreateInteractionChoiceSetResponse.h */; };
-               819EEAC5125A1CF40027947D /* SDLCreateInteractionChoiceSetResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA3B125A1CF40027947D /* SDLCreateInteractionChoiceSetResponse.m */; };
-               819EEAC6125A1CF40027947D /* SDLDeleteCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA3C125A1CF40027947D /* SDLDeleteCommand.h */; };
-               819EEAC7125A1CF40027947D /* SDLDeleteCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA3D125A1CF40027947D /* SDLDeleteCommand.m */; };
-               819EEAC8125A1CF40027947D /* SDLDeleteCommandResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA3E125A1CF40027947D /* SDLDeleteCommandResponse.h */; };
-               819EEAC9125A1CF40027947D /* SDLDeleteCommandResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA3F125A1CF40027947D /* SDLDeleteCommandResponse.m */; };
-               819EEACA125A1CF40027947D /* SDLDeleteInteractionChoiceSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA40125A1CF40027947D /* SDLDeleteInteractionChoiceSet.h */; };
-               819EEACB125A1CF40027947D /* SDLDeleteInteractionChoiceSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA41125A1CF40027947D /* SDLDeleteInteractionChoiceSet.m */; };
-               819EEACC125A1CF40027947D /* SDLDeleteInteractionChoiceSetResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA42125A1CF40027947D /* SDLDeleteInteractionChoiceSetResponse.h */; };
-               819EEACD125A1CF40027947D /* SDLDeleteInteractionChoiceSetResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA43125A1CF40027947D /* SDLDeleteInteractionChoiceSetResponse.m */; };
-               819EEACE125A1CF40027947D /* SDLDeleteSubMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA44125A1CF40027947D /* SDLDeleteSubMenu.h */; };
-               819EEACF125A1CF40027947D /* SDLDeleteSubMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA45125A1CF40027947D /* SDLDeleteSubMenu.m */; };
-               819EEAD0125A1CF40027947D /* SDLDeleteSubMenuResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA46125A1CF40027947D /* SDLDeleteSubMenuResponse.h */; };
-               819EEAD1125A1CF40027947D /* SDLDeleteSubMenuResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA47125A1CF40027947D /* SDLDeleteSubMenuResponse.m */; };
-               819EEAD2125A1CF40027947D /* SDLDisplayCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA48125A1CF40027947D /* SDLDisplayCapabilities.h */; };
-               819EEAD3125A1CF40027947D /* SDLDisplayCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA49125A1CF40027947D /* SDLDisplayCapabilities.m */; };
-               819EEAD4125A1CF40027947D /* SDLDisplayType.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA4A125A1CF40027947D /* SDLDisplayType.h */; };
-               819EEAD5125A1CF40027947D /* SDLDisplayType.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA4B125A1CF40027947D /* SDLDisplayType.m */; };
-               819EEAD6125A1CF40027947D /* SDLGenericResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA4C125A1CF40027947D /* SDLGenericResponse.h */; };
-               819EEAD7125A1CF40027947D /* SDLGenericResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA4D125A1CF40027947D /* SDLGenericResponse.m */; };
-               819EEAD8125A1CF40027947D /* SDLGlobalProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA4E125A1CF40027947D /* SDLGlobalProperty.h */; };
-               819EEAD9125A1CF40027947D /* SDLGlobalProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA4F125A1CF40027947D /* SDLGlobalProperty.m */; };
-               819EEADA125A1CF40027947D /* SDLHMILevel.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA50125A1CF40027947D /* SDLHMILevel.h */; };
-               819EEADB125A1CF40027947D /* SDLHMILevel.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA51125A1CF40027947D /* SDLHMILevel.m */; };
-               819EEADC125A1CF40027947D /* SDLHMIZoneCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA52125A1CF40027947D /* SDLHMIZoneCapabilities.h */; };
-               819EEADD125A1CF40027947D /* SDLHMIZoneCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA53125A1CF40027947D /* SDLHMIZoneCapabilities.m */; };
-               819EEADE125A1CF40027947D /* SDLInteractionMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA54125A1CF40027947D /* SDLInteractionMode.h */; };
-               819EEADF125A1CF40027947D /* SDLInteractionMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA55125A1CF40027947D /* SDLInteractionMode.m */; };
-               819EEAE0125A1CF40027947D /* SDLLanguage.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA56125A1CF40027947D /* SDLLanguage.h */; };
-               819EEAE1125A1CF40027947D /* SDLLanguage.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA57125A1CF40027947D /* SDLLanguage.m */; };
-               819EEAE2125A1CF40027947D /* SDLMediaClockFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA58125A1CF40027947D /* SDLMediaClockFormat.h */; };
-               819EEAE3125A1CF40027947D /* SDLMediaClockFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA59125A1CF40027947D /* SDLMediaClockFormat.m */; };
-               819EEAE4125A1CF40027947D /* SDLMenuParams.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA5A125A1CF40027947D /* SDLMenuParams.h */; };
-               819EEAE5125A1CF40027947D /* SDLMenuParams.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA5B125A1CF40027947D /* SDLMenuParams.m */; };
-               819EEAE6125A1CF40027947D /* SDLOnAppInterfaceUnregistered.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA5C125A1CF40027947D /* SDLOnAppInterfaceUnregistered.h */; };
-               819EEAE7125A1CF40027947D /* SDLOnAppInterfaceUnregistered.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA5D125A1CF40027947D /* SDLOnAppInterfaceUnregistered.m */; };
-               819EEAE8125A1CF40027947D /* SDLOnButtonEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA5E125A1CF40027947D /* SDLOnButtonEvent.h */; };
-               819EEAE9125A1CF40027947D /* SDLOnButtonEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA5F125A1CF40027947D /* SDLOnButtonEvent.m */; };
-               819EEAEA125A1CF40027947D /* SDLOnButtonPress.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA60125A1CF40027947D /* SDLOnButtonPress.h */; };
-               819EEAEB125A1CF40027947D /* SDLOnButtonPress.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA61125A1CF40027947D /* SDLOnButtonPress.m */; };
-               819EEAEC125A1CF40027947D /* SDLOnCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA62125A1CF40027947D /* SDLOnCommand.h */; };
-               819EEAED125A1CF40027947D /* SDLOnCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA63125A1CF40027947D /* SDLOnCommand.m */; };
-               819EEAEE125A1CF40027947D /* SDLOnHMIStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA64125A1CF40027947D /* SDLOnHMIStatus.h */; };
-               819EEAEF125A1CF40027947D /* SDLOnHMIStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA65125A1CF40027947D /* SDLOnHMIStatus.m */; };
-               819EEAF0125A1CF40027947D /* SDLPerformInteraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA66125A1CF40027947D /* SDLPerformInteraction.h */; };
-               819EEAF1125A1CF40027947D /* SDLPerformInteraction.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA67125A1CF40027947D /* SDLPerformInteraction.m */; };
-               819EEAF2125A1CF40027947D /* SDLPerformInteractionResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA68125A1CF40027947D /* SDLPerformInteractionResponse.h */; };
-               819EEAF3125A1CF40027947D /* SDLPerformInteractionResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA69125A1CF40027947D /* SDLPerformInteractionResponse.m */; };
-               819EEAF4125A1CF40027947D /* SDLRegisterAppInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA6A125A1CF40027947D /* SDLRegisterAppInterface.h */; };
-               819EEAF5125A1CF40027947D /* SDLRegisterAppInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA6B125A1CF40027947D /* SDLRegisterAppInterface.m */; };
-               819EEAF6125A1CF40027947D /* SDLRegisterAppInterfaceResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA6C125A1CF40027947D /* SDLRegisterAppInterfaceResponse.h */; };
-               819EEAF7125A1CF40027947D /* SDLRegisterAppInterfaceResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA6D125A1CF40027947D /* SDLRegisterAppInterfaceResponse.m */; };
-               819EEAF8125A1CF40027947D /* SDLResetGlobalProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA6E125A1CF40027947D /* SDLResetGlobalProperties.h */; };
-               819EEAF9125A1CF40027947D /* SDLResetGlobalProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA6F125A1CF40027947D /* SDLResetGlobalProperties.m */; };
-               819EEAFA125A1CF40027947D /* SDLResetGlobalPropertiesResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA70125A1CF40027947D /* SDLResetGlobalPropertiesResponse.h */; };
-               819EEAFB125A1CF40027947D /* SDLResetGlobalPropertiesResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA71125A1CF40027947D /* SDLResetGlobalPropertiesResponse.m */; };
-               819EEAFC125A1CF40027947D /* SDLResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA72125A1CF40027947D /* SDLResult.h */; };
-               819EEAFD125A1CF40027947D /* SDLResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA73125A1CF40027947D /* SDLResult.m */; };
-               819EEAFE125A1CF40027947D /* SDLSetGlobalProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA74125A1CF40027947D /* SDLSetGlobalProperties.h */; };
-               819EEAFF125A1CF40027947D /* SDLSetGlobalProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA75125A1CF40027947D /* SDLSetGlobalProperties.m */; };
-               819EEB00125A1CF40027947D /* SDLSetGlobalPropertiesResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA76125A1CF40027947D /* SDLSetGlobalPropertiesResponse.h */; };
-               819EEB01125A1CF40027947D /* SDLSetGlobalPropertiesResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA77125A1CF40027947D /* SDLSetGlobalPropertiesResponse.m */; };
-               819EEB02125A1CF40027947D /* SDLSetMediaClockTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA78125A1CF40027947D /* SDLSetMediaClockTimer.h */; };
-               819EEB03125A1CF40027947D /* SDLSetMediaClockTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA79125A1CF40027947D /* SDLSetMediaClockTimer.m */; };
-               819EEB04125A1CF40027947D /* SDLSetMediaClockTimerResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA7A125A1CF40027947D /* SDLSetMediaClockTimerResponse.h */; };
-               819EEB05125A1CF40027947D /* SDLSetMediaClockTimerResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA7B125A1CF40027947D /* SDLSetMediaClockTimerResponse.m */; };
-               819EEB06125A1CF40027947D /* SDLShow.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA7C125A1CF40027947D /* SDLShow.h */; };
-               819EEB07125A1CF40027947D /* SDLShow.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA7D125A1CF40027947D /* SDLShow.m */; };
-               819EEB08125A1CF40027947D /* SDLShowResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA7E125A1CF40027947D /* SDLShowResponse.h */; };
-               819EEB09125A1CF40027947D /* SDLShowResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA7F125A1CF40027947D /* SDLShowResponse.m */; };
-               819EEB0A125A1CF40027947D /* SDLSpeak.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA80125A1CF40027947D /* SDLSpeak.h */; };
-               819EEB0B125A1CF40027947D /* SDLSpeak.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA81125A1CF40027947D /* SDLSpeak.m */; };
-               819EEB0C125A1CF40027947D /* SDLSpeakResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA82125A1CF40027947D /* SDLSpeakResponse.h */; };
-               819EEB0D125A1CF40027947D /* SDLSpeakResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA83125A1CF40027947D /* SDLSpeakResponse.m */; };
-               819EEB0E125A1CF40027947D /* SDLSpeechCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA84125A1CF40027947D /* SDLSpeechCapabilities.h */; };
-               819EEB0F125A1CF40027947D /* SDLSpeechCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA85125A1CF40027947D /* SDLSpeechCapabilities.m */; };
-               819EEB10125A1CF40027947D /* SDLStartTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA86125A1CF40027947D /* SDLStartTime.h */; };
-               819EEB11125A1CF40027947D /* SDLStartTime.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA87125A1CF40027947D /* SDLStartTime.m */; };
-               819EEB12125A1CF40027947D /* SDLSubscribeButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA88125A1CF40027947D /* SDLSubscribeButton.h */; };
-               819EEB13125A1CF40027947D /* SDLSubscribeButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA89125A1CF40027947D /* SDLSubscribeButton.m */; };
-               819EEB14125A1CF40027947D /* SDLSubscribeButtonResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA8A125A1CF40027947D /* SDLSubscribeButtonResponse.h */; };
-               819EEB15125A1CF40027947D /* SDLSubscribeButtonResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA8B125A1CF40027947D /* SDLSubscribeButtonResponse.m */; };
-               819EEB16125A1CF40027947D /* SDLMsgVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA8C125A1CF40027947D /* SDLMsgVersion.h */; };
-               819EEB17125A1CF40027947D /* SDLMsgVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA8D125A1CF40027947D /* SDLMsgVersion.m */; };
-               819EEB18125A1CF40027947D /* SDLSystemContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA8E125A1CF40027947D /* SDLSystemContext.h */; };
-               819EEB19125A1CF40027947D /* SDLSystemContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA8F125A1CF40027947D /* SDLSystemContext.m */; };
-               819EEB1A125A1CF40027947D /* SDLTextAlignment.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA90125A1CF40027947D /* SDLTextAlignment.h */; };
-               819EEB1B125A1CF40027947D /* SDLTextAlignment.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA91125A1CF40027947D /* SDLTextAlignment.m */; };
-               819EEB1C125A1CF40027947D /* SDLTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA92125A1CF40027947D /* SDLTextField.h */; };
-               819EEB1D125A1CF40027947D /* SDLTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA93125A1CF40027947D /* SDLTextField.m */; };
-               819EEB1E125A1CF40027947D /* SDLTextFieldName.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA94125A1CF40027947D /* SDLTextFieldName.h */; };
-               819EEB1F125A1CF40027947D /* SDLTextFieldName.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA95125A1CF40027947D /* SDLTextFieldName.m */; };
-               819EEB20125A1CF40027947D /* SDLTriggerSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA96125A1CF40027947D /* SDLTriggerSource.h */; };
-               819EEB21125A1CF40027947D /* SDLTriggerSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA97125A1CF40027947D /* SDLTriggerSource.m */; };
-               819EEB22125A1CF40027947D /* SDLTTSChunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA98125A1CF40027947D /* SDLTTSChunk.h */; };
-               819EEB23125A1CF40027947D /* SDLTTSChunk.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA99125A1CF40027947D /* SDLTTSChunk.m */; };
-               819EEB24125A1CF40027947D /* SDLUnregisterAppInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA9A125A1CF40027947D /* SDLUnregisterAppInterface.h */; };
-               819EEB25125A1CF40027947D /* SDLUnregisterAppInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA9B125A1CF40027947D /* SDLUnregisterAppInterface.m */; };
-               819EEB26125A1CF40027947D /* SDLUnregisterAppInterfaceResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA9C125A1CF40027947D /* SDLUnregisterAppInterfaceResponse.h */; };
-               819EEB27125A1CF40027947D /* SDLUnregisterAppInterfaceResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA9D125A1CF40027947D /* SDLUnregisterAppInterfaceResponse.m */; };
-               819EEB28125A1CF40027947D /* SDLUnsubscribeButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEA9E125A1CF40027947D /* SDLUnsubscribeButton.h */; };
-               819EEB29125A1CF40027947D /* SDLUnsubscribeButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEA9F125A1CF40027947D /* SDLUnsubscribeButton.m */; };
-               819EEB2A125A1CF40027947D /* SDLUnsubscribeButtonResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEAA0125A1CF40027947D /* SDLUnsubscribeButtonResponse.h */; };
-               819EEB2B125A1CF40027947D /* SDLUnsubscribeButtonResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEAA1125A1CF40027947D /* SDLUnsubscribeButtonResponse.m */; };
-               819EEB2C125A1CF40027947D /* SDLUpdateMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEAA2125A1CF40027947D /* SDLUpdateMode.h */; };
-               819EEB2D125A1CF40027947D /* SDLUpdateMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEAA3125A1CF40027947D /* SDLUpdateMode.m */; };
-               819EEB2E125A1CF40027947D /* SDLVRCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 819EEAA4125A1CF40027947D /* SDLVRCapabilities.h */; };
-               819EEB2F125A1CF40027947D /* SDLVRCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 819EEAA5125A1CF40027947D /* SDLVRCapabilities.m */; };
-               81D0C2DA12010C1300E877A6 /* SDLDebugTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 81D0C2D812010C1300E877A6 /* SDLDebugTool.h */; };
-               81D0C2DB12010C1300E877A6 /* SDLDebugTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 81D0C2D912010C1300E877A6 /* SDLDebugTool.m */; };
-               81FA2B3A127AEF1500B2B9A8 /* SDLConsoleController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81FA2B38127AEF1500B2B9A8 /* SDLConsoleController.h */; };
-               81FA2B3B127AEF1500B2B9A8 /* SDLConsoleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81FA2B39127AEF1500B2B9A8 /* SDLConsoleController.m */; };
-               AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
-               EE7CB1C11141523E00B9CB6A /* SDLIDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1A11141523E00B9CB6A /* SDLIDecoder.h */; };
-               EE7CB1C21141523E00B9CB6A /* SDLIEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1A21141523E00B9CB6A /* SDLIEncoder.h */; };
-               EE7CB1C31141523E00B9CB6A /* SDLIProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1A31141523E00B9CB6A /* SDLIProtocol.h */; };
-               EE7CB1C51141523E00B9CB6A /* SDLITransport.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1A51141523E00B9CB6A /* SDLITransport.h */; };
-               EE7CB1C61141523E00B9CB6A /* SDLTransportListener.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1A61141523E00B9CB6A /* SDLTransportListener.h */; };
-               EE7CB1C71141523E00B9CB6A /* SDLJsonDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1A71141523E00B9CB6A /* SDLJsonDecoder.h */; };
-               EE7CB1C81141523E00B9CB6A /* SDLJsonDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB1A81141523E00B9CB6A /* SDLJsonDecoder.m */; };
-               EE7CB1C91141523E00B9CB6A /* SDLJsonEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1A91141523E00B9CB6A /* SDLJsonEncoder.h */; };
-               EE7CB1CA1141523E00B9CB6A /* SDLJsonEncoder.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB1AA1141523E00B9CB6A /* SDLJsonEncoder.m */; };
-               EE7CB1CD1141523E00B9CB6A /* SDLNames.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1AD1141523E00B9CB6A /* SDLNames.h */; };
-               EE7CB1CF1141523E00B9CB6A /* SDLProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1AF1141523E00B9CB6A /* SDLProxy.h */; };
-               EE7CB1D01141523E00B9CB6A /* SDLProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB1B01141523E00B9CB6A /* SDLProxy.m */; };
-               EE7CB1D11141523E00B9CB6A /* SDLTCPTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1B11141523E00B9CB6A /* SDLTCPTransport.h */; };
-               EE7CB1D21141523E00B9CB6A /* SDLTCPTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB1B21141523E00B9CB6A /* SDLTCPTransport.m */; };
-               EE7CB1D31141523E00B9CB6A /* SDLAbstractTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1B31141523E00B9CB6A /* SDLAbstractTransport.h */; };
-               EE7CB1D41141523E00B9CB6A /* SDLAbstractTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB1B41141523E00B9CB6A /* SDLAbstractTransport.m */; };
-               EE7CB1DD1141563F00B9CB6A /* SDLProtocolMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1DB1141563F00B9CB6A /* SDLProtocolMessage.h */; };
-               EE7CB1DE1141563F00B9CB6A /* SDLProtocolMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB1DC1141563F00B9CB6A /* SDLProtocolMessage.m */; };
-               EE7CB1EA1141573200B9CB6A /* SDLProtocolListener.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1E81141573200B9CB6A /* SDLProtocolListener.h */; };
-               EE7CB1EE1141575A00B9CB6A /* SDLAbstractProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1EC1141575A00B9CB6A /* SDLAbstractProtocol.h */; };
-               EE7CB1EF1141575A00B9CB6A /* SDLAbstractProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB1ED1141575A00B9CB6A /* SDLAbstractProtocol.m */; };
-               EE7CB1F21141576500B9CB6A /* SDLProtocolFrameHeaderFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB1F01141576500B9CB6A /* SDLProtocolFrameHeaderFactory.h */; };
-               EE7CB1F31141576500B9CB6A /* SDLProtocolFrameHeaderFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB1F11141576500B9CB6A /* SDLProtocolFrameHeaderFactory.m */; };
-               EE7CB22811415A9C00B9CB6A /* JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB21B11415A9C00B9CB6A /* JSON.h */; };
-               EE7CB22911415A9C00B9CB6A /* NSObject+SBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB21C11415A9C00B9CB6A /* NSObject+SBJSON.h */; };
-               EE7CB22A11415A9C00B9CB6A /* NSObject+SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB21D11415A9C00B9CB6A /* NSObject+SBJSON.m */; };
-               EE7CB22B11415A9C00B9CB6A /* NSString+SBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB21E11415A9C00B9CB6A /* NSString+SBJSON.h */; };
-               EE7CB22C11415A9C00B9CB6A /* NSString+SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB21F11415A9C00B9CB6A /* NSString+SBJSON.m */; };
-               EE7CB22D11415A9C00B9CB6A /* SBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB22011415A9C00B9CB6A /* SBJSON.h */; };
-               EE7CB22E11415A9C00B9CB6A /* SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB22111415A9C00B9CB6A /* SBJSON.m */; };
-               EE7CB22F11415A9C00B9CB6A /* SBJsonBase.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB22211415A9C00B9CB6A /* SBJsonBase.h */; };
-               EE7CB23011415A9C00B9CB6A /* SBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB22311415A9C00B9CB6A /* SBJsonBase.m */; };
-               EE7CB23111415A9C00B9CB6A /* SBJsonParser.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB22411415A9C00B9CB6A /* SBJsonParser.h */; };
-               EE7CB23211415A9C00B9CB6A /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB22511415A9C00B9CB6A /* SBJsonParser.m */; };
-               EE7CB23311415A9C00B9CB6A /* SBJsonWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = EE7CB22611415A9C00B9CB6A /* SBJsonWriter.h */; };
-               EE7CB23411415A9C00B9CB6A /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = EE7CB22711415A9C00B9CB6A /* SBJsonWriter.m */; };
-               EEB0806611454A63009C45EB /* SDLBitConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = EEB0806411454A63009C45EB /* SDLBitConverter.h */; };
-               EEB0806711454A63009C45EB /* SDLBitConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = EEB0806511454A63009C45EB /* SDLBitConverter.m */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-               1825E724146D88D100B4CFAE /* SDLSiphonServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSiphonServer.h; sourceTree = "<group>"; };
-               1825E725146D88D100B4CFAE /* SDLSiphonServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSiphonServer.m; sourceTree = "<group>"; };
-               185095D4148EBDA6008E1780 /* SDLDriverDistractionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDriverDistractionState.h; sourceTree = "<group>"; };
-               185095D5148EBDA6008E1780 /* SDLDriverDistractionState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDriverDistractionState.m; sourceTree = "<group>"; };
-               185095D6148EBDA6008E1780 /* SDLEncodedSyncPData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLEncodedSyncPData.h; sourceTree = "<group>"; };
-               185095D7148EBDA6008E1780 /* SDLEncodedSyncPData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLEncodedSyncPData.m; sourceTree = "<group>"; };
-               185095D8148EBDA6008E1780 /* SDLEncodedSyncPDataResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLEncodedSyncPDataResponse.h; sourceTree = "<group>"; };
-               185095D9148EBDA6008E1780 /* SDLEncodedSyncPDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLEncodedSyncPDataResponse.m; sourceTree = "<group>"; };
-               185095DA148EBDA6008E1780 /* SDLOnDriverDistraction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLOnDriverDistraction.h; sourceTree = "<group>"; };
-               185095DB148EBDA6008E1780 /* SDLOnDriverDistraction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLOnDriverDistraction.m; sourceTree = "<group>"; };
-               185095DC148EBDA6008E1780 /* SDLOnEncodedSyncPData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLOnEncodedSyncPData.h; sourceTree = "<group>"; };
-               185095DD148EBDA6008E1780 /* SDLOnEncodedSyncPData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLOnEncodedSyncPData.m; sourceTree = "<group>"; };
-               185095DE148EBDA6008E1780 /* SDLOnTBTClientState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLOnTBTClientState.h; sourceTree = "<group>"; };
-               185095DF148EBDA6008E1780 /* SDLOnTBTClientState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLOnTBTClientState.m; sourceTree = "<group>"; };
-               185095E0148EBDA6008E1780 /* SDLTBTState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTBTState.h; sourceTree = "<group>"; };
-               185095E1148EBDA6008E1780 /* SDLTBTState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTBTState.m; sourceTree = "<group>"; };
-               27214DCE150693A9008C1798 /* SDLVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVersion.h; sourceTree = "<group>"; };
-               7297D07012F1B5DF00EE4FBC /* SDLIProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLIProxy.h; sourceTree = "<group>"; };
-               8134B0A51210866D0070668B /* SDLRPCRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRPCRequest.h; sourceTree = "<group>"; };
-               8134B0A61210866D0070668B /* SDLRPCRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCRequest.m; sourceTree = "<group>"; };
-               8134B0A91210868B0070668B /* SDLRPCResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRPCResponse.h; sourceTree = "<group>"; };
-               8134B0AA1210868B0070668B /* SDLRPCResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCResponse.m; sourceTree = "<group>"; };
-               8134B0AD1210869C0070668B /* SDLRPCNotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRPCNotification.h; sourceTree = "<group>"; };
-               8134B0AE1210869C0070668B /* SDLRPCNotification.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCNotification.m; sourceTree = "<group>"; };
-               814DF65212AD5AEA00006788 /* SDLJingle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLJingle.h; sourceTree = "<group>"; };
-               814DF65312AD5AEA00006788 /* SDLJingle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLJingle.m; sourceTree = "<group>"; };
-               814FAA1C11E3815100AD7FF3 /* SDLIAPTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLIAPTransport.h; sourceTree = "<group>"; };
-               814FAA1D11E3815100AD7FF3 /* SDLIAPTransport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLIAPTransport.m; sourceTree = "<group>"; };
-               814FAA4311E38ED400AD7FF3 /* ExternalAccessory.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExternalAccessory.framework; path = System/Library/Frameworks/ExternalAccessory.framework; sourceTree = SDKROOT; };
-               814FABAF11E4D4E400AD7FF3 /* SDLProtocolFrameHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLProtocolFrameHeader.h; sourceTree = "<group>"; };
-               814FABB011E4D4E400AD7FF3 /* SDLProtocolFrameHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLProtocolFrameHeader.m; sourceTree = "<group>"; };
-               8150481111F62DF300208A24 /* SDLRPCRequestFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRPCRequestFactory.h; sourceTree = "<group>"; };
-               8150481211F62DF300208A24 /* SDLRPCRequestFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCRequestFactory.m; sourceTree = "<group>"; };
-               8150487A11F6352500208A24 /* SDLProxyFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLProxyFactory.h; sourceTree = "<group>"; };
-               8150487B11F6352500208A24 /* SDLProxyFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLProxyFactory.m; sourceTree = "<group>"; };
-               815F86CF11DCEEDA006E4379 /* SDLEnum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLEnum.h; sourceTree = "<group>"; };
-               815F86D011DCEEDA006E4379 /* SDLEnum.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLEnum.m; sourceTree = "<group>"; };
-               815F86D111DCEEDA006E4379 /* SDLRPCMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRPCMessage.h; sourceTree = "<group>"; };
-               815F86D211DCEEDA006E4379 /* SDLRPCMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCMessage.m; sourceTree = "<group>"; };
-               815F874A11DCEEDA006E4379 /* SDLProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLProtocol.h; sourceTree = "<group>"; };
-               815F874B11DCEEDA006E4379 /* SDLProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLProtocol.m; sourceTree = "<group>"; };
-               81758B0A1237FCBE00EF4CAC /* SDLProxyListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLProxyListener.h; sourceTree = "<group>"; };
-               819E532511F7534200946AC2 /* SDLTTSChunkFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTTSChunkFactory.h; sourceTree = "<group>"; };
-               819E532611F7534200946AC2 /* SDLTTSChunkFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTTSChunkFactory.m; sourceTree = "<group>"; };
-               819EEA1C125A1CF40027947D /* SDLAddCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLAddCommand.h; sourceTree = "<group>"; };
-               819EEA1D125A1CF40027947D /* SDLAddCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAddCommand.m; sourceTree = "<group>"; };
-               819EEA1E125A1CF40027947D /* SDLAddCommandResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLAddCommandResponse.h; sourceTree = "<group>"; };
-               819EEA1F125A1CF40027947D /* SDLAddCommandResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAddCommandResponse.m; sourceTree = "<group>"; };
-               819EEA20125A1CF40027947D /* SDLAddSubMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLAddSubMenu.h; sourceTree = "<group>"; };
-               819EEA21125A1CF40027947D /* SDLAddSubMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAddSubMenu.m; sourceTree = "<group>"; };
-               819EEA22125A1CF40027947D /* SDLAddSubMenuResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLAddSubMenuResponse.h; sourceTree = "<group>"; };
-               819EEA23125A1CF40027947D /* SDLAddSubMenuResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAddSubMenuResponse.m; sourceTree = "<group>"; };
-               819EEA24125A1CF40027947D /* SDLAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLAlert.h; sourceTree = "<group>"; };
-               819EEA25125A1CF40027947D /* SDLAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAlert.m; sourceTree = "<group>"; };
-               819EEA26125A1CF40027947D /* SDLAlertResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLAlertResponse.h; sourceTree = "<group>"; };
-               819EEA27125A1CF40027947D /* SDLAlertResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAlertResponse.m; sourceTree = "<group>"; };
-               819EEA28125A1CF40027947D /* SDLAppInterfaceUnregisteredReason.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLAppInterfaceUnregisteredReason.h; sourceTree = "<group>"; };
-               819EEA29125A1CF40027947D /* SDLAppInterfaceUnregisteredReason.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAppInterfaceUnregisteredReason.m; sourceTree = "<group>"; };
-               819EEA2A125A1CF40027947D /* SDLAudioStreamingState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLAudioStreamingState.h; sourceTree = "<group>"; };
-               819EEA2B125A1CF40027947D /* SDLAudioStreamingState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAudioStreamingState.m; sourceTree = "<group>"; };
-               819EEA2C125A1CF40027947D /* SDLButtonCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLButtonCapabilities.h; sourceTree = "<group>"; };
-               819EEA2D125A1CF40027947D /* SDLButtonCapabilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLButtonCapabilities.m; sourceTree = "<group>"; };
-               819EEA2E125A1CF40027947D /* SDLButtonEventMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLButtonEventMode.h; sourceTree = "<group>"; };
-               819EEA2F125A1CF40027947D /* SDLButtonEventMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLButtonEventMode.m; sourceTree = "<group>"; };
-               819EEA30125A1CF40027947D /* SDLButtonName.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLButtonName.h; sourceTree = "<group>"; };
-               819EEA31125A1CF40027947D /* SDLButtonName.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLButtonName.m; sourceTree = "<group>"; };
-               819EEA32125A1CF40027947D /* SDLButtonPressMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLButtonPressMode.h; sourceTree = "<group>"; };
-               819EEA33125A1CF40027947D /* SDLButtonPressMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLButtonPressMode.m; sourceTree = "<group>"; };
-               819EEA34125A1CF40027947D /* SDLCharacterSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLCharacterSet.h; sourceTree = "<group>"; };
-               819EEA35125A1CF40027947D /* SDLCharacterSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLCharacterSet.m; sourceTree = "<group>"; };
-               819EEA36125A1CF40027947D /* SDLChoice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLChoice.h; sourceTree = "<group>"; };
-               819EEA37125A1CF40027947D /* SDLChoice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLChoice.m; sourceTree = "<group>"; };
-               819EEA38125A1CF40027947D /* SDLCreateInteractionChoiceSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLCreateInteractionChoiceSet.h; sourceTree = "<group>"; };
-               819EEA39125A1CF40027947D /* SDLCreateInteractionChoiceSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLCreateInteractionChoiceSet.m; sourceTree = "<group>"; };
-               819EEA3A125A1CF40027947D /* SDLCreateInteractionChoiceSetResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLCreateInteractionChoiceSetResponse.h; sourceTree = "<group>"; };
-               819EEA3B125A1CF40027947D /* SDLCreateInteractionChoiceSetResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLCreateInteractionChoiceSetResponse.m; sourceTree = "<group>"; };
-               819EEA3C125A1CF40027947D /* SDLDeleteCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDeleteCommand.h; sourceTree = "<group>"; };
-               819EEA3D125A1CF40027947D /* SDLDeleteCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDeleteCommand.m; sourceTree = "<group>"; };
-               819EEA3E125A1CF40027947D /* SDLDeleteCommandResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDeleteCommandResponse.h; sourceTree = "<group>"; };
-               819EEA3F125A1CF40027947D /* SDLDeleteCommandResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDeleteCommandResponse.m; sourceTree = "<group>"; };
-               819EEA40125A1CF40027947D /* SDLDeleteInteractionChoiceSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDeleteInteractionChoiceSet.h; sourceTree = "<group>"; };
-               819EEA41125A1CF40027947D /* SDLDeleteInteractionChoiceSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDeleteInteractionChoiceSet.m; sourceTree = "<group>"; };
-               819EEA42125A1CF40027947D /* SDLDeleteInteractionChoiceSetResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDeleteInteractionChoiceSetResponse.h; sourceTree = "<group>"; };
-               819EEA43125A1CF40027947D /* SDLDeleteInteractionChoiceSetResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDeleteInteractionChoiceSetResponse.m; sourceTree = "<group>"; };
-               819EEA44125A1CF40027947D /* SDLDeleteSubMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDeleteSubMenu.h; sourceTree = "<group>"; };
-               819EEA45125A1CF40027947D /* SDLDeleteSubMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDeleteSubMenu.m; sourceTree = "<group>"; };
-               819EEA46125A1CF40027947D /* SDLDeleteSubMenuResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDeleteSubMenuResponse.h; sourceTree = "<group>"; };
-               819EEA47125A1CF40027947D /* SDLDeleteSubMenuResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDeleteSubMenuResponse.m; sourceTree = "<group>"; };
-               819EEA48125A1CF40027947D /* SDLDisplayCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDisplayCapabilities.h; sourceTree = "<group>"; };
-               819EEA49125A1CF40027947D /* SDLDisplayCapabilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDisplayCapabilities.m; sourceTree = "<group>"; };
-               819EEA4A125A1CF40027947D /* SDLDisplayType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDisplayType.h; sourceTree = "<group>"; };
-               819EEA4B125A1CF40027947D /* SDLDisplayType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDisplayType.m; sourceTree = "<group>"; };
-               819EEA4C125A1CF40027947D /* SDLGenericResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLGenericResponse.h; sourceTree = "<group>"; };
-               819EEA4D125A1CF40027947D /* SDLGenericResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLGenericResponse.m; sourceTree = "<group>"; };
-               819EEA4E125A1CF40027947D /* SDLGlobalProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLGlobalProperty.h; sourceTree = "<group>"; };
-               819EEA4F125A1CF40027947D /* SDLGlobalProperty.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLGlobalProperty.m; sourceTree = "<group>"; };
-               819EEA50125A1CF40027947D /* SDLHMILevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLHMILevel.h; sourceTree = "<group>"; };
-               819EEA51125A1CF40027947D /* SDLHMILevel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLHMILevel.m; sourceTree = "<group>"; };
-               819EEA52125A1CF40027947D /* SDLHMIZoneCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLHMIZoneCapabilities.h; sourceTree = "<group>"; };
-               819EEA53125A1CF40027947D /* SDLHMIZoneCapabilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLHMIZoneCapabilities.m; sourceTree = "<group>"; };
-               819EEA54125A1CF40027947D /* SDLInteractionMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLInteractionMode.h; sourceTree = "<group>"; };
-               819EEA55125A1CF40027947D /* SDLInteractionMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLInteractionMode.m; sourceTree = "<group>"; };
-               819EEA56125A1CF40027947D /* SDLLanguage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLLanguage.h; sourceTree = "<group>"; };
-               819EEA57125A1CF40027947D /* SDLLanguage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLLanguage.m; sourceTree = "<group>"; };
-               819EEA58125A1CF40027947D /* SDLMediaClockFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMediaClockFormat.h; sourceTree = "<group>"; };
-               819EEA59125A1CF40027947D /* SDLMediaClockFormat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMediaClockFormat.m; sourceTree = "<group>"; };
-               819EEA5A125A1CF40027947D /* SDLMenuParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMenuParams.h; sourceTree = "<group>"; };
-               819EEA5B125A1CF40027947D /* SDLMenuParams.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMenuParams.m; sourceTree = "<group>"; };
-               819EEA5C125A1CF40027947D /* SDLOnAppInterfaceUnregistered.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLOnAppInterfaceUnregistered.h; sourceTree = "<group>"; };
-               819EEA5D125A1CF40027947D /* SDLOnAppInterfaceUnregistered.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLOnAppInterfaceUnregistered.m; sourceTree = "<group>"; };
-               819EEA5E125A1CF40027947D /* SDLOnButtonEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLOnButtonEvent.h; sourceTree = "<group>"; };
-               819EEA5F125A1CF40027947D /* SDLOnButtonEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLOnButtonEvent.m; sourceTree = "<group>"; };
-               819EEA60125A1CF40027947D /* SDLOnButtonPress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLOnButtonPress.h; sourceTree = "<group>"; };
-               819EEA61125A1CF40027947D /* SDLOnButtonPress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLOnButtonPress.m; sourceTree = "<group>"; };
-               819EEA62125A1CF40027947D /* SDLOnCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLOnCommand.h; sourceTree = "<group>"; };
-               819EEA63125A1CF40027947D /* SDLOnCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLOnCommand.m; sourceTree = "<group>"; };
-               819EEA64125A1CF40027947D /* SDLOnHMIStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLOnHMIStatus.h; sourceTree = "<group>"; };
-               819EEA65125A1CF40027947D /* SDLOnHMIStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLOnHMIStatus.m; sourceTree = "<group>"; };
-               819EEA66125A1CF40027947D /* SDLPerformInteraction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLPerformInteraction.h; sourceTree = "<group>"; };
-               819EEA67125A1CF40027947D /* SDLPerformInteraction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLPerformInteraction.m; sourceTree = "<group>"; };
-               819EEA68125A1CF40027947D /* SDLPerformInteractionResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLPerformInteractionResponse.h; sourceTree = "<group>"; };
-               819EEA69125A1CF40027947D /* SDLPerformInteractionResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLPerformInteractionResponse.m; sourceTree = "<group>"; };
-               819EEA6A125A1CF40027947D /* SDLRegisterAppInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRegisterAppInterface.h; sourceTree = "<group>"; };
-               819EEA6B125A1CF40027947D /* SDLRegisterAppInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRegisterAppInterface.m; sourceTree = "<group>"; };
-               819EEA6C125A1CF40027947D /* SDLRegisterAppInterfaceResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRegisterAppInterfaceResponse.h; sourceTree = "<group>"; };
-               819EEA6D125A1CF40027947D /* SDLRegisterAppInterfaceResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRegisterAppInterfaceResponse.m; sourceTree = "<group>"; };
-               819EEA6E125A1CF40027947D /* SDLResetGlobalProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLResetGlobalProperties.h; sourceTree = "<group>"; };
-               819EEA6F125A1CF40027947D /* SDLResetGlobalProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLResetGlobalProperties.m; sourceTree = "<group>"; };
-               819EEA70125A1CF40027947D /* SDLResetGlobalPropertiesResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLResetGlobalPropertiesResponse.h; sourceTree = "<group>"; };
-               819EEA71125A1CF40027947D /* SDLResetGlobalPropertiesResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLResetGlobalPropertiesResponse.m; sourceTree = "<group>"; };
-               819EEA72125A1CF40027947D /* SDLResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLResult.h; sourceTree = "<group>"; };
-               819EEA73125A1CF40027947D /* SDLResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLResult.m; sourceTree = "<group>"; };
-               819EEA74125A1CF40027947D /* SDLSetGlobalProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSetGlobalProperties.h; sourceTree = "<group>"; };
-               819EEA75125A1CF40027947D /* SDLSetGlobalProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSetGlobalProperties.m; sourceTree = "<group>"; };
-               819EEA76125A1CF40027947D /* SDLSetGlobalPropertiesResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSetGlobalPropertiesResponse.h; sourceTree = "<group>"; };
-               819EEA77125A1CF40027947D /* SDLSetGlobalPropertiesResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSetGlobalPropertiesResponse.m; sourceTree = "<group>"; };
-               819EEA78125A1CF40027947D /* SDLSetMediaClockTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSetMediaClockTimer.h; sourceTree = "<group>"; };
-               819EEA79125A1CF40027947D /* SDLSetMediaClockTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSetMediaClockTimer.m; sourceTree = "<group>"; };
-               819EEA7A125A1CF40027947D /* SDLSetMediaClockTimerResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSetMediaClockTimerResponse.h; sourceTree = "<group>"; };
-               819EEA7B125A1CF40027947D /* SDLSetMediaClockTimerResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSetMediaClockTimerResponse.m; sourceTree = "<group>"; };
-               819EEA7C125A1CF40027947D /* SDLShow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLShow.h; sourceTree = "<group>"; };
-               819EEA7D125A1CF40027947D /* SDLShow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLShow.m; sourceTree = "<group>"; };
-               819EEA7E125A1CF40027947D /* SDLShowResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLShowResponse.h; sourceTree = "<group>"; };
-               819EEA7F125A1CF40027947D /* SDLShowResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLShowResponse.m; sourceTree = "<group>"; };
-               819EEA80125A1CF40027947D /* SDLSpeak.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSpeak.h; sourceTree = "<group>"; };
-               819EEA81125A1CF40027947D /* SDLSpeak.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSpeak.m; sourceTree = "<group>"; };
-               819EEA82125A1CF40027947D /* SDLSpeakResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSpeakResponse.h; sourceTree = "<group>"; };
-               819EEA83125A1CF40027947D /* SDLSpeakResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSpeakResponse.m; sourceTree = "<group>"; };
-               819EEA84125A1CF40027947D /* SDLSpeechCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSpeechCapabilities.h; sourceTree = "<group>"; };
-               819EEA85125A1CF40027947D /* SDLSpeechCapabilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSpeechCapabilities.m; sourceTree = "<group>"; };
-               819EEA86125A1CF40027947D /* SDLStartTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLStartTime.h; sourceTree = "<group>"; };
-               819EEA87125A1CF40027947D /* SDLStartTime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLStartTime.m; sourceTree = "<group>"; };
-               819EEA88125A1CF40027947D /* SDLSubscribeButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSubscribeButton.h; sourceTree = "<group>"; };
-               819EEA89125A1CF40027947D /* SDLSubscribeButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSubscribeButton.m; sourceTree = "<group>"; };
-               819EEA8A125A1CF40027947D /* SDLSubscribeButtonResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSubscribeButtonResponse.h; sourceTree = "<group>"; };
-               819EEA8B125A1CF40027947D /* SDLSubscribeButtonResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSubscribeButtonResponse.m; sourceTree = "<group>"; };
-               819EEA8C125A1CF40027947D /* SDLMsgVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMsgVersion.h; sourceTree = "<group>"; };
-               819EEA8D125A1CF40027947D /* SDLMsgVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMsgVersion.m; sourceTree = "<group>"; };
-               819EEA8E125A1CF40027947D /* SDLSystemContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSystemContext.h; sourceTree = "<group>"; };
-               819EEA8F125A1CF40027947D /* SDLSystemContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSystemContext.m; sourceTree = "<group>"; };
-               819EEA90125A1CF40027947D /* SDLTextAlignment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTextAlignment.h; sourceTree = "<group>"; };
-               819EEA91125A1CF40027947D /* SDLTextAlignment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTextAlignment.m; sourceTree = "<group>"; };
-               819EEA92125A1CF40027947D /* SDLTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTextField.h; sourceTree = "<group>"; };
-               819EEA93125A1CF40027947D /* SDLTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTextField.m; sourceTree = "<group>"; };
-               819EEA94125A1CF40027947D /* SDLTextFieldName.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTextFieldName.h; sourceTree = "<group>"; };
-               819EEA95125A1CF40027947D /* SDLTextFieldName.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTextFieldName.m; sourceTree = "<group>"; };
-               819EEA96125A1CF40027947D /* SDLTriggerSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTriggerSource.h; sourceTree = "<group>"; };
-               819EEA97125A1CF40027947D /* SDLTriggerSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTriggerSource.m; sourceTree = "<group>"; };
-               819EEA98125A1CF40027947D /* SDLTTSChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTTSChunk.h; sourceTree = "<group>"; };
-               819EEA99125A1CF40027947D /* SDLTTSChunk.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTTSChunk.m; sourceTree = "<group>"; };
-               819EEA9A125A1CF40027947D /* SDLUnregisterAppInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnregisterAppInterface.h; sourceTree = "<group>"; };
-               819EEA9B125A1CF40027947D /* SDLUnregisterAppInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUnregisterAppInterface.m; sourceTree = "<group>"; };
-               819EEA9C125A1CF40027947D /* SDLUnregisterAppInterfaceResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnregisterAppInterfaceResponse.h; sourceTree = "<group>"; };
-               819EEA9D125A1CF40027947D /* SDLUnregisterAppInterfaceResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUnregisterAppInterfaceResponse.m; sourceTree = "<group>"; };
-               819EEA9E125A1CF40027947D /* SDLUnsubscribeButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnsubscribeButton.h; sourceTree = "<group>"; };
-               819EEA9F125A1CF40027947D /* SDLUnsubscribeButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUnsubscribeButton.m; sourceTree = "<group>"; };
-               819EEAA0125A1CF40027947D /* SDLUnsubscribeButtonResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnsubscribeButtonResponse.h; sourceTree = "<group>"; };
-               819EEAA1125A1CF40027947D /* SDLUnsubscribeButtonResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUnsubscribeButtonResponse.m; sourceTree = "<group>"; };
-               819EEAA2125A1CF40027947D /* SDLUpdateMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUpdateMode.h; sourceTree = "<group>"; };
-               819EEAA3125A1CF40027947D /* SDLUpdateMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUpdateMode.m; sourceTree = "<group>"; };
-               819EEAA4125A1CF40027947D /* SDLVRCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVRCapabilities.h; sourceTree = "<group>"; };
-               819EEAA5125A1CF40027947D /* SDLVRCapabilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLVRCapabilities.m; sourceTree = "<group>"; };
-               81D0C2D812010C1300E877A6 /* SDLDebugTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDebugTool.h; sourceTree = "<group>"; };
-               81D0C2D912010C1300E877A6 /* SDLDebugTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDebugTool.m; sourceTree = "<group>"; };
-               81FA2B37127AEF1500B2B9A8 /* SDLConsoleController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SDLConsoleController.xib; sourceTree = "<group>"; };
-               81FA2B38127AEF1500B2B9A8 /* SDLConsoleController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLConsoleController.h; sourceTree = "<group>"; };
-               81FA2B39127AEF1500B2B9A8 /* SDLConsoleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLConsoleController.m; sourceTree = "<group>"; };
-               AA747D9E0F9514B9006C5449 /* SmartDeviceLinkProxy_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SmartDeviceLinkProxy_Prefix.pch; path = Users/thunder/Desktop/master/SmartDeviceLinkProxy/SmartDeviceLinkProxy_Prefix.pch; sourceTree = SDKROOT; };
-               AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-               D2AAC07E0554694100DB518D /* libSmartDeviceLinkProxy.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSmartDeviceLinkProxy.a; sourceTree = BUILT_PRODUCTS_DIR; };
-               EE7CB1A11141523E00B9CB6A /* SDLIDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLIDecoder.h; sourceTree = "<group>"; };
-               EE7CB1A21141523E00B9CB6A /* SDLIEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLIEncoder.h; sourceTree = "<group>"; };
-               EE7CB1A31141523E00B9CB6A /* SDLIProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLIProtocol.h; sourceTree = "<group>"; };
-               EE7CB1A51141523E00B9CB6A /* SDLITransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLITransport.h; sourceTree = "<group>"; };
-               EE7CB1A61141523E00B9CB6A /* SDLTransportListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTransportListener.h; sourceTree = "<group>"; };
-               EE7CB1A71141523E00B9CB6A /* SDLJsonDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLJsonDecoder.h; sourceTree = "<group>"; };
-               EE7CB1A81141523E00B9CB6A /* SDLJsonDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLJsonDecoder.m; sourceTree = "<group>"; };
-               EE7CB1A91141523E00B9CB6A /* SDLJsonEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLJsonEncoder.h; sourceTree = "<group>"; };
-               EE7CB1AA1141523E00B9CB6A /* SDLJsonEncoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLJsonEncoder.m; sourceTree = "<group>"; };
-               EE7CB1AD1141523E00B9CB6A /* SDLNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLNames.h; sourceTree = "<group>"; };
-               EE7CB1AF1141523E00B9CB6A /* SDLProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLProxy.h; sourceTree = "<group>"; };
-               EE7CB1B01141523E00B9CB6A /* SDLProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLProxy.m; sourceTree = "<group>"; };
-               EE7CB1B11141523E00B9CB6A /* SDLTCPTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTCPTransport.h; sourceTree = "<group>"; };
-               EE7CB1B21141523E00B9CB6A /* SDLTCPTransport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTCPTransport.m; sourceTree = "<group>"; };
-               EE7CB1B31141523E00B9CB6A /* SDLAbstractTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLAbstractTransport.h; sourceTree = "<group>"; };
-               EE7CB1B41141523E00B9CB6A /* SDLAbstractTransport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAbstractTransport.m; sourceTree = "<group>"; };
-               EE7CB1DB1141563F00B9CB6A /* SDLProtocolMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLProtocolMessage.h; sourceTree = "<group>"; };
-               EE7CB1DC1141563F00B9CB6A /* SDLProtocolMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLProtocolMessage.m; sourceTree = "<group>"; };
-               EE7CB1E81141573200B9CB6A /* SDLProtocolListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLProtocolListener.h; sourceTree = "<group>"; };
-               EE7CB1EC1141575A00B9CB6A /* SDLAbstractProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLAbstractProtocol.h; sourceTree = "<group>"; };
-               EE7CB1ED1141575A00B9CB6A /* SDLAbstractProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAbstractProtocol.m; sourceTree = "<group>"; };
-               EE7CB1F01141576500B9CB6A /* SDLProtocolFrameHeaderFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLProtocolFrameHeaderFactory.h; sourceTree = "<group>"; };
-               EE7CB1F11141576500B9CB6A /* SDLProtocolFrameHeaderFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLProtocolFrameHeaderFactory.m; sourceTree = "<group>"; };
-               EE7CB21B11415A9C00B9CB6A /* JSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSON.h; sourceTree = "<group>"; };
-               EE7CB21C11415A9C00B9CB6A /* NSObject+SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+SBJSON.h"; sourceTree = "<group>"; };
-               EE7CB21D11415A9C00B9CB6A /* NSObject+SBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+SBJSON.m"; sourceTree = "<group>"; };
-               EE7CB21E11415A9C00B9CB6A /* NSString+SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+SBJSON.h"; sourceTree = "<group>"; };
-               EE7CB21F11415A9C00B9CB6A /* NSString+SBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+SBJSON.m"; sourceTree = "<group>"; };
-               EE7CB22011415A9C00B9CB6A /* SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJSON.h; sourceTree = "<group>"; };
-               EE7CB22111415A9C00B9CB6A /* SBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJSON.m; sourceTree = "<group>"; };
-               EE7CB22211415A9C00B9CB6A /* SBJsonBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonBase.h; sourceTree = "<group>"; };
-               EE7CB22311415A9C00B9CB6A /* SBJsonBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonBase.m; sourceTree = "<group>"; };
-               EE7CB22411415A9C00B9CB6A /* SBJsonParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonParser.h; sourceTree = "<group>"; };
-               EE7CB22511415A9C00B9CB6A /* SBJsonParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonParser.m; sourceTree = "<group>"; };
-               EE7CB22611415A9C00B9CB6A /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonWriter.h; sourceTree = "<group>"; };
-               EE7CB22711415A9C00B9CB6A /* SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonWriter.m; sourceTree = "<group>"; };
-               EEB0806411454A63009C45EB /* SDLBitConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLBitConverter.h; sourceTree = "<group>"; };
-               EEB0806511454A63009C45EB /* SDLBitConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLBitConverter.m; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-               D2AAC07C0554694100DB518D /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */,
-                               814FAA4411E38ED400AD7FF3 /* ExternalAccessory.framework in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-               034768DFFF38A50411DB9C8B /* Products */ = {
-                       isa = PBXGroup;
-                       children = (
-                               D2AAC07E0554694100DB518D /* libSmartDeviceLinkProxy.a */,
-                       );
-                       name = Products;
-                       sourceTree = "<group>";
-               };
-               0867D691FE84028FC02AAC07 /* SyncProxy */ = {
-                       isa = PBXGroup;
-                       children = (
-                               EE7CB18D114151D500B9CB6A /* Classes */,
-                               32C88DFF0371C24200C91783 /* Other Sources */,
-                               0867D69AFE84028FC02AAC07 /* Frameworks */,
-                               034768DFFF38A50411DB9C8B /* Products */,
-                       );
-                       name = SyncProxy;
-                       sourceTree = "<group>";
-               };
-               0867D69AFE84028FC02AAC07 /* Frameworks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               AACBBE490F95108600F1A2B1 /* Foundation.framework */,
-                               814FAA4311E38ED400AD7FF3 /* ExternalAccessory.framework */,
-                       );
-                       name = Frameworks;
-                       sourceTree = "<group>";
-               };
-               32C88DFF0371C24200C91783 /* Other Sources */ = {
-                       isa = PBXGroup;
-                       children = (
-                               EE7CB20111415A8B00B9CB6A /* json */,
-                               AA747D9E0F9514B9006C5449 /* SmartDeviceLinkProxy_Prefix.pch */,
-                       );
-                       name = "Other Sources";
-                       sourceTree = "<group>";
-               };
-               815F86D511DCEEDA006E4379 /* RPC */ = {
-                       isa = PBXGroup;
-                       children = (
-                               819EEA1C125A1CF40027947D /* SDLAddCommand.h */,
-                               819EEA1D125A1CF40027947D /* SDLAddCommand.m */,
-                               819EEA1E125A1CF40027947D /* SDLAddCommandResponse.h */,
-                               819EEA1F125A1CF40027947D /* SDLAddCommandResponse.m */,
-                               819EEA20125A1CF40027947D /* SDLAddSubMenu.h */,
-                               819EEA21125A1CF40027947D /* SDLAddSubMenu.m */,
-                               819EEA22125A1CF40027947D /* SDLAddSubMenuResponse.h */,
-                               819EEA23125A1CF40027947D /* SDLAddSubMenuResponse.m */,
-                               819EEA24125A1CF40027947D /* SDLAlert.h */,
-                               819EEA25125A1CF40027947D /* SDLAlert.m */,
-                               819EEA26125A1CF40027947D /* SDLAlertResponse.h */,
-                               819EEA27125A1CF40027947D /* SDLAlertResponse.m */,
-                               819EEA28125A1CF40027947D /* SDLAppInterfaceUnregisteredReason.h */,
-                               819EEA29125A1CF40027947D /* SDLAppInterfaceUnregisteredReason.m */,
-                               819EEA2A125A1CF40027947D /* SDLAudioStreamingState.h */,
-                               819EEA2B125A1CF40027947D /* SDLAudioStreamingState.m */,
-                               819EEA2C125A1CF40027947D /* SDLButtonCapabilities.h */,
-                               819EEA2D125A1CF40027947D /* SDLButtonCapabilities.m */,
-                               819EEA2E125A1CF40027947D /* SDLButtonEventMode.h */,
-                               819EEA2F125A1CF40027947D /* SDLButtonEventMode.m */,
-                               819EEA30125A1CF40027947D /* SDLButtonName.h */,
-                               819EEA31125A1CF40027947D /* SDLButtonName.m */,
-                               819EEA32125A1CF40027947D /* SDLButtonPressMode.h */,
-                               819EEA33125A1CF40027947D /* SDLButtonPressMode.m */,
-                               819EEA34125A1CF40027947D /* SDLCharacterSet.h */,
-                               819EEA35125A1CF40027947D /* SDLCharacterSet.m */,
-                               819EEA36125A1CF40027947D /* SDLChoice.h */,
-                               819EEA37125A1CF40027947D /* SDLChoice.m */,
-                               819EEA38125A1CF40027947D /* SDLCreateInteractionChoiceSet.h */,
-                               819EEA39125A1CF40027947D /* SDLCreateInteractionChoiceSet.m */,
-                               819EEA3A125A1CF40027947D /* SDLCreateInteractionChoiceSetResponse.h */,
-                               819EEA3B125A1CF40027947D /* SDLCreateInteractionChoiceSetResponse.m */,
-                               819EEA3C125A1CF40027947D /* SDLDeleteCommand.h */,
-                               819EEA3D125A1CF40027947D /* SDLDeleteCommand.m */,
-                               819EEA3E125A1CF40027947D /* SDLDeleteCommandResponse.h */,
-                               819EEA3F125A1CF40027947D /* SDLDeleteCommandResponse.m */,
-                               819EEA40125A1CF40027947D /* SDLDeleteInteractionChoiceSet.h */,
-                               819EEA41125A1CF40027947D /* SDLDeleteInteractionChoiceSet.m */,
-                               819EEA42125A1CF40027947D /* SDLDeleteInteractionChoiceSetResponse.h */,
-                               819EEA43125A1CF40027947D /* SDLDeleteInteractionChoiceSetResponse.m */,
-                               819EEA44125A1CF40027947D /* SDLDeleteSubMenu.h */,
-                               819EEA45125A1CF40027947D /* SDLDeleteSubMenu.m */,
-                               819EEA46125A1CF40027947D /* SDLDeleteSubMenuResponse.h */,
-                               819EEA47125A1CF40027947D /* SDLDeleteSubMenuResponse.m */,
-                               819EEA48125A1CF40027947D /* SDLDisplayCapabilities.h */,
-                               819EEA49125A1CF40027947D /* SDLDisplayCapabilities.m */,
-                               819EEA4A125A1CF40027947D /* SDLDisplayType.h */,
-                               819EEA4B125A1CF40027947D /* SDLDisplayType.m */,
-                               819EEA4C125A1CF40027947D /* SDLGenericResponse.h */,
-                               819EEA4D125A1CF40027947D /* SDLGenericResponse.m */,
-                               819EEA4E125A1CF40027947D /* SDLGlobalProperty.h */,
-                               819EEA4F125A1CF40027947D /* SDLGlobalProperty.m */,
-                               819EEA50125A1CF40027947D /* SDLHMILevel.h */,
-                               819EEA51125A1CF40027947D /* SDLHMILevel.m */,
-                               819EEA52125A1CF40027947D /* SDLHMIZoneCapabilities.h */,
-                               819EEA53125A1CF40027947D /* SDLHMIZoneCapabilities.m */,
-                               819EEA54125A1CF40027947D /* SDLInteractionMode.h */,
-                               819EEA55125A1CF40027947D /* SDLInteractionMode.m */,
-                               819EEA56125A1CF40027947D /* SDLLanguage.h */,
-                               819EEA57125A1CF40027947D /* SDLLanguage.m */,
-                               819EEA58125A1CF40027947D /* SDLMediaClockFormat.h */,
-                               819EEA59125A1CF40027947D /* SDLMediaClockFormat.m */,
-                               819EEA5A125A1CF40027947D /* SDLMenuParams.h */,
-                               819EEA5B125A1CF40027947D /* SDLMenuParams.m */,
-                               819EEA5C125A1CF40027947D /* SDLOnAppInterfaceUnregistered.h */,
-                               819EEA5D125A1CF40027947D /* SDLOnAppInterfaceUnregistered.m */,
-                               819EEA5E125A1CF40027947D /* SDLOnButtonEvent.h */,
-                               819EEA5F125A1CF40027947D /* SDLOnButtonEvent.m */,
-                               819EEA60125A1CF40027947D /* SDLOnButtonPress.h */,
-                               819EEA61125A1CF40027947D /* SDLOnButtonPress.m */,
-                               819EEA62125A1CF40027947D /* SDLOnCommand.h */,
-                               819EEA63125A1CF40027947D /* SDLOnCommand.m */,
-                               819EEA64125A1CF40027947D /* SDLOnHMIStatus.h */,
-                               819EEA65125A1CF40027947D /* SDLOnHMIStatus.m */,
-                               819EEA66125A1CF40027947D /* SDLPerformInteraction.h */,
-                               819EEA67125A1CF40027947D /* SDLPerformInteraction.m */,
-                               819EEA68125A1CF40027947D /* SDLPerformInteractionResponse.h */,
-                               819EEA69125A1CF40027947D /* SDLPerformInteractionResponse.m */,
-                               819EEA6A125A1CF40027947D /* SDLRegisterAppInterface.h */,
-                               819EEA6B125A1CF40027947D /* SDLRegisterAppInterface.m */,
-                               819EEA6C125A1CF40027947D /* SDLRegisterAppInterfaceResponse.h */,
-                               819EEA6D125A1CF40027947D /* SDLRegisterAppInterfaceResponse.m */,
-                               819EEA6E125A1CF40027947D /* SDLResetGlobalProperties.h */,
-                               819EEA6F125A1CF40027947D /* SDLResetGlobalProperties.m */,
-                               819EEA70125A1CF40027947D /* SDLResetGlobalPropertiesResponse.h */,
-                               819EEA71125A1CF40027947D /* SDLResetGlobalPropertiesResponse.m */,
-                               819EEA72125A1CF40027947D /* SDLResult.h */,
-                               819EEA73125A1CF40027947D /* SDLResult.m */,
-                               819EEA74125A1CF40027947D /* SDLSetGlobalProperties.h */,
-                               819EEA75125A1CF40027947D /* SDLSetGlobalProperties.m */,
-                               819EEA76125A1CF40027947D /* SDLSetGlobalPropertiesResponse.h */,
-                               819EEA77125A1CF40027947D /* SDLSetGlobalPropertiesResponse.m */,
-                               819EEA78125A1CF40027947D /* SDLSetMediaClockTimer.h */,
-                               819EEA79125A1CF40027947D /* SDLSetMediaClockTimer.m */,
-                               819EEA7A125A1CF40027947D /* SDLSetMediaClockTimerResponse.h */,
-                               819EEA7B125A1CF40027947D /* SDLSetMediaClockTimerResponse.m */,
-                               819EEA7C125A1CF40027947D /* SDLShow.h */,
-                               819EEA7D125A1CF40027947D /* SDLShow.m */,
-                               819EEA7E125A1CF40027947D /* SDLShowResponse.h */,
-                               819EEA7F125A1CF40027947D /* SDLShowResponse.m */,
-                               819EEA80125A1CF40027947D /* SDLSpeak.h */,
-                               819EEA81125A1CF40027947D /* SDLSpeak.m */,
-                               819EEA82125A1CF40027947D /* SDLSpeakResponse.h */,
-                               819EEA83125A1CF40027947D /* SDLSpeakResponse.m */,
-                               819EEA84125A1CF40027947D /* SDLSpeechCapabilities.h */,
-                               819EEA85125A1CF40027947D /* SDLSpeechCapabilities.m */,
-                               819EEA86125A1CF40027947D /* SDLStartTime.h */,
-                               819EEA87125A1CF40027947D /* SDLStartTime.m */,
-                               819EEA88125A1CF40027947D /* SDLSubscribeButton.h */,
-                               819EEA89125A1CF40027947D /* SDLSubscribeButton.m */,
-                               819EEA8A125A1CF40027947D /* SDLSubscribeButtonResponse.h */,
-                               819EEA8B125A1CF40027947D /* SDLSubscribeButtonResponse.m */,
-                               819EEA8C125A1CF40027947D /* SDLMsgVersion.h */,
-                               819EEA8D125A1CF40027947D /* SDLMsgVersion.m */,
-                               819EEA8E125A1CF40027947D /* SDLSystemContext.h */,
-                               819EEA8F125A1CF40027947D /* SDLSystemContext.m */,
-                               819EEA90125A1CF40027947D /* SDLTextAlignment.h */,
-                               819EEA91125A1CF40027947D /* SDLTextAlignment.m */,
-                               819EEA92125A1CF40027947D /* SDLTextField.h */,
-                               819EEA93125A1CF40027947D /* SDLTextField.m */,
-                               819EEA94125A1CF40027947D /* SDLTextFieldName.h */,
-                               819EEA95125A1CF40027947D /* SDLTextFieldName.m */,
-                               819EEA96125A1CF40027947D /* SDLTriggerSource.h */,
-                               819EEA97125A1CF40027947D /* SDLTriggerSource.m */,
-                               819EEA98125A1CF40027947D /* SDLTTSChunk.h */,
-                               819EEA99125A1CF40027947D /* SDLTTSChunk.m */,
-                               819EEA9A125A1CF40027947D /* SDLUnregisterAppInterface.h */,
-                               819EEA9B125A1CF40027947D /* SDLUnregisterAppInterface.m */,
-                               819EEA9C125A1CF40027947D /* SDLUnregisterAppInterfaceResponse.h */,
-                               819EEA9D125A1CF40027947D /* SDLUnregisterAppInterfaceResponse.m */,
-                               819EEA9E125A1CF40027947D /* SDLUnsubscribeButton.h */,
-                               819EEA9F125A1CF40027947D /* SDLUnsubscribeButton.m */,
-                               819EEAA0125A1CF40027947D /* SDLUnsubscribeButtonResponse.h */,
-                               819EEAA1125A1CF40027947D /* SDLUnsubscribeButtonResponse.m */,
-                               819EEAA2125A1CF40027947D /* SDLUpdateMode.h */,
-                               819EEAA3125A1CF40027947D /* SDLUpdateMode.m */,
-                               819EEAA4125A1CF40027947D /* SDLVRCapabilities.h */,
-                               819EEAA5125A1CF40027947D /* SDLVRCapabilities.m */,
-                               185095D4148EBDA6008E1780 /* SDLDriverDistractionState.h */,
-                               185095D5148EBDA6008E1780 /* SDLDriverDistractionState.m */,
-                               185095D6148EBDA6008E1780 /* SDLEncodedSyncPData.h */,
-                               185095D7148EBDA6008E1780 /* SDLEncodedSyncPData.m */,
-                               185095D8148EBDA6008E1780 /* SDLEncodedSyncPDataResponse.h */,
-                               185095D9148EBDA6008E1780 /* SDLEncodedSyncPDataResponse.m */,
-                               185095DA148EBDA6008E1780 /* SDLOnDriverDistraction.h */,
-                               185095DB148EBDA6008E1780 /* SDLOnDriverDistraction.m */,
-                               185095DC148EBDA6008E1780 /* SDLOnEncodedSyncPData.h */,
-                               185095DD148EBDA6008E1780 /* SDLOnEncodedSyncPData.m */,
-                               185095DE148EBDA6008E1780 /* SDLOnTBTClientState.h */,
-                               185095DF148EBDA6008E1780 /* SDLOnTBTClientState.m */,
-                               185095E0148EBDA6008E1780 /* SDLTBTState.h */,
-                               185095E1148EBDA6008E1780 /* SDLTBTState.m */,
-                       );
-                       path = RPC;
-                       sourceTree = "<group>";
-               };
-               EE7CB18D114151D500B9CB6A /* Classes */ = {
-                       isa = PBXGroup;
-                       children = (
-                               EE7CB1E11141569E00B9CB6A /* proxy */,
-                               EE7CB1DF1141565A00B9CB6A /* protocol */,
-                               EE7CB1E2114156BF00B9CB6A /* transport */,
-                               EE7CB1E3114156ED00B9CB6A /* encoder */,
-                               EE7CB1E01141569300B9CB6A /* utils */,
-                       );
-                       path = Classes;
-                       sourceTree = "<group>";
-               };
-               EE7CB1DF1141565A00B9CB6A /* protocol */ = {
-                       isa = PBXGroup;
-                       children = (
-                               815F874A11DCEEDA006E4379 /* SDLProtocol.h */,
-                               815F874B11DCEEDA006E4379 /* SDLProtocol.m */,
-                               EE7CB1A31141523E00B9CB6A /* SDLIProtocol.h */,
-                               EE7CB1E81141573200B9CB6A /* SDLProtocolListener.h */,
-                               814FABAF11E4D4E400AD7FF3 /* SDLProtocolFrameHeader.h */,
-                               814FABB011E4D4E400AD7FF3 /* SDLProtocolFrameHeader.m */,
-                               EE7CB1DB1141563F00B9CB6A /* SDLProtocolMessage.h */,
-                               EE7CB1DC1141563F00B9CB6A /* SDLProtocolMessage.m */,
-                               EE7CB1EC1141575A00B9CB6A /* SDLAbstractProtocol.h */,
-                               EE7CB1ED1141575A00B9CB6A /* SDLAbstractProtocol.m */,
-                               EE7CB1F01141576500B9CB6A /* SDLProtocolFrameHeaderFactory.h */,
-                               EE7CB1F11141576500B9CB6A /* SDLProtocolFrameHeaderFactory.m */,
-                       );
-                       name = protocol;
-                       sourceTree = "<group>";
-               };
-               EE7CB1E01141569300B9CB6A /* utils */ = {
-                       isa = PBXGroup;
-                       children = (
-                               27214DCE150693A9008C1798 /* SDLVersion.h */,
-                               1825E724146D88D100B4CFAE /* SDLSiphonServer.h */,
-                               1825E725146D88D100B4CFAE /* SDLSiphonServer.m */,
-                               81FA2B37127AEF1500B2B9A8 /* SDLConsoleController.xib */,
-                               81FA2B38127AEF1500B2B9A8 /* SDLConsoleController.h */,
-                               81FA2B39127AEF1500B2B9A8 /* SDLConsoleController.m */,
-                               EEB0806411454A63009C45EB /* SDLBitConverter.h */,
-                               EEB0806511454A63009C45EB /* SDLBitConverter.m */,
-                               81D0C2D812010C1300E877A6 /* SDLDebugTool.h */,
-                               81D0C2D912010C1300E877A6 /* SDLDebugTool.m */,
-                       );
-                       name = utils;
-                       sourceTree = "<group>";
-               };
-               EE7CB1E11141569E00B9CB6A /* proxy */ = {
-                       isa = PBXGroup;
-                       children = (
-                               815F86D511DCEEDA006E4379 /* RPC */,
-                               815F86CF11DCEEDA006E4379 /* SDLEnum.h */,
-                               815F86D011DCEEDA006E4379 /* SDLEnum.m */,
-                               815F86D111DCEEDA006E4379 /* SDLRPCMessage.h */,
-                               815F86D211DCEEDA006E4379 /* SDLRPCMessage.m */,
-                               8134B0A51210866D0070668B /* SDLRPCRequest.h */,
-                               8134B0A61210866D0070668B /* SDLRPCRequest.m */,
-                               8134B0A91210868B0070668B /* SDLRPCResponse.h */,
-                               8134B0AA1210868B0070668B /* SDLRPCResponse.m */,
-                               8134B0AD1210869C0070668B /* SDLRPCNotification.h */,
-                               8134B0AE1210869C0070668B /* SDLRPCNotification.m */,
-                               8150481111F62DF300208A24 /* SDLRPCRequestFactory.h */,
-                               8150481211F62DF300208A24 /* SDLRPCRequestFactory.m */,
-                               EE7CB1AD1141523E00B9CB6A /* SDLNames.h */,
-                               81758B0A1237FCBE00EF4CAC /* SDLProxyListener.h */,
-                               7297D07012F1B5DF00EE4FBC /* SDLIProxy.h */,
-                               EE7CB1AF1141523E00B9CB6A /* SDLProxy.h */,
-                               EE7CB1B01141523E00B9CB6A /* SDLProxy.m */,
-                               8150487A11F6352500208A24 /* SDLProxyFactory.h */,
-                               8150487B11F6352500208A24 /* SDLProxyFactory.m */,
-                               819E532511F7534200946AC2 /* SDLTTSChunkFactory.h */,
-                               819E532611F7534200946AC2 /* SDLTTSChunkFactory.m */,
-                               814DF65212AD5AEA00006788 /* SDLJingle.h */,
-                               814DF65312AD5AEA00006788 /* SDLJingle.m */,
-                       );
-                       name = proxy;
-                       sourceTree = "<group>";
-               };
-               EE7CB1E2114156BF00B9CB6A /* transport */ = {
-                       isa = PBXGroup;
-                       children = (
-                               EE7CB1A51141523E00B9CB6A /* SDLITransport.h */,
-                               EE7CB1A61141523E00B9CB6A /* SDLTransportListener.h */,
-                               EE7CB1B11141523E00B9CB6A /* SDLTCPTransport.h */,
-                               EE7CB1B21141523E00B9CB6A /* SDLTCPTransport.m */,
-                               EE7CB1B31141523E00B9CB6A /* SDLAbstractTransport.h */,
-                               EE7CB1B41141523E00B9CB6A /* SDLAbstractTransport.m */,
-                               814FAA1C11E3815100AD7FF3 /* SDLIAPTransport.h */,
-                               814FAA1D11E3815100AD7FF3 /* SDLIAPTransport.m */,
-                       );
-                       name = transport;
-                       sourceTree = "<group>";
-               };
-               EE7CB1E3114156ED00B9CB6A /* encoder */ = {
-                       isa = PBXGroup;
-                       children = (
-                               EE7CB1A11141523E00B9CB6A /* SDLIDecoder.h */,
-                               EE7CB1A21141523E00B9CB6A /* SDLIEncoder.h */,
-                               EE7CB1A71141523E00B9CB6A /* SDLJsonDecoder.h */,
-                               EE7CB1A81141523E00B9CB6A /* SDLJsonDecoder.m */,
-                               EE7CB1A91141523E00B9CB6A /* SDLJsonEncoder.h */,
-                               EE7CB1AA1141523E00B9CB6A /* SDLJsonEncoder.m */,
-                       );
-                       name = encoder;
-                       sourceTree = "<group>";
-               };
-               EE7CB20111415A8B00B9CB6A /* json */ = {
-                       isa = PBXGroup;
-                       children = (
-                               EE7CB21B11415A9C00B9CB6A /* JSON.h */,
-                               EE7CB21C11415A9C00B9CB6A /* NSObject+SBJSON.h */,
-                               EE7CB21D11415A9C00B9CB6A /* NSObject+SBJSON.m */,
-                               EE7CB21E11415A9C00B9CB6A /* NSString+SBJSON.h */,
-                               EE7CB21F11415A9C00B9CB6A /* NSString+SBJSON.m */,
-                               EE7CB22011415A9C00B9CB6A /* SBJSON.h */,
-                               EE7CB22111415A9C00B9CB6A /* SBJSON.m */,
-                               EE7CB22211415A9C00B9CB6A /* SBJsonBase.h */,
-                               EE7CB22311415A9C00B9CB6A /* SBJsonBase.m */,
-                               EE7CB22411415A9C00B9CB6A /* SBJsonParser.h */,
-                               EE7CB22511415A9C00B9CB6A /* SBJsonParser.m */,
-                               EE7CB22611415A9C00B9CB6A /* SBJsonWriter.h */,
-                               EE7CB22711415A9C00B9CB6A /* SBJsonWriter.m */,
-                       );
-                       name = json;
-                       path = Classes;
-                       sourceTree = "<group>";
-               };
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-               D2AAC07A0554694100DB518D /* Headers */ = {
-                       isa = PBXHeadersBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EE7CB1C11141523E00B9CB6A /* SDLIDecoder.h in Headers */,
-                               EE7CB1C21141523E00B9CB6A /* SDLIEncoder.h in Headers */,
-                               EE7CB1C31141523E00B9CB6A /* SDLIProtocol.h in Headers */,
-                               EE7CB1C51141523E00B9CB6A /* SDLITransport.h in Headers */,
-                               EE7CB1C61141523E00B9CB6A /* SDLTransportListener.h in Headers */,
-                               EE7CB1C71141523E00B9CB6A /* SDLJsonDecoder.h in Headers */,
-                               EE7CB1C91141523E00B9CB6A /* SDLJsonEncoder.h in Headers */,
-                               EE7CB1CD1141523E00B9CB6A /* SDLNames.h in Headers */,
-                               EE7CB1CF1141523E00B9CB6A /* SDLProxy.h in Headers */,
-                               EE7CB1D11141523E00B9CB6A /* SDLTCPTransport.h in Headers */,
-                               EE7CB1D31141523E00B9CB6A /* SDLAbstractTransport.h in Headers */,
-                               EE7CB1DD1141563F00B9CB6A /* SDLProtocolMessage.h in Headers */,
-                               EE7CB1EA1141573200B9CB6A /* SDLProtocolListener.h in Headers */,
-                               EE7CB1EE1141575A00B9CB6A /* SDLAbstractProtocol.h in Headers */,
-                               EE7CB1F21141576500B9CB6A /* SDLProtocolFrameHeaderFactory.h in Headers */,
-                               EE7CB22811415A9C00B9CB6A /* JSON.h in Headers */,
-                               EE7CB22911415A9C00B9CB6A /* NSObject+SBJSON.h in Headers */,
-                               EE7CB22B11415A9C00B9CB6A /* NSString+SBJSON.h in Headers */,
-                               EE7CB22D11415A9C00B9CB6A /* SBJSON.h in Headers */,
-                               EE7CB22F11415A9C00B9CB6A /* SBJsonBase.h in Headers */,
-                               EE7CB23111415A9C00B9CB6A /* SBJsonParser.h in Headers */,
-                               EE7CB23311415A9C00B9CB6A /* SBJsonWriter.h in Headers */,
-                               EEB0806611454A63009C45EB /* SDLBitConverter.h in Headers */,
-                               815F874C11DCEEDA006E4379 /* SDLEnum.h in Headers */,
-                               815F874E11DCEEDA006E4379 /* SDLRPCMessage.h in Headers */,
-                               815F87C611DCEEDA006E4379 /* SDLProtocol.h in Headers */,
-                               814FAA1E11E3815100AD7FF3 /* SDLIAPTransport.h in Headers */,
-                               814FABB111E4D4E400AD7FF3 /* SDLProtocolFrameHeader.h in Headers */,
-                               8150481311F62DF300208A24 /* SDLRPCRequestFactory.h in Headers */,
-                               8150487C11F6352500208A24 /* SDLProxyFactory.h in Headers */,
-                               819E532711F7534200946AC2 /* SDLTTSChunkFactory.h in Headers */,
-                               81D0C2DA12010C1300E877A6 /* SDLDebugTool.h in Headers */,
-                               8134B0A71210866D0070668B /* SDLRPCRequest.h in Headers */,
-                               8134B0AB1210868B0070668B /* SDLRPCResponse.h in Headers */,
-                               8134B0AF1210869C0070668B /* SDLRPCNotification.h in Headers */,
-                               81758B0B1237FCBE00EF4CAC /* SDLProxyListener.h in Headers */,
-                               819EEAA6125A1CF40027947D /* SDLAddCommand.h in Headers */,
-                               819EEAA8125A1CF40027947D /* SDLAddCommandResponse.h in Headers */,
-                               819EEAAA125A1CF40027947D /* SDLAddSubMenu.h in Headers */,
-                               819EEAAC125A1CF40027947D /* SDLAddSubMenuResponse.h in Headers */,
-                               819EEAAE125A1CF40027947D /* SDLAlert.h in Headers */,
-                               819EEAB0125A1CF40027947D /* SDLAlertResponse.h in Headers */,
-                               819EEAB2125A1CF40027947D /* SDLAppInterfaceUnregisteredReason.h in Headers */,
-                               819EEAB4125A1CF40027947D /* SDLAudioStreamingState.h in Headers */,
-                               819EEAB6125A1CF40027947D /* SDLButtonCapabilities.h in Headers */,
-                               819EEAB8125A1CF40027947D /* SDLButtonEventMode.h in Headers */,
-                               819EEABA125A1CF40027947D /* SDLButtonName.h in Headers */,
-                               819EEABC125A1CF40027947D /* SDLButtonPressMode.h in Headers */,
-                               819EEABE125A1CF40027947D /* SDLCharacterSet.h in Headers */,
-                               819EEAC0125A1CF40027947D /* SDLChoice.h in Headers */,
-                               819EEAC2125A1CF40027947D /* SDLCreateInteractionChoiceSet.h in Headers */,
-                               819EEAC4125A1CF40027947D /* SDLCreateInteractionChoiceSetResponse.h in Headers */,
-                               819EEAC6125A1CF40027947D /* SDLDeleteCommand.h in Headers */,
-                               819EEAC8125A1CF40027947D /* SDLDeleteCommandResponse.h in Headers */,
-                               819EEACA125A1CF40027947D /* SDLDeleteInteractionChoiceSet.h in Headers */,
-                               819EEACC125A1CF40027947D /* SDLDeleteInteractionChoiceSetResponse.h in Headers */,
-                               819EEACE125A1CF40027947D /* SDLDeleteSubMenu.h in Headers */,
-                               819EEAD0125A1CF40027947D /* SDLDeleteSubMenuResponse.h in Headers */,
-                               819EEAD2125A1CF40027947D /* SDLDisplayCapabilities.h in Headers */,
-                               819EEAD4125A1CF40027947D /* SDLDisplayType.h in Headers */,
-                               819EEAD6125A1CF40027947D /* SDLGenericResponse.h in Headers */,
-                               819EEAD8125A1CF40027947D /* SDLGlobalProperty.h in Headers */,
-                               819EEADA125A1CF40027947D /* SDLHMILevel.h in Headers */,
-                               819EEADC125A1CF40027947D /* SDLHMIZoneCapabilities.h in Headers */,
-                               819EEADE125A1CF40027947D /* SDLInteractionMode.h in Headers */,
-                               819EEAE0125A1CF40027947D /* SDLLanguage.h in Headers */,
-                               819EEAE2125A1CF40027947D /* SDLMediaClockFormat.h in Headers */,
-                               819EEAE4125A1CF40027947D /* SDLMenuParams.h in Headers */,
-                               819EEAE6125A1CF40027947D /* SDLOnAppInterfaceUnregistered.h in Headers */,
-                               819EEAE8125A1CF40027947D /* SDLOnButtonEvent.h in Headers */,
-                               819EEAEA125A1CF40027947D /* SDLOnButtonPress.h in Headers */,
-                               819EEAEC125A1CF40027947D /* SDLOnCommand.h in Headers */,
-                               819EEAEE125A1CF40027947D /* SDLOnHMIStatus.h in Headers */,
-                               819EEAF0125A1CF40027947D /* SDLPerformInteraction.h in Headers */,
-                               819EEAF2125A1CF40027947D /* SDLPerformInteractionResponse.h in Headers */,
-                               819EEAF4125A1CF40027947D /* SDLRegisterAppInterface.h in Headers */,
-                               819EEAF6125A1CF40027947D /* SDLRegisterAppInterfaceResponse.h in Headers */,
-                               819EEAF8125A1CF40027947D /* SDLResetGlobalProperties.h in Headers */,
-                               819EEAFA125A1CF40027947D /* SDLResetGlobalPropertiesResponse.h in Headers */,
-                               819EEAFC125A1CF40027947D /* SDLResult.h in Headers */,
-                               819EEAFE125A1CF40027947D /* SDLSetGlobalProperties.h in Headers */,
-                               819EEB00125A1CF40027947D /* SDLSetGlobalPropertiesResponse.h in Headers */,
-                               819EEB02125A1CF40027947D /* SDLSetMediaClockTimer.h in Headers */,
-                               819EEB04125A1CF40027947D /* SDLSetMediaClockTimerResponse.h in Headers */,
-                               819EEB06125A1CF40027947D /* SDLShow.h in Headers */,
-                               819EEB08125A1CF40027947D /* SDLShowResponse.h in Headers */,
-                               819EEB0A125A1CF40027947D /* SDLSpeak.h in Headers */,
-                               819EEB0C125A1CF40027947D /* SDLSpeakResponse.h in Headers */,
-                               819EEB0E125A1CF40027947D /* SDLSpeechCapabilities.h in Headers */,
-                               819EEB10125A1CF40027947D /* SDLStartTime.h in Headers */,
-                               819EEB12125A1CF40027947D /* SDLSubscribeButton.h in Headers */,
-                               819EEB14125A1CF40027947D /* SDLSubscribeButtonResponse.h in Headers */,
-                               819EEB16125A1CF40027947D /* SDLMsgVersion.h in Headers */,
-                               819EEB18125A1CF40027947D /* SDLSystemContext.h in Headers */,
-                               819EEB1A125A1CF40027947D /* SDLTextAlignment.h in Headers */,
-                               819EEB1C125A1CF40027947D /* SDLTextField.h in Headers */,
-                               819EEB1E125A1CF40027947D /* SDLTextFieldName.h in Headers */,
-                               819EEB20125A1CF40027947D /* SDLTriggerSource.h in Headers */,
-                               819EEB22125A1CF40027947D /* SDLTTSChunk.h in Headers */,
-                               819EEB24125A1CF40027947D /* SDLUnregisterAppInterface.h in Headers */,
-                               819EEB26125A1CF40027947D /* SDLUnregisterAppInterfaceResponse.h in Headers */,
-                               819EEB28125A1CF40027947D /* SDLUnsubscribeButton.h in Headers */,
-                               819EEB2A125A1CF40027947D /* SDLUnsubscribeButtonResponse.h in Headers */,
-                               819EEB2C125A1CF40027947D /* SDLUpdateMode.h in Headers */,
-                               819EEB2E125A1CF40027947D /* SDLVRCapabilities.h in Headers */,
-                               81FA2B3A127AEF1500B2B9A8 /* SDLConsoleController.h in Headers */,
-                               814DF65412AD5AEA00006788 /* SDLJingle.h in Headers */,
-                               7297D07212F1B5DF00EE4FBC /* SDLIProxy.h in Headers */,
-                               1825E726146D88D100B4CFAE /* SDLSiphonServer.h in Headers */,
-                               185095E2148EBDA6008E1780 /* SDLDriverDistractionState.h in Headers */,
-                               185095E4148EBDA6008E1780 /* SDLEncodedSyncPData.h in Headers */,
-                               185095E6148EBDA6008E1780 /* SDLEncodedSyncPDataResponse.h in Headers */,
-                               185095E8148EBDA6008E1780 /* SDLOnDriverDistraction.h in Headers */,
-                               185095EA148EBDA6008E1780 /* SDLOnEncodedSyncPData.h in Headers */,
-                               185095EC148EBDA6008E1780 /* SDLOnTBTClientState.h in Headers */,
-                               185095EE148EBDA6008E1780 /* SDLTBTState.h in Headers */,
-                               27214DCF150693A9008C1798 /* SDLVersion.h in Headers */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-               D2AAC07D0554694100DB518D /* SmartDeviceLinkProxy */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "SmartDeviceLinkProxy" */;
-                       buildPhases = (
-                               D2AAC07A0554694100DB518D /* Headers */,
-                               D2AAC07B0554694100DB518D /* Sources */,
-                               D2AAC07C0554694100DB518D /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = SmartDeviceLinkProxy;
-                       productName = SyncProxy;
-                       productReference = D2AAC07E0554694100DB518D /* libSmartDeviceLinkProxy.a */;
-                       productType = "com.apple.product-type.library.static";
-               };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-               0867D690FE84028FC02AAC07 /* Project object */ = {
-                       isa = PBXProject;
-                       attributes = {
-                               LastUpgradeCheck = 0460;
-                       };
-                       buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "SmartDeviceLinkProxy" */;
-                       compatibilityVersion = "Xcode 3.2";
-                       developmentRegion = English;
-                       hasScannedForEncodings = 1;
-                       knownRegions = (
-                               en,
-                       );
-                       mainGroup = 0867D691FE84028FC02AAC07 /* SyncProxy */;
-                       productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
-                       projectDirPath = "";
-                       projectRoot = "";
-                       targets = (
-                               D2AAC07D0554694100DB518D /* SmartDeviceLinkProxy */,
-                       );
-               };
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-               D2AAC07B0554694100DB518D /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EE7CB1C81141523E00B9CB6A /* SDLJsonDecoder.m in Sources */,
-                               EE7CB1CA1141523E00B9CB6A /* SDLJsonEncoder.m in Sources */,
-                               EE7CB1D01141523E00B9CB6A /* SDLProxy.m in Sources */,
-                               EE7CB1D21141523E00B9CB6A /* SDLTCPTransport.m in Sources */,
-                               EE7CB1D41141523E00B9CB6A /* SDLAbstractTransport.m in Sources */,
-                               EE7CB1DE1141563F00B9CB6A /* SDLProtocolMessage.m in Sources */,
-                               EE7CB1EF1141575A00B9CB6A /* SDLAbstractProtocol.m in Sources */,
-                               EE7CB1F31141576500B9CB6A /* SDLProtocolFrameHeaderFactory.m in Sources */,
-                               EE7CB22A11415A9C00B9CB6A /* NSObject+SBJSON.m in Sources */,
-                               EE7CB22C11415A9C00B9CB6A /* NSString+SBJSON.m in Sources */,
-                               EE7CB22E11415A9C00B9CB6A /* SBJSON.m in Sources */,
-                               EE7CB23011415A9C00B9CB6A /* SBJsonBase.m in Sources */,
-                               EE7CB23211415A9C00B9CB6A /* SBJsonParser.m in Sources */,
-                               EE7CB23411415A9C00B9CB6A /* SBJsonWriter.m in Sources */,
-                               EEB0806711454A63009C45EB /* SDLBitConverter.m in Sources */,
-                               815F874D11DCEEDA006E4379 /* SDLEnum.m in Sources */,
-                               815F874F11DCEEDA006E4379 /* SDLRPCMessage.m in Sources */,
-                               815F87C711DCEEDA006E4379 /* SDLProtocol.m in Sources */,
-                               814FAA1F11E3815100AD7FF3 /* SDLIAPTransport.m in Sources */,
-                               814FABB211E4D4E400AD7FF3 /* SDLProtocolFrameHeader.m in Sources */,
-                               8150481411F62DF300208A24 /* SDLRPCRequestFactory.m in Sources */,
-                               8150487D11F6352500208A24 /* SDLProxyFactory.m in Sources */,
-                               819E532811F7534200946AC2 /* SDLTTSChunkFactory.m in Sources */,
-                               81D0C2DB12010C1300E877A6 /* SDLDebugTool.m in Sources */,
-                               8134B0A81210866D0070668B /* SDLRPCRequest.m in Sources */,
-                               8134B0AC1210868B0070668B /* SDLRPCResponse.m in Sources */,
-                               8134B0B01210869C0070668B /* SDLRPCNotification.m in Sources */,
-                               819EEAA7125A1CF40027947D /* SDLAddCommand.m in Sources */,
-                               819EEAA9125A1CF40027947D /* SDLAddCommandResponse.m in Sources */,
-                               819EEAAB125A1CF40027947D /* SDLAddSubMenu.m in Sources */,
-                               819EEAAD125A1CF40027947D /* SDLAddSubMenuResponse.m in Sources */,
-                               819EEAAF125A1CF40027947D /* SDLAlert.m in Sources */,
-                               819EEAB1125A1CF40027947D /* SDLAlertResponse.m in Sources */,
-                               819EEAB3125A1CF40027947D /* SDLAppInterfaceUnregisteredReason.m in Sources */,
-                               819EEAB5125A1CF40027947D /* SDLAudioStreamingState.m in Sources */,
-                               819EEAB7125A1CF40027947D /* SDLButtonCapabilities.m in Sources */,
-                               819EEAB9125A1CF40027947D /* SDLButtonEventMode.m in Sources */,
-                               819EEABB125A1CF40027947D /* SDLButtonName.m in Sources */,
-                               819EEABD125A1CF40027947D /* SDLButtonPressMode.m in Sources */,
-                               819EEABF125A1CF40027947D /* SDLCharacterSet.m in Sources */,
-                               819EEAC1125A1CF40027947D /* SDLChoice.m in Sources */,
-                               819EEAC3125A1CF40027947D /* SDLCreateInteractionChoiceSet.m in Sources */,
-                               819EEAC5125A1CF40027947D /* SDLCreateInteractionChoiceSetResponse.m in Sources */,
-                               819EEAC7125A1CF40027947D /* SDLDeleteCommand.m in Sources */,
-                               819EEAC9125A1CF40027947D /* SDLDeleteCommandResponse.m in Sources */,
-                               819EEACB125A1CF40027947D /* SDLDeleteInteractionChoiceSet.m in Sources */,
-                               819EEACD125A1CF40027947D /* SDLDeleteInteractionChoiceSetResponse.m in Sources */,
-                               819EEACF125A1CF40027947D /* SDLDeleteSubMenu.m in Sources */,
-                               819EEAD1125A1CF40027947D /* SDLDeleteSubMenuResponse.m in Sources */,
-                               819EEAD3125A1CF40027947D /* SDLDisplayCapabilities.m in Sources */,
-                               819EEAD5125A1CF40027947D /* SDLDisplayType.m in Sources */,
-                               819EEAD7125A1CF40027947D /* SDLGenericResponse.m in Sources */,
-                               819EEAD9125A1CF40027947D /* SDLGlobalProperty.m in Sources */,
-                               819EEADB125A1CF40027947D /* SDLHMILevel.m in Sources */,
-                               819EEADD125A1CF40027947D /* SDLHMIZoneCapabilities.m in Sources */,
-                               819EEADF125A1CF40027947D /* SDLInteractionMode.m in Sources */,
-                               819EEAE1125A1CF40027947D /* SDLLanguage.m in Sources */,
-                               819EEAE3125A1CF40027947D /* SDLMediaClockFormat.m in Sources */,
-                               819EEAE5125A1CF40027947D /* SDLMenuParams.m in Sources */,
-                               819EEAE7125A1CF40027947D /* SDLOnAppInterfaceUnregistered.m in Sources */,
-                               819EEAE9125A1CF40027947D /* SDLOnButtonEvent.m in Sources */,
-                               819EEAEB125A1CF40027947D /* SDLOnButtonPress.m in Sources */,
-                               819EEAED125A1CF40027947D /* SDLOnCommand.m in Sources */,
-                               819EEAEF125A1CF40027947D /* SDLOnHMIStatus.m in Sources */,
-                               819EEAF1125A1CF40027947D /* SDLPerformInteraction.m in Sources */,
-                               819EEAF3125A1CF40027947D /* SDLPerformInteractionResponse.m in Sources */,
-                               819EEAF5125A1CF40027947D /* SDLRegisterAppInterface.m in Sources */,
-                               819EEAF7125A1CF40027947D /* SDLRegisterAppInterfaceResponse.m in Sources */,
-                               819EEAF9125A1CF40027947D /* SDLResetGlobalProperties.m in Sources */,
-                               819EEAFB125A1CF40027947D /* SDLResetGlobalPropertiesResponse.m in Sources */,
-                               819EEAFD125A1CF40027947D /* SDLResult.m in Sources */,
-                               819EEAFF125A1CF40027947D /* SDLSetGlobalProperties.m in Sources */,
-                               819EEB01125A1CF40027947D /* SDLSetGlobalPropertiesResponse.m in Sources */,
-                               819EEB03125A1CF40027947D /* SDLSetMediaClockTimer.m in Sources */,
-                               819EEB05125A1CF40027947D /* SDLSetMediaClockTimerResponse.m in Sources */,
-                               819EEB07125A1CF40027947D /* SDLShow.m in Sources */,
-                               819EEB09125A1CF40027947D /* SDLShowResponse.m in Sources */,
-                               819EEB0B125A1CF40027947D /* SDLSpeak.m in Sources */,
-                               819EEB0D125A1CF40027947D /* SDLSpeakResponse.m in Sources */,
-                               819EEB0F125A1CF40027947D /* SDLSpeechCapabilities.m in Sources */,
-                               819EEB11125A1CF40027947D /* SDLStartTime.m in Sources */,
-                               819EEB13125A1CF40027947D /* SDLSubscribeButton.m in Sources */,
-                               819EEB15125A1CF40027947D /* SDLSubscribeButtonResponse.m in Sources */,
-                               819EEB17125A1CF40027947D /* SDLMsgVersion.m in Sources */,
-                               819EEB19125A1CF40027947D /* SDLSystemContext.m in Sources */,
-                               819EEB1B125A1CF40027947D /* SDLTextAlignment.m in Sources */,
-                               819EEB1D125A1CF40027947D /* SDLTextField.m in Sources */,
-                               819EEB1F125A1CF40027947D /* SDLTextFieldName.m in Sources */,
-                               819EEB21125A1CF40027947D /* SDLTriggerSource.m in Sources */,
-                               819EEB23125A1CF40027947D /* SDLTTSChunk.m in Sources */,
-                               819EEB25125A1CF40027947D /* SDLUnregisterAppInterface.m in Sources */,
-                               819EEB27125A1CF40027947D /* SDLUnregisterAppInterfaceResponse.m in Sources */,
-                               819EEB29125A1CF40027947D /* SDLUnsubscribeButton.m in Sources */,
-                               819EEB2B125A1CF40027947D /* SDLUnsubscribeButtonResponse.m in Sources */,
-                               819EEB2D125A1CF40027947D /* SDLUpdateMode.m in Sources */,
-                               819EEB2F125A1CF40027947D /* SDLVRCapabilities.m in Sources */,
-                               81FA2B3B127AEF1500B2B9A8 /* SDLConsoleController.m in Sources */,
-                               814DF65512AD5AEA00006788 /* SDLJingle.m in Sources */,
-                               1825E727146D88D100B4CFAE /* SDLSiphonServer.m in Sources */,
-                               185095E3148EBDA6008E1780 /* SDLDriverDistractionState.m in Sources */,
-                               185095E5148EBDA6008E1780 /* SDLEncodedSyncPData.m in Sources */,
-                               185095E7148EBDA6008E1780 /* SDLEncodedSyncPDataResponse.m in Sources */,
-                               185095E9148EBDA6008E1780 /* SDLOnDriverDistraction.m in Sources */,
-                               185095EB148EBDA6008E1780 /* SDLOnEncodedSyncPData.m in Sources */,
-                               185095ED148EBDA6008E1780 /* SDLOnTBTClientState.m in Sources */,
-                               185095EF148EBDA6008E1780 /* SDLTBTState.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-               1DEB921F08733DC00010E9CD /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                               CODE_SIGN_IDENTITY = "iPhone Developer";
-                               COPY_PHASE_STRIP = NO;
-                               DSTROOT = /tmp/SmartDeviceLinkProxy.dst;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = SmartDeviceLinkProxy_Prefix.pch;
-                               GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-                               GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-                               GCC_WARN_STRICT_SELECTOR_MATCH = NO;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNKNOWN_PRAGMAS = YES;
-                               GCC_WARN_UNUSED_FUNCTION = YES;
-                               GCC_WARN_UNUSED_LABEL = YES;
-                               GCC_WARN_UNUSED_VALUE = YES;
-                               INSTALL_PATH = /usr/local/lib;
-                               IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-                               PRODUCT_NAME = SmartDeviceLinkProxy;
-                               PROVISIONING_PROFILE = "";
-                               RUN_CLANG_STATIC_ANALYZER = NO;
-                               SDKROOT = iphoneos;
-                               VALID_ARCHS = "armv7 armv7s i386";
-                       };
-                       name = Debug;
-               };
-               1DEB922008733DC00010E9CD /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                               CODE_SIGN_IDENTITY = "iPhone Developer";
-                               DSTROOT = /tmp/SmartDeviceLinkProxy.dst;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = SmartDeviceLinkProxy_Prefix.pch;
-                               GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-                               GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = NO;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-                               GCC_WARN_STRICT_SELECTOR_MATCH = NO;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               INSTALL_PATH = /usr/local/lib;
-                               IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-                               PRODUCT_NAME = SmartDeviceLinkProxy;
-                               PROVISIONING_PROFILE = "";
-                               RUN_CLANG_STATIC_ANALYZER = NO;
-                               SDKROOT = iphoneos;
-                               VALID_ARCHS = "armv7 armv7s i386";
-                       };
-                       name = Release;
-               };
-               1DEB922308733DC00010E9CD /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                               CODE_SIGN_IDENTITY = "iPhone Developer";
-                               GCC_C_LANGUAGE_STANDARD = c99;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_VERSION = "";
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-                               OTHER_LDFLAGS = "-ObjC";
-                               PRODUCT_NAME = SmartDeviceLinkProxy;
-                               PROVISIONING_PROFILE = "";
-                               SDKROOT = iphoneos;
-                               VALID_ARCHS = "armv7 armv7s";
-                       };
-                       name = Debug;
-               };
-               1DEB922408733DC00010E9CD /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-                               CODE_SIGN_IDENTITY = "iPhone Developer";
-                               GCC_C_LANGUAGE_STANDARD = c99;
-                               GCC_VERSION = "";
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-                               OTHER_LDFLAGS = "-ObjC";
-                               PRODUCT_NAME = SmartDeviceLinkProxy;
-                               PROVISIONING_PROFILE = "";
-                               SDKROOT = iphoneos;
-                               VALID_ARCHS = "armv7 armv7s";
-                       };
-                       name = Release;
-               };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-               1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "SmartDeviceLinkProxy" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               1DEB921F08733DC00010E9CD /* Debug */,
-                               1DEB922008733DC00010E9CD /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-               1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "SmartDeviceLinkProxy" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               1DEB922308733DC00010E9CD /* Debug */,
-                               1DEB922408733DC00010E9CD /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-/* End XCConfigurationList section */
-       };
-       rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
-}

diff --git a/SDL_iOS/SmartDeviceLinkProxy/SmartDeviceLinkProxy_Prefix.pch b/SDL_iOS/SmartDeviceLinkProxy/SmartDeviceLinkProxy_Prefix.pch
deleted file mode 100644 (file)
index bfb7394..0000000
--- a/SDL_iOS/SmartDeviceLinkProxy/SmartDeviceLinkProxy_Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'CocoaTouchStaticLibrary' target in the 'CocoaTouchStaticLibrary' project.
-//
-
-#ifdef __OBJC__
-    #import <Foundation/Foundation.h>
-#endif

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester.xcodeproj/project.pbxproj b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester.xcodeproj/project.pbxproj
index 7390c05..2733680 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester.xcodeproj/project.pbxproj
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester.xcodeproj/project.pbxproj
@@ -12,29 +12,17 @@
                077869AC15C01C0000FE9390 /* AddMenuOption.m in Sources */ = {isa = PBXBuildFile; fileRef = 077869AB15C01BFF00FE9390 /* AddMenuOption.m */; };
                0789F35515AF40CA00ADEF80 /* ConsoleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0789F35315AF40C900ADEF80 /* ConsoleViewController.m */; };
                0789F35615AF40CA00ADEF80 /* ConsoleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0789F35415AF40C900ADEF80 /* ConsoleViewController.xib */; };
-               0789F35A15AF65AF00ADEF80 /* UserTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0789F35815AF65AF00ADEF80 /* UserTestViewController.m */; };
-               0789F35B15AF65AF00ADEF80 /* UserTestViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0789F35915AF65AF00ADEF80 /* UserTestViewController.xib */; };
-               0789F35F15AF6B2300ADEF80 /* Blank-Blackboard-PSD.png in Resources */ = {isa = PBXBuildFile; fileRef = 0789F35E15AF6B2300ADEF80 /* Blank-Blackboard-PSD.png */; };
-               0789F37415B06BF300ADEF80 /* cog_02@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0789F37315B06BF300ADEF80 /* cog_02@2x.png */; };
                0789F37615B06BFD00ADEF80 /* cog_02.png in Resources */ = {isa = PBXBuildFile; fileRef = 0789F37515B06BFD00ADEF80 /* cog_02.png */; };
-               0789F37815B06C6500ADEF80 /* game_controller.png in Resources */ = {isa = PBXBuildFile; fileRef = 0789F37715B06C6500ADEF80 /* game_controller.png */; };
                079E7D68159A43E800181934 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 079E7D67159A43E800181934 /* UIKit.framework */; };
                079E7D6A159A43E800181934 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 079E7D69159A43E800181934 /* Foundation.framework */; };
                079E7D6C159A43E800181934 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 079E7D6B159A43E800181934 /* CoreGraphics.framework */; };
                079E7D72159A43E800181934 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 079E7D70159A43E800181934 /* InfoPlist.strings */; };
                079E7D74159A43E800181934 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 079E7D73159A43E800181934 /* main.m */; };
                079E7D78159A43E800181934 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 079E7D77159A43E800181934 /* AppDelegate.m */; };
-               079E7D95159A472300181934 /* SDLBrain.m in Sources */ = {isa = PBXBuildFile; fileRef = 079E7D94159A472300181934 /* SDLBrain.m */; };
+               079E7D95159A472300181934 /* SmartDeviceLinkTester.m in Sources */ = {isa = PBXBuildFile; fileRef = 079E7D94159A472300181934 /* SmartDeviceLinkTester.m */; };
                079E7D9D159A489F00181934 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 079E7D9C159A489F00181934 /* AVFoundation.framework */; };
-               07B19A4215B46ADE00E6D316 /* geogia_alert.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 07B19A3F15B46ADE00E6D316 /* geogia_alert.jpg */; };
-               07B19A4315B46ADE00E6D316 /* cali_speak.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 07B19A4015B46ADE00E6D316 /* cali_speak.jpg */; };
-               07B19A4615B46BA400E6D316 /* colorado_addcmd.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 07B19A4515B46BA400E6D316 /* colorado_addcmd.jpg */; };
-               07B19A4A15B46C4700E6D316 /* AutoTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B19A4815B46C4700E6D316 /* AutoTestViewController.m */; };
-               07B19A4B15B46C4700E6D316 /* AutoTestViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 07B19A4915B46C4700E6D316 /* AutoTestViewController.xib */; };
-               07B19A4D15B48DA100E6D316 /* delaware_show.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 07B19A4C15B48DA100E6D316 /* delaware_show.jpg */; };
                07B19A6715B5BF7500E6D316 /* brief_case.png in Resources */ = {isa = PBXBuildFile; fileRef = 07B19A6615B5BF7500E6D316 /* brief_case.png */; };
                07B19A6B15B9812F00E6D316 /* RPCTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B19A6915B9812E00E6D316 /* RPCTestViewController.m */; };
-               07B19A6C15B9812F00E6D316 /* RPCTestViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 07B19A6A15B9812F00E6D316 /* RPCTestViewController.xib */; };
                07B19A8115B99C3200E6D316 /* SpeakViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B19A7F15B99C3200E6D316 /* SpeakViewController.m */; };
                07B19A8215B99C3200E6D316 /* SpeakViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 07B19A8015B99C3200E6D316 /* SpeakViewController.xib */; };
                07B19A8615B99E4A00E6D316 /* ShowViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B19A8415B99E4A00E6D316 /* ShowViewController.m */; };
@@ -59,8 +47,6 @@
                07B19AB415B99F8500E6D316 /* DeleteInteractionChoiceSetViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 07B19AB215B99F8400E6D316 /* DeleteInteractionChoiceSetViewController.xib */; };
                07B19AB815B99F9500E6D316 /* PerformInteractionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B19AB615B99F9400E6D316 /* PerformInteractionViewController.m */; };
                07B19AB915B99F9500E6D316 /* PerformInteractionViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 07B19AB715B99F9400E6D316 /* PerformInteractionViewController.xib */; };
-               07B19AC215B99FBD00E6D316 /* EncodedSyncPDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B19AC015B99FBC00E6D316 /* EncodedSyncPDataViewController.m */; };
-               07B19AC315B99FBD00E6D316 /* EncodedSyncPDataViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 07B19AC115B99FBD00E6D316 /* EncodedSyncPDataViewController.xib */; };
                07B19AC715B99FDE00E6D316 /* UnsubscribeButtonViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B19AC515B99FDC00E6D316 /* UnsubscribeButtonViewController.m */; };
                07B19AC815B99FDE00E6D316 /* UnsubscribeButtonViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 07B19AC615B99FDD00E6D316 /* UnsubscribeButtonViewController.xib */; };
                07B19ACC15B99FEF00E6D316 /* SetGlobalPropertiesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B19ACA15B99FED00E6D316 /* SetGlobalPropertiesViewController.m */; };
@@ -74,23 +60,44 @@
                07C7E13215B9CF7A0035681D /* arrow_down.png in Resources */ = {isa = PBXBuildFile; fileRef = 07C7E13115B9CF7A0035681D /* arrow_down.png */; };
                07C7E13415B9CF840035681D /* play.png in Resources */ = {isa = PBXBuildFile; fileRef = 07C7E13315B9CF840035681D /* play.png */; };
                07C7E13615B9CF8C0035681D /* pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 07C7E13515B9CF8C0035681D /* pause.png */; };
-               07CBB64B15EBE3DD00895165 /* Sail.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 07CBB64A15EBE3DD00895165 /* Sail.mp3 */; };
-               07E6721415EBC71A00949DF1 /* eraser.png in Resources */ = {isa = PBXBuildFile; fileRef = 07E6721315EBC71A00949DF1 /* eraser.png */; };
                5909E4AD16D31DAF00020F57 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5909E4AC16D31DAF00020F57 /* Default-568h@2x.png */; };
-               59E5173016F6CFA30082CFB8 /* libSmartDeviceLinkProxy.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 59E5172F16F6CF950082CFB8 /* libSmartDeviceLinkProxy.a */; };
+               59232EAE172182DE004AE3CE /* UnsubscribeVehicleDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 59232EAD172182DA004AE3CE /* UnsubscribeVehicleDataViewController.m */; };
+               59232EB0172182EF004AE3CE /* UnsubscribeVehicleDataViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 59232EAF172182EB004AE3CE /* UnsubscribeVehicleDataViewController.xib */; };
+               5923ED8418416C7F00A31EEB /* SmartDeviceLink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5923ED8218416A1000A31EEB /* SmartDeviceLink.framework */; };
+               5924D6D3171C8AE200F9771E /* SoftButtonListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5924D6D2171C8AE100F9771E /* SoftButtonListViewController.xib */; };
+               593469AE171BE2D0003233E2 /* GetDTCsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 593469AD171BE2D0003233E2 /* GetDTCsViewController.m */; };
+               593469B2171BE2DB003233E2 /* GetDTCsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 593469B1171BE2DB003233E2 /* GetDTCsViewController.xib */; };
+               593469B5171BE301003233E2 /* ShowConstantTBTViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 593469B4171BE301003233E2 /* ShowConstantTBTViewController.m */; };
+               593469B7171BE312003233E2 /* ShowConstantTBTViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 593469B6171BE312003233E2 /* ShowConstantTBTViewController.xib */; };
+               593469BA171BE331003233E2 /* AlertManeuverViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 593469B9171BE331003233E2 /* AlertManeuverViewController.m */; };
+               593469BC171BE33B003233E2 /* AlertManeuverViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 593469BB171BE33B003233E2 /* AlertManeuverViewController.xib */; };
+               593469BF171BE38C003233E2 /* UpdateTurnListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 593469BE171BE38C003233E2 /* UpdateTurnListViewController.m */; };
+               593469C1171BE398003233E2 /* UpdateTurnListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 593469C0171BE398003233E2 /* UpdateTurnListViewController.xib */; };
+               593D2F11171BDC5E00CE1502 /* SliderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 593D2F10171BDC5E00CE1502 /* SliderViewController.m */; };
+               593D2F13171BDC6900CE1502 /* SliderViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 593D2F12171BDC6800CE1502 /* SliderViewController.xib */; };
+               593D2F16171BDCB200CE1502 /* ScrollableMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 593D2F15171BDCB200CE1502 /* ScrollableMessageViewController.m */; };
+               593D2F18171BDCC000CE1502 /* ScrollableMessageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 593D2F17171BDCBF00CE1502 /* ScrollableMessageViewController.xib */; };
+               593D2F1B171BDCEA00CE1502 /* ChangeRegistrationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 593D2F1A171BDCE900CE1502 /* ChangeRegistrationViewController.m */; };
+               593D2F1D171BDCF700CE1502 /* ChangeRegistrationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 593D2F1C171BDCF600CE1502 /* ChangeRegistrationViewController.xib */; };
+               593D2F2F171BDDFC00CE1502 /* SetAppIconViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 593D2F2E171BDDFA00CE1502 /* SetAppIconViewController.m */; };
+               593D2F31171BDE0800CE1502 /* SetAppIconViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 593D2F30171BDE0600CE1502 /* SetAppIconViewController.xib */; };
+               593D2F34171BDE3200CE1502 /* PerformAudioPassThruViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 593D2F33171BDE3000CE1502 /* PerformAudioPassThruViewController.m */; };
+               593D2F36171BDE3E00CE1502 /* PerformAudioPassThruViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 593D2F35171BDE3C00CE1502 /* PerformAudioPassThruViewController.xib */; };
+               593D2F39171BDE6A00CE1502 /* EndAudioPassThruViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 593D2F38171BDE6800CE1502 /* EndAudioPassThruViewController.m */; };
+               593D2F3B171BDE7700CE1502 /* EndAudioPassThruViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 593D2F3A171BDE7400CE1502 /* EndAudioPassThruViewController.xib */; };
+               593D2F48171BDF1B00CE1502 /* ReadDIDViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 593D2F47171BDF0100CE1502 /* ReadDIDViewController.m */; };
+               593D2F4A171BDF9D00CE1502 /* ReadDIDViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 593D2F49171BDF4C00CE1502 /* ReadDIDViewController.xib */; };
+               594B370B171C39F000F1E0AC /* SubscribeVehicleDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 594B370A171C39C900F1E0AC /* SubscribeVehicleDataViewController.m */; };
+               594B370D171C3A2500F1E0AC /* SubscribeVehicleDataViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 594B370C171C3A2400F1E0AC /* SubscribeVehicleDataViewController.xib */; };
+               5966E9DC171C9D3900C3DE45 /* SoftButtonEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5966E9DB171C9D3900C3DE45 /* SoftButtonEditViewController.m */; };
+               5966E9DE171C9D4A00C3DE45 /* SoftButtonEditViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5966E9DD171C9D4A00C3DE45 /* SoftButtonEditViewController.xib */; };
+               59A6B393171C74A40064A469 /* SoftButtonListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 59A6B392171C74A40064A469 /* SoftButtonListViewController.m */; };
+               59EC682F1721C0B60065FE88 /* GetVehicleDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EC682E1721C0B50065FE88 /* GetVehicleDataViewController.m */; };
+               59EC68311721C0BF0065FE88 /* GetVehicleDataViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 59EC68301721C0BF0065FE88 /* GetVehicleDataViewController.xib */; };
+               59EC84A717F1909200A1A41F /* Sample.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 59EC84A617F1909200A1A41F /* Sample.mp3 */; };
                FABDB8E1160A5D510036DE64 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = FABDB8E0160A5D510036DE64 /* Settings.bundle */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-               59E5172E16F6CF950082CFB8 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 59E5172A16F6CF950082CFB8 /* SmartDeviceLinkProxy.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = D2AAC07E0554694100DB518D;
-                       remoteInfo = SmartDeviceLinkProxy;
-               };
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXFileReference section */
                0728C88C15DBF1B400A83097 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
                0765727215C9C47500E21611 /* database.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = database.png; sourceTree = "<group>"; };
@@ -99,13 +106,7 @@
                0789F35215AF40C900ADEF80 /* ConsoleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleViewController.h; sourceTree = "<group>"; };
                0789F35315AF40C900ADEF80 /* ConsoleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConsoleViewController.m; sourceTree = "<group>"; };
                0789F35415AF40C900ADEF80 /* ConsoleViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ConsoleViewController.xib; sourceTree = "<group>"; };
-               0789F35715AF65AF00ADEF80 /* UserTestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserTestViewController.h; sourceTree = "<group>"; };
-               0789F35815AF65AF00ADEF80 /* UserTestViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserTestViewController.m; sourceTree = "<group>"; };
-               0789F35915AF65AF00ADEF80 /* UserTestViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UserTestViewController.xib; sourceTree = "<group>"; };
-               0789F35E15AF6B2300ADEF80 /* Blank-Blackboard-PSD.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Blank-Blackboard-PSD.png"; sourceTree = "<group>"; };
-               0789F37315B06BF300ADEF80 /* cog_02@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cog_02@2x.png"; sourceTree = "<group>"; };
                0789F37515B06BFD00ADEF80 /* cog_02.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cog_02.png; sourceTree = "<group>"; };
-               0789F37715B06C6500ADEF80 /* game_controller.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = game_controller.png; sourceTree = "<group>"; };
                079E7D63159A43E800181934 /* SDLTester.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SDLTester.app; sourceTree = BUILT_PRODUCTS_DIR; };
                079E7D67159A43E800181934 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
                079E7D69159A43E800181934 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -116,37 +117,29 @@
                079E7D75159A43E800181934 /* SmartDeviceLinkTester-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SmartDeviceLinkTester-Prefix.pch"; sourceTree = "<group>"; };
                079E7D76159A43E800181934 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
                079E7D77159A43E800181934 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-               079E7D93159A472300181934 /* SDLBrain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLBrain.h; sourceTree = "<group>"; };
-               079E7D94159A472300181934 /* SDLBrain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLBrain.m; sourceTree = "<group>"; };
+               079E7D93159A472300181934 /* SmartDeviceLinkTester.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SmartDeviceLinkTester.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               079E7D94159A472300181934 /* SmartDeviceLinkTester.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SmartDeviceLinkTester.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
                079E7D9C159A489F00181934 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
-               07B19A3F15B46ADE00E6D316 /* geogia_alert.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = geogia_alert.jpg; sourceTree = "<group>"; };
-               07B19A4015B46ADE00E6D316 /* cali_speak.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = cali_speak.jpg; sourceTree = "<group>"; };
-               07B19A4515B46BA400E6D316 /* colorado_addcmd.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = colorado_addcmd.jpg; sourceTree = "<group>"; };
-               07B19A4715B46C4700E6D316 /* AutoTestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = AutoTestViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-               07B19A4815B46C4700E6D316 /* AutoTestViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AutoTestViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-               07B19A4915B46C4700E6D316 /* AutoTestViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AutoTestViewController.xib; sourceTree = "<group>"; };
-               07B19A4C15B48DA100E6D316 /* delaware_show.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = delaware_show.jpg; sourceTree = "<group>"; };
                07B19A6615B5BF7500E6D316 /* brief_case.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = brief_case.png; sourceTree = "<group>"; };
                07B19A6815B9812D00E6D316 /* RPCTestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RPCTestViewController.h; sourceTree = "<group>"; };
                07B19A6915B9812E00E6D316 /* RPCTestViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RPCTestViewController.m; sourceTree = "<group>"; };
-               07B19A6A15B9812F00E6D316 /* RPCTestViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RPCTestViewController.xib; sourceTree = "<group>"; };
                07B19A7E15B99C3200E6D316 /* SpeakViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpeakViewController.h; sourceTree = "<group>"; };
                07B19A7F15B99C3200E6D316 /* SpeakViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpeakViewController.m; sourceTree = "<group>"; };
                07B19A8015B99C3200E6D316 /* SpeakViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SpeakViewController.xib; sourceTree = "<group>"; };
                07B19A8315B99E4A00E6D316 /* ShowViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShowViewController.h; sourceTree = "<group>"; };
-               07B19A8415B99E4A00E6D316 /* ShowViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShowViewController.m; sourceTree = "<group>"; };
+               07B19A8415B99E4A00E6D316 /* ShowViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ShowViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
                07B19A8515B99E4A00E6D316 /* ShowViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ShowViewController.xib; sourceTree = "<group>"; };
                07B19A8815B99F0800E6D316 /* UnregisterAppInterfaceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnregisterAppInterfaceViewController.h; sourceTree = "<group>"; };
-               07B19A8915B99F0800E6D316 /* UnregisterAppInterfaceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UnregisterAppInterfaceViewController.m; sourceTree = "<group>"; };
+               07B19A8915B99F0800E6D316 /* UnregisterAppInterfaceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = UnregisterAppInterfaceViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
                07B19A8A15B99F0800E6D316 /* UnregisterAppInterfaceViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UnregisterAppInterfaceViewController.xib; sourceTree = "<group>"; };
-               07B19A8D15B99F1500E6D316 /* AlertViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = AlertViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               07B19A8D15B99F1500E6D316 /* AlertViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlertViewController.h; sourceTree = "<group>"; };
                07B19A8E15B99F1500E6D316 /* AlertViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AlertViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
                07B19A8F15B99F1500E6D316 /* AlertViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AlertViewController.xib; sourceTree = "<group>"; };
                07B19A9215B99F2400E6D316 /* SetMediaClockTimerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetMediaClockTimerViewController.h; sourceTree = "<group>"; };
-               07B19A9315B99F2400E6D316 /* SetMediaClockTimerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SetMediaClockTimerViewController.m; sourceTree = "<group>"; };
+               07B19A9315B99F2400E6D316 /* SetMediaClockTimerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SetMediaClockTimerViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
                07B19A9415B99F2400E6D316 /* SetMediaClockTimerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SetMediaClockTimerViewController.xib; sourceTree = "<group>"; };
                07B19A9715B99F2F00E6D316 /* AddCommandViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddCommandViewController.h; sourceTree = "<group>"; };
-               07B19A9815B99F2F00E6D316 /* AddCommandViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddCommandViewController.m; sourceTree = "<group>"; };
+               07B19A9815B99F2F00E6D316 /* AddCommandViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AddCommandViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
                07B19A9915B99F2F00E6D316 /* AddCommandViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddCommandViewController.xib; sourceTree = "<group>"; };
                07B19A9C15B99F3B00E6D316 /* DeleteCommandViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeleteCommandViewController.h; sourceTree = "<group>"; };
                07B19A9D15B99F3B00E6D316 /* DeleteCommandViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeleteCommandViewController.m; sourceTree = "<group>"; };
@@ -166,30 +159,74 @@
                07B19AB515B99F9300E6D316 /* PerformInteractionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformInteractionViewController.h; sourceTree = "<group>"; };
                07B19AB615B99F9400E6D316 /* PerformInteractionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PerformInteractionViewController.m; sourceTree = "<group>"; };
                07B19AB715B99F9400E6D316 /* PerformInteractionViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PerformInteractionViewController.xib; sourceTree = "<group>"; };
-               07B19ABF15B99FBB00E6D316 /* EncodedSyncPDataViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncodedSyncPDataViewController.h; sourceTree = "<group>"; };
-               07B19AC015B99FBC00E6D316 /* EncodedSyncPDataViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EncodedSyncPDataViewController.m; sourceTree = "<group>"; };
-               07B19AC115B99FBD00E6D316 /* EncodedSyncPDataViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = EncodedSyncPDataViewController.xib; sourceTree = "<group>"; };
                07B19AC415B99FDB00E6D316 /* UnsubscribeButtonViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnsubscribeButtonViewController.h; sourceTree = "<group>"; };
-               07B19AC515B99FDC00E6D316 /* UnsubscribeButtonViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UnsubscribeButtonViewController.m; sourceTree = "<group>"; };
+               07B19AC515B99FDC00E6D316 /* UnsubscribeButtonViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = UnsubscribeButtonViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
                07B19AC615B99FDD00E6D316 /* UnsubscribeButtonViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UnsubscribeButtonViewController.xib; sourceTree = "<group>"; };
                07B19AC915B99FEC00E6D316 /* SetGlobalPropertiesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetGlobalPropertiesViewController.h; sourceTree = "<group>"; };
-               07B19ACA15B99FED00E6D316 /* SetGlobalPropertiesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SetGlobalPropertiesViewController.m; sourceTree = "<group>"; };
+               07B19ACA15B99FED00E6D316 /* SetGlobalPropertiesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SetGlobalPropertiesViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
                07B19ACB15B99FEE00E6D316 /* SetGlobalPropertiesViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SetGlobalPropertiesViewController.xib; sourceTree = "<group>"; };
                07B19ACE15B9A00700E6D316 /* ResetGlobalPropertiesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResetGlobalPropertiesViewController.h; sourceTree = "<group>"; };
                07B19ACF15B9A00800E6D316 /* ResetGlobalPropertiesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResetGlobalPropertiesViewController.m; sourceTree = "<group>"; };
                07B19AD015B9A00900E6D316 /* ResetGlobalPropertiesViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ResetGlobalPropertiesViewController.xib; sourceTree = "<group>"; };
                07C35C40159E1A7100CDA3D3 /* ExternalAccessory.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExternalAccessory.framework; path = System/Library/Frameworks/ExternalAccessory.framework; sourceTree = SDKROOT; };
                07C7E11615B9A5940035681D /* SubscribeButtonViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubscribeButtonViewController.h; sourceTree = "<group>"; };
-               07C7E11715B9A5940035681D /* SubscribeButtonViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SubscribeButtonViewController.m; sourceTree = "<group>"; };
+               07C7E11715B9A5940035681D /* SubscribeButtonViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SubscribeButtonViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
                07C7E11815B9A5940035681D /* SubscribeButtonViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SubscribeButtonViewController.xib; sourceTree = "<group>"; };
                07C7E12F15B9CF5C0035681D /* arrow_up.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = arrow_up.png; sourceTree = "<group>"; };
                07C7E13115B9CF7A0035681D /* arrow_down.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = arrow_down.png; sourceTree = "<group>"; };
                07C7E13315B9CF840035681D /* play.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = play.png; sourceTree = "<group>"; };
                07C7E13515B9CF8C0035681D /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pause.png; sourceTree = "<group>"; };
-               07CBB64A15EBE3DD00895165 /* Sail.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Sail.mp3; sourceTree = "<group>"; };
-               07E6721315EBC71A00949DF1 /* eraser.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = eraser.png; sourceTree = "<group>"; };
                5909E4AC16D31DAF00020F57 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
-               59E5172A16F6CF950082CFB8 /* SmartDeviceLinkProxy.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SmartDeviceLinkProxy.xcodeproj; path = ../SmartDeviceLinkProxy/SmartDeviceLinkProxy.xcodeproj; sourceTree = "<group>"; };
+               59232EAC172182CB004AE3CE /* UnsubscribeVehicleDataViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnsubscribeVehicleDataViewController.h; sourceTree = "<group>"; };
+               59232EAD172182DA004AE3CE /* UnsubscribeVehicleDataViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = UnsubscribeVehicleDataViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               59232EAF172182EB004AE3CE /* UnsubscribeVehicleDataViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UnsubscribeVehicleDataViewController.xib; sourceTree = "<group>"; };
+               5923ED8218416A1000A31EEB /* SmartDeviceLink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SmartDeviceLink.framework; sourceTree = "<group>"; };
+               5924D6D2171C8AE100F9771E /* SoftButtonListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SoftButtonListViewController.xib; sourceTree = "<group>"; };
+               593469AD171BE2D0003233E2 /* GetDTCsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GetDTCsViewController.m; sourceTree = "<group>"; };
+               593469B1171BE2DB003233E2 /* GetDTCsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GetDTCsViewController.xib; sourceTree = "<group>"; };
+               593469B3171BE2F6003233E2 /* ShowConstantTBTViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShowConstantTBTViewController.h; sourceTree = "<group>"; };
+               593469B4171BE301003233E2 /* ShowConstantTBTViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ShowConstantTBTViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               593469B6171BE312003233E2 /* ShowConstantTBTViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ShowConstantTBTViewController.xib; sourceTree = "<group>"; };
+               593469B8171BE325003233E2 /* AlertManeuverViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlertManeuverViewController.h; sourceTree = "<group>"; };
+               593469B9171BE331003233E2 /* AlertManeuverViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AlertManeuverViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               593469BB171BE33B003233E2 /* AlertManeuverViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AlertManeuverViewController.xib; sourceTree = "<group>"; };
+               593469BD171BE381003233E2 /* UpdateTurnListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpdateTurnListViewController.h; sourceTree = "<group>"; };
+               593469BE171BE38C003233E2 /* UpdateTurnListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = UpdateTurnListViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               593469C0171BE398003233E2 /* UpdateTurnListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UpdateTurnListViewController.xib; sourceTree = "<group>"; };
+               593D2F0F171BDC3D00CE1502 /* SliderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SliderViewController.h; sourceTree = "<group>"; };
+               593D2F10171BDC5E00CE1502 /* SliderViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SliderViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               593D2F12171BDC6800CE1502 /* SliderViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SliderViewController.xib; sourceTree = "<group>"; };
+               593D2F14171BDCA500CE1502 /* ScrollableMessageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollableMessageViewController.h; sourceTree = "<group>"; };
+               593D2F15171BDCB200CE1502 /* ScrollableMessageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScrollableMessageViewController.m; sourceTree = "<group>"; };
+               593D2F17171BDCBF00CE1502 /* ScrollableMessageViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ScrollableMessageViewController.xib; sourceTree = "<group>"; };
+               593D2F19171BDCDD00CE1502 /* ChangeRegistrationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeRegistrationViewController.h; sourceTree = "<group>"; };
+               593D2F1A171BDCE900CE1502 /* ChangeRegistrationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChangeRegistrationViewController.m; sourceTree = "<group>"; };
+               593D2F1C171BDCF600CE1502 /* ChangeRegistrationViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ChangeRegistrationViewController.xib; sourceTree = "<group>"; };
+               593D2F2D171BDDED00CE1502 /* SetAppIconViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetAppIconViewController.h; sourceTree = "<group>"; };
+               593D2F2E171BDDFA00CE1502 /* SetAppIconViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SetAppIconViewController.m; sourceTree = "<group>"; };
+               593D2F30171BDE0600CE1502 /* SetAppIconViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SetAppIconViewController.xib; sourceTree = "<group>"; };
+               593D2F32171BDE2300CE1502 /* PerformAudioPassThruViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformAudioPassThruViewController.h; sourceTree = "<group>"; };
+               593D2F33171BDE3000CE1502 /* PerformAudioPassThruViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PerformAudioPassThruViewController.m; sourceTree = "<group>"; };
+               593D2F35171BDE3C00CE1502 /* PerformAudioPassThruViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PerformAudioPassThruViewController.xib; sourceTree = "<group>"; };
+               593D2F37171BDE5500CE1502 /* EndAudioPassThruViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EndAudioPassThruViewController.h; sourceTree = "<group>"; };
+               593D2F38171BDE6800CE1502 /* EndAudioPassThruViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EndAudioPassThruViewController.m; sourceTree = "<group>"; };
+               593D2F3A171BDE7400CE1502 /* EndAudioPassThruViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = EndAudioPassThruViewController.xib; sourceTree = "<group>"; };
+               593D2F46171BDEF300CE1502 /* ReadDIDViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadDIDViewController.h; sourceTree = "<group>"; };
+               593D2F47171BDF0100CE1502 /* ReadDIDViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReadDIDViewController.m; sourceTree = "<group>"; };
+               593D2F49171BDF4C00CE1502 /* ReadDIDViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ReadDIDViewController.xib; sourceTree = "<group>"; };
+               593D2F4B171BE16700CE1502 /* GetDTCsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GetDTCsViewController.h; sourceTree = "<group>"; };
+               594B3709171C39A400F1E0AC /* SubscribeVehicleDataViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubscribeVehicleDataViewController.h; sourceTree = "<group>"; };
+               594B370A171C39C900F1E0AC /* SubscribeVehicleDataViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SubscribeVehicleDataViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               594B370C171C3A2400F1E0AC /* SubscribeVehicleDataViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SubscribeVehicleDataViewController.xib; sourceTree = "<group>"; };
+               5966E9DA171C9D2D00C3DE45 /* SoftButtonEditViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SoftButtonEditViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               5966E9DB171C9D3900C3DE45 /* SoftButtonEditViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SoftButtonEditViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               5966E9DD171C9D4A00C3DE45 /* SoftButtonEditViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SoftButtonEditViewController.xib; sourceTree = "<group>"; };
+               59A6B390171C74960064A469 /* SoftButtonListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoftButtonListViewController.h; sourceTree = "<group>"; };
+               59A6B392171C74A40064A469 /* SoftButtonListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SoftButtonListViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+               59EC682D1721C0AC0065FE88 /* GetVehicleDataViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GetVehicleDataViewController.h; sourceTree = "<group>"; };
+               59EC682E1721C0B50065FE88 /* GetVehicleDataViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GetVehicleDataViewController.m; sourceTree = "<group>"; };
+               59EC68301721C0BF0065FE88 /* GetVehicleDataViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GetVehicleDataViewController.xib; sourceTree = "<group>"; };
+               59EC84A617F1909200A1A41F /* Sample.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Sample.mp3; sourceTree = "<group>"; };
                FABDB8E0160A5D510036DE64 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -198,7 +235,7 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               59E5173016F6CFA30082CFB8 /* libSmartDeviceLinkProxy.a in Frameworks */,
+                               5923ED8418416C7F00A31EEB /* SmartDeviceLink.framework in Frameworks */,
                                0728C88D15DBF1B400A83097 /* MessageUI.framework in Frameworks */,
                                07C35C41159E1A7200CDA3D3 /* ExternalAccessory.framework in Frameworks */,
                                079E7D9D159A489F00181934 /* AVFoundation.framework in Frameworks */,
@@ -214,10 +251,6 @@
                079E7D58159A43E800181934 = {
                        isa = PBXGroup;
                        children = (
-                               59E5172A16F6CF950082CFB8 /* SmartDeviceLinkProxy.xcodeproj */,
-                               0728C88C15DBF1B400A83097 /* MessageUI.framework */,
-                               07C35C40159E1A7100CDA3D3 /* ExternalAccessory.framework */,
-                               079E7D9C159A489F00181934 /* AVFoundation.framework */,
                                079E7D6D159A43E800181934 /* SmartDeviceLinkTester */,
                                079E7D66159A43E800181934 /* Frameworks */,
                                079E7D64159A43E800181934 /* Products */,
@@ -236,6 +269,10 @@
                079E7D66159A43E800181934 /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
+                               5923ED8218416A1000A31EEB /* SmartDeviceLink.framework */,
+                               079E7D9C159A489F00181934 /* AVFoundation.framework */,
+                               07C35C40159E1A7100CDA3D3 /* ExternalAccessory.framework */,
+                               0728C88C15DBF1B400A83097 /* MessageUI.framework */,
                                079E7D67159A43E800181934 /* UIKit.framework */,
                                079E7D69159A43E800181934 /* Foundation.framework */,
                                079E7D6B159A43E800181934 /* CoreGraphics.framework */,
@@ -246,20 +283,13 @@
                079E7D6D159A43E800181934 /* SmartDeviceLinkTester */ = {
                        isa = PBXGroup;
                        children = (
-                               07B19A7815B9994B00E6D316 /* RPC */,
+                               07B19A7815B9994B00E6D316 /* RPC VCs */,
                                079E7D76159A43E800181934 /* AppDelegate.h */,
                                079E7D77159A43E800181934 /* AppDelegate.m */,
-                               0789F35715AF65AF00ADEF80 /* UserTestViewController.h */,
-                               0789F35815AF65AF00ADEF80 /* UserTestViewController.m */,
-                               0789F35915AF65AF00ADEF80 /* UserTestViewController.xib */,
                                07B19A6815B9812D00E6D316 /* RPCTestViewController.h */,
                                07B19A6915B9812E00E6D316 /* RPCTestViewController.m */,
-                               07B19A6A15B9812F00E6D316 /* RPCTestViewController.xib */,
-                               079E7D93159A472300181934 /* SDLBrain.h */,
-                               079E7D94159A472300181934 /* SDLBrain.m */,
-                               07B19A4715B46C4700E6D316 /* AutoTestViewController.h */,
-                               07B19A4815B46C4700E6D316 /* AutoTestViewController.m */,
-                               07B19A4915B46C4700E6D316 /* AutoTestViewController.xib */,
+                               079E7D93159A472300181934 /* SmartDeviceLinkTester.h */,
+                               079E7D94159A472300181934 /* SmartDeviceLinkTester.m */,
                                0789F35215AF40C900ADEF80 /* ConsoleViewController.h */,
                                0789F35315AF40C900ADEF80 /* ConsoleViewController.m */,
                                0789F35415AF40C900ADEF80 /* ConsoleViewController.xib */,
@@ -273,7 +303,7 @@
                079E7D6E159A43E800181934 /* Supporting Files */ = {
                        isa = PBXGroup;
                        children = (
-                               07CBB64A15EBE3DD00895165 /* Sail.mp3 */,
+                               59EC84A617F1909200A1A41F /* Sample.mp3 */,
                                079E7D6F159A43E800181934 /* SmartDeviceLinkTester-Info.plist */,
                                079E7D70159A43E800181934 /* InfoPlist.strings */,
                                079E7D73159A43E800181934 /* main.m */,
@@ -285,91 +315,120 @@
                079E7D92159A441100181934 /* Images */ = {
                        isa = PBXGroup;
                        children = (
-                               07E6721315EBC71A00949DF1 /* eraser.png */,
+                               07B19A6615B5BF7500E6D316 /* brief_case.png */,
                                0765727215C9C47500E21611 /* database.png */,
                                07C7E13515B9CF8C0035681D /* pause.png */,
                                07C7E13315B9CF840035681D /* play.png */,
                                07C7E13115B9CF7A0035681D /* arrow_down.png */,
                                07C7E12F15B9CF5C0035681D /* arrow_up.png */,
-                               07B19A6615B5BF7500E6D316 /* brief_case.png */,
-                               07B19A4C15B48DA100E6D316 /* delaware_show.jpg */,
-                               07B19A4515B46BA400E6D316 /* colorado_addcmd.jpg */,
-                               07B19A3F15B46ADE00E6D316 /* geogia_alert.jpg */,
-                               07B19A4015B46ADE00E6D316 /* cali_speak.jpg */,
-                               0789F37715B06C6500ADEF80 /* game_controller.png */,
                                0789F37515B06BFD00ADEF80 /* cog_02.png */,
-                               0789F37315B06BF300ADEF80 /* cog_02@2x.png */,
-                               0789F35E15AF6B2300ADEF80 /* Blank-Blackboard-PSD.png */,
                        );
                        name = Images;
                        sourceTree = "<group>";
                };
-               07B19A7815B9994B00E6D316 /* RPC */ = {
+               07B19A7815B9994B00E6D316 /* RPC VCs */ = {
                        isa = PBXGroup;
                        children = (
-                               07B19A7E15B99C3200E6D316 /* SpeakViewController.h */,
-                               07B19A7F15B99C3200E6D316 /* SpeakViewController.m */,
-                               07B19A8015B99C3200E6D316 /* SpeakViewController.xib */,
-                               07B19A8315B99E4A00E6D316 /* ShowViewController.h */,
-                               07B19A8415B99E4A00E6D316 /* ShowViewController.m */,
-                               07B19A8515B99E4A00E6D316 /* ShowViewController.xib */,
-                               07B19A8815B99F0800E6D316 /* UnregisterAppInterfaceViewController.h */,
-                               07B19A8915B99F0800E6D316 /* UnregisterAppInterfaceViewController.m */,
-                               07B19A8A15B99F0800E6D316 /* UnregisterAppInterfaceViewController.xib */,
-                               07B19A8D15B99F1500E6D316 /* AlertViewController.h */,
-                               07B19A8E15B99F1500E6D316 /* AlertViewController.m */,
-                               07B19A8F15B99F1500E6D316 /* AlertViewController.xib */,
-                               07B19A9215B99F2400E6D316 /* SetMediaClockTimerViewController.h */,
-                               07B19A9315B99F2400E6D316 /* SetMediaClockTimerViewController.m */,
-                               07B19A9415B99F2400E6D316 /* SetMediaClockTimerViewController.xib */,
                                07B19A9715B99F2F00E6D316 /* AddCommandViewController.h */,
                                07B19A9815B99F2F00E6D316 /* AddCommandViewController.m */,
                                07B19A9915B99F2F00E6D316 /* AddCommandViewController.xib */,
-                               07B19A9C15B99F3B00E6D316 /* DeleteCommandViewController.h */,
-                               07B19A9D15B99F3B00E6D316 /* DeleteCommandViewController.m */,
-                               07B19A9E15B99F3C00E6D316 /* DeleteCommandViewController.xib */,
+                               077869AA15C01BFD00FE9390 /* AddMenuOption.h */,
+                               077869AB15C01BFF00FE9390 /* AddMenuOption.m */,
                                07B19AA115B99F4900E6D316 /* AddSubMenuViewController.h */,
                                07B19AA215B99F4900E6D316 /* AddSubMenuViewController.m */,
                                07B19AA315B99F4A00E6D316 /* AddSubMenuViewController.xib */,
-                               07B19AA615B99F5B00E6D316 /* DeleteSubMenuViewController.h */,
-                               07B19AA715B99F5B00E6D316 /* DeleteSubMenuViewController.m */,
-                               07B19AA815B99F5C00E6D316 /* DeleteSubMenuViewController.xib */,
+                               593469B8171BE325003233E2 /* AlertManeuverViewController.h */,
+                               593469B9171BE331003233E2 /* AlertManeuverViewController.m */,
+                               593469BB171BE33B003233E2 /* AlertManeuverViewController.xib */,
+                               07B19A8D15B99F1500E6D316 /* AlertViewController.h */,
+                               07B19A8E15B99F1500E6D316 /* AlertViewController.m */,
+                               07B19A8F15B99F1500E6D316 /* AlertViewController.xib */,
+                               593D2F19171BDCDD00CE1502 /* ChangeRegistrationViewController.h */,
+                               593D2F1A171BDCE900CE1502 /* ChangeRegistrationViewController.m */,
+                               593D2F1C171BDCF600CE1502 /* ChangeRegistrationViewController.xib */,
                                07B19AAB15B99F6C00E6D316 /* CreateInteractionChoiceSetViewController.h */,
                                07B19AAC15B99F6D00E6D316 /* CreateInteractionChoiceSetViewController.m */,
                                07B19AAD15B99F6D00E6D316 /* CreateInteractionChoiceSetViewController.xib */,
+                               07B19A9C15B99F3B00E6D316 /* DeleteCommandViewController.h */,
+                               07B19A9D15B99F3B00E6D316 /* DeleteCommandViewController.m */,
+                               07B19A9E15B99F3C00E6D316 /* DeleteCommandViewController.xib */,
                                07B19AB015B99F8300E6D316 /* DeleteInteractionChoiceSetViewController.h */,
                                07B19AB115B99F8300E6D316 /* DeleteInteractionChoiceSetViewController.m */,
                                07B19AB215B99F8400E6D316 /* DeleteInteractionChoiceSetViewController.xib */,
+                               07B19AA615B99F5B00E6D316 /* DeleteSubMenuViewController.h */,
+                               07B19AA715B99F5B00E6D316 /* DeleteSubMenuViewController.m */,
+                               07B19AA815B99F5C00E6D316 /* DeleteSubMenuViewController.xib */,
+                               593D2F37171BDE5500CE1502 /* EndAudioPassThruViewController.h */,
+                               593D2F38171BDE6800CE1502 /* EndAudioPassThruViewController.m */,
+                               593D2F3A171BDE7400CE1502 /* EndAudioPassThruViewController.xib */,
+                               593D2F4B171BE16700CE1502 /* GetDTCsViewController.h */,
+                               593469AD171BE2D0003233E2 /* GetDTCsViewController.m */,
+                               593469B1171BE2DB003233E2 /* GetDTCsViewController.xib */,
+                               59EC682D1721C0AC0065FE88 /* GetVehicleDataViewController.h */,
+                               59EC682E1721C0B50065FE88 /* GetVehicleDataViewController.m */,
+                               59EC68301721C0BF0065FE88 /* GetVehicleDataViewController.xib */,
+                               593D2F32171BDE2300CE1502 /* PerformAudioPassThruViewController.h */,
+                               593D2F33171BDE3000CE1502 /* PerformAudioPassThruViewController.m */,
+                               593D2F35171BDE3C00CE1502 /* PerformAudioPassThruViewController.xib */,
                                07B19AB515B99F9300E6D316 /* PerformInteractionViewController.h */,
                                07B19AB615B99F9400E6D316 /* PerformInteractionViewController.m */,
                                07B19AB715B99F9400E6D316 /* PerformInteractionViewController.xib */,
-                               07B19ABF15B99FBB00E6D316 /* EncodedSyncPDataViewController.h */,
-                               07B19AC015B99FBC00E6D316 /* EncodedSyncPDataViewController.m */,
-                               07B19AC115B99FBD00E6D316 /* EncodedSyncPDataViewController.xib */,
+                               593D2F46171BDEF300CE1502 /* ReadDIDViewController.h */,
+                               593D2F47171BDF0100CE1502 /* ReadDIDViewController.m */,
+                               593D2F49171BDF4C00CE1502 /* ReadDIDViewController.xib */,
+                               07B19ACE15B9A00700E6D316 /* ResetGlobalPropertiesViewController.h */,
+                               07B19ACF15B9A00800E6D316 /* ResetGlobalPropertiesViewController.m */,
+                               07B19AD015B9A00900E6D316 /* ResetGlobalPropertiesViewController.xib */,
+                               593D2F14171BDCA500CE1502 /* ScrollableMessageViewController.h */,
+                               593D2F15171BDCB200CE1502 /* ScrollableMessageViewController.m */,
+                               593D2F17171BDCBF00CE1502 /* ScrollableMessageViewController.xib */,
+                               593D2F2D171BDDED00CE1502 /* SetAppIconViewController.h */,
+                               593D2F2E171BDDFA00CE1502 /* SetAppIconViewController.m */,
+                               593D2F30171BDE0600CE1502 /* SetAppIconViewController.xib */,
+                               07B19AC915B99FEC00E6D316 /* SetGlobalPropertiesViewController.h */,
+                               07B19ACA15B99FED00E6D316 /* SetGlobalPropertiesViewController.m */,
+                               07B19ACB15B99FEE00E6D316 /* SetGlobalPropertiesViewController.xib */,
+                               07B19A9215B99F2400E6D316 /* SetMediaClockTimerViewController.h */,
+                               07B19A9315B99F2400E6D316 /* SetMediaClockTimerViewController.m */,
+                               07B19A9415B99F2400E6D316 /* SetMediaClockTimerViewController.xib */,
+                               593469B3171BE2F6003233E2 /* ShowConstantTBTViewController.h */,
+                               593469B4171BE301003233E2 /* ShowConstantTBTViewController.m */,
+                               593469B6171BE312003233E2 /* ShowConstantTBTViewController.xib */,
+                               07B19A8315B99E4A00E6D316 /* ShowViewController.h */,
+                               07B19A8415B99E4A00E6D316 /* ShowViewController.m */,
+                               07B19A8515B99E4A00E6D316 /* ShowViewController.xib */,
+                               593D2F0F171BDC3D00CE1502 /* SliderViewController.h */,
+                               593D2F10171BDC5E00CE1502 /* SliderViewController.m */,
+                               593D2F12171BDC6800CE1502 /* SliderViewController.xib */,
+                               5966E9DA171C9D2D00C3DE45 /* SoftButtonEditViewController.h */,
+                               5966E9DB171C9D3900C3DE45 /* SoftButtonEditViewController.m */,
+                               5966E9DD171C9D4A00C3DE45 /* SoftButtonEditViewController.xib */,
+                               59A6B390171C74960064A469 /* SoftButtonListViewController.h */,
+                               59A6B392171C74A40064A469 /* SoftButtonListViewController.m */,
+                               5924D6D2171C8AE100F9771E /* SoftButtonListViewController.xib */,
+                               07B19A7E15B99C3200E6D316 /* SpeakViewController.h */,
+                               07B19A7F15B99C3200E6D316 /* SpeakViewController.m */,
+                               07B19A8015B99C3200E6D316 /* SpeakViewController.xib */,
                                07C7E11615B9A5940035681D /* SubscribeButtonViewController.h */,
                                07C7E11715B9A5940035681D /* SubscribeButtonViewController.m */,
                                07C7E11815B9A5940035681D /* SubscribeButtonViewController.xib */,
+                               594B3709171C39A400F1E0AC /* SubscribeVehicleDataViewController.h */,
+                               594B370A171C39C900F1E0AC /* SubscribeVehicleDataViewController.m */,
+                               594B370C171C3A2400F1E0AC /* SubscribeVehicleDataViewController.xib */,
+                               07B19A8815B99F0800E6D316 /* UnregisterAppInterfaceViewController.h */,
+                               07B19A8915B99F0800E6D316 /* UnregisterAppInterfaceViewController.m */,
+                               07B19A8A15B99F0800E6D316 /* UnregisterAppInterfaceViewController.xib */,
                                07B19AC415B99FDB00E6D316 /* UnsubscribeButtonViewController.h */,
                                07B19AC515B99FDC00E6D316 /* UnsubscribeButtonViewController.m */,
                                07B19AC615B99FDD00E6D316 /* UnsubscribeButtonViewController.xib */,
-                               07B19AC915B99FEC00E6D316 /* SetGlobalPropertiesViewController.h */,
-                               07B19ACA15B99FED00E6D316 /* SetGlobalPropertiesViewController.m */,
-                               07B19ACB15B99FEE00E6D316 /* SetGlobalPropertiesViewController.xib */,
-                               07B19ACE15B9A00700E6D316 /* ResetGlobalPropertiesViewController.h */,
-                               07B19ACF15B9A00800E6D316 /* ResetGlobalPropertiesViewController.m */,
-                               07B19AD015B9A00900E6D316 /* ResetGlobalPropertiesViewController.xib */,
-                               077869AA15C01BFD00FE9390 /* AddMenuOption.h */,
-                               077869AB15C01BFF00FE9390 /* AddMenuOption.m */,
+                               59232EAC172182CB004AE3CE /* UnsubscribeVehicleDataViewController.h */,
+                               59232EAD172182DA004AE3CE /* UnsubscribeVehicleDataViewController.m */,
+                               59232EAF172182EB004AE3CE /* UnsubscribeVehicleDataViewController.xib */,
+                               593469BD171BE381003233E2 /* UpdateTurnListViewController.h */,
+                               593469BE171BE38C003233E2 /* UpdateTurnListViewController.m */,
+                               593469C0171BE398003233E2 /* UpdateTurnListViewController.xib */,
                        );
-                       name = RPC;
-                       sourceTree = "<group>";
-               };
-               59E5172B16F6CF950082CFB8 /* Products */ = {
-                       isa = PBXGroup;
-                       children = (
-                               59E5172F16F6CF950082CFB8 /* libSmartDeviceLinkProxy.a */,
-                       );
-                       name = Products;
+                       name = "RPC VCs";
                        sourceTree = "<group>";
                };
 /* End PBXGroup section */
@@ -410,12 +469,6 @@
                        mainGroup = 079E7D58159A43E800181934;
                        productRefGroup = 079E7D64159A43E800181934 /* Products */;
                        projectDirPath = "";
-                       projectReferences = (
-                               {
-                                       ProductGroup = 59E5172B16F6CF950082CFB8 /* Products */;
-                                       ProjectRef = 59E5172A16F6CF950082CFB8 /* SmartDeviceLinkProxy.xcodeproj */;
-                               },
-                       );
                        projectRoot = "";
                        targets = (
                                079E7D62159A43E800181934 /* SmartDeviceLinkTester */,
@@ -423,16 +476,6 @@
                };
 /* End PBXProject section */
 
-/* Begin PBXReferenceProxy section */
-               59E5172F16F6CF950082CFB8 /* libSmartDeviceLinkProxy.a */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = archive.ar;
-                       path = libSmartDeviceLinkProxy.a;
-                       remoteRef = 59E5172E16F6CF950082CFB8 /* PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
                079E7D61159A43E800181934 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
@@ -440,18 +483,8 @@
                        files = (
                                079E7D72159A43E800181934 /* InfoPlist.strings in Resources */,
                                0789F35615AF40CA00ADEF80 /* ConsoleViewController.xib in Resources */,
-                               0789F35B15AF65AF00ADEF80 /* UserTestViewController.xib in Resources */,
-                               0789F35F15AF6B2300ADEF80 /* Blank-Blackboard-PSD.png in Resources */,
-                               0789F37415B06BF300ADEF80 /* cog_02@2x.png in Resources */,
                                0789F37615B06BFD00ADEF80 /* cog_02.png in Resources */,
-                               0789F37815B06C6500ADEF80 /* game_controller.png in Resources */,
-                               07B19A4215B46ADE00E6D316 /* geogia_alert.jpg in Resources */,
-                               07B19A4315B46ADE00E6D316 /* cali_speak.jpg in Resources */,
-                               07B19A4615B46BA400E6D316 /* colorado_addcmd.jpg in Resources */,
-                               07B19A4B15B46C4700E6D316 /* AutoTestViewController.xib in Resources */,
-                               07B19A4D15B48DA100E6D316 /* delaware_show.jpg in Resources */,
                                07B19A6715B5BF7500E6D316 /* brief_case.png in Resources */,
-                               07B19A6C15B9812F00E6D316 /* RPCTestViewController.xib in Resources */,
                                07B19A8215B99C3200E6D316 /* SpeakViewController.xib in Resources */,
                                07B19A8715B99E4A00E6D316 /* ShowViewController.xib in Resources */,
                                07B19A8C15B99F0800E6D316 /* UnregisterAppInterfaceViewController.xib in Resources */,
@@ -464,7 +497,6 @@
                                07B19AAF15B99F6E00E6D316 /* CreateInteractionChoiceSetViewController.xib in Resources */,
                                07B19AB415B99F8500E6D316 /* DeleteInteractionChoiceSetViewController.xib in Resources */,
                                07B19AB915B99F9500E6D316 /* PerformInteractionViewController.xib in Resources */,
-                               07B19AC315B99FBD00E6D316 /* EncodedSyncPDataViewController.xib in Resources */,
                                07B19AC815B99FDE00E6D316 /* UnsubscribeButtonViewController.xib in Resources */,
                                07B19ACD15B99FEF00E6D316 /* SetGlobalPropertiesViewController.xib in Resources */,
                                07B19AD215B9A00900E6D316 /* ResetGlobalPropertiesViewController.xib in Resources */,
@@ -474,10 +506,25 @@
                                07C7E13415B9CF840035681D /* play.png in Resources */,
                                07C7E13615B9CF8C0035681D /* pause.png in Resources */,
                                0765727315C9C47500E21611 /* database.png in Resources */,
-                               07E6721415EBC71A00949DF1 /* eraser.png in Resources */,
-                               07CBB64B15EBE3DD00895165 /* Sail.mp3 in Resources */,
                                FABDB8E1160A5D510036DE64 /* Settings.bundle in Resources */,
                                5909E4AD16D31DAF00020F57 /* Default-568h@2x.png in Resources */,
+                               593D2F13171BDC6900CE1502 /* SliderViewController.xib in Resources */,
+                               593D2F18171BDCC000CE1502 /* ScrollableMessageViewController.xib in Resources */,
+                               593D2F1D171BDCF700CE1502 /* ChangeRegistrationViewController.xib in Resources */,
+                               593D2F31171BDE0800CE1502 /* SetAppIconViewController.xib in Resources */,
+                               593D2F36171BDE3E00CE1502 /* PerformAudioPassThruViewController.xib in Resources */,
+                               593D2F3B171BDE7700CE1502 /* EndAudioPassThruViewController.xib in Resources */,
+                               593D2F4A171BDF9D00CE1502 /* ReadDIDViewController.xib in Resources */,
+                               593469B2171BE2DB003233E2 /* GetDTCsViewController.xib in Resources */,
+                               593469B7171BE312003233E2 /* ShowConstantTBTViewController.xib in Resources */,
+                               593469BC171BE33B003233E2 /* AlertManeuverViewController.xib in Resources */,
+                               593469C1171BE398003233E2 /* UpdateTurnListViewController.xib in Resources */,
+                               59EC84A717F1909200A1A41F /* Sample.mp3 in Resources */,
+                               594B370D171C3A2500F1E0AC /* SubscribeVehicleDataViewController.xib in Resources */,
+                               5924D6D3171C8AE200F9771E /* SoftButtonListViewController.xib in Resources */,
+                               5966E9DE171C9D4A00C3DE45 /* SoftButtonEditViewController.xib in Resources */,
+                               59232EB0172182EF004AE3CE /* UnsubscribeVehicleDataViewController.xib in Resources */,
+                               59EC68311721C0BF0065FE88 /* GetVehicleDataViewController.xib in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -490,10 +537,8 @@
                        files = (
                                079E7D74159A43E800181934 /* main.m in Sources */,
                                079E7D78159A43E800181934 /* AppDelegate.m in Sources */,
-                               079E7D95159A472300181934 /* SDLBrain.m in Sources */,
+                               079E7D95159A472300181934 /* SmartDeviceLinkTester.m in Sources */,
                                0789F35515AF40CA00ADEF80 /* ConsoleViewController.m in Sources */,
-                               0789F35A15AF65AF00ADEF80 /* UserTestViewController.m in Sources */,
-                               07B19A4A15B46C4700E6D316 /* AutoTestViewController.m in Sources */,
                                07B19A6B15B9812F00E6D316 /* RPCTestViewController.m in Sources */,
                                07B19A8115B99C3200E6D316 /* SpeakViewController.m in Sources */,
                                07B19A8615B99E4A00E6D316 /* ShowViewController.m in Sources */,
@@ -507,12 +552,27 @@
                                07B19AAE15B99F6E00E6D316 /* CreateInteractionChoiceSetViewController.m in Sources */,
                                07B19AB315B99F8500E6D316 /* DeleteInteractionChoiceSetViewController.m in Sources */,
                                07B19AB815B99F9500E6D316 /* PerformInteractionViewController.m in Sources */,
-                               07B19AC215B99FBD00E6D316 /* EncodedSyncPDataViewController.m in Sources */,
                                07B19AC715B99FDE00E6D316 /* UnsubscribeButtonViewController.m in Sources */,
                                07B19ACC15B99FEF00E6D316 /* SetGlobalPropertiesViewController.m in Sources */,
                                07B19AD115B9A00900E6D316 /* ResetGlobalPropertiesViewController.m in Sources */,
                                07C7E11915B9A5940035681D /* SubscribeButtonViewController.m in Sources */,
                                077869AC15C01C0000FE9390 /* AddMenuOption.m in Sources */,
+                               593D2F11171BDC5E00CE1502 /* SliderViewController.m in Sources */,
+                               593D2F16171BDCB200CE1502 /* ScrollableMessageViewController.m in Sources */,
+                               593D2F1B171BDCEA00CE1502 /* ChangeRegistrationViewController.m in Sources */,
+                               593D2F2F171BDDFC00CE1502 /* SetAppIconViewController.m in Sources */,
+                               593D2F34171BDE3200CE1502 /* PerformAudioPassThruViewController.m in Sources */,
+                               593D2F39171BDE6A00CE1502 /* EndAudioPassThruViewController.m in Sources */,
+                               593D2F48171BDF1B00CE1502 /* ReadDIDViewController.m in Sources */,
+                               593469AE171BE2D0003233E2 /* GetDTCsViewController.m in Sources */,
+                               593469B5171BE301003233E2 /* ShowConstantTBTViewController.m in Sources */,
+                               593469BA171BE331003233E2 /* AlertManeuverViewController.m in Sources */,
+                               593469BF171BE38C003233E2 /* UpdateTurnListViewController.m in Sources */,
+                               594B370B171C39F000F1E0AC /* SubscribeVehicleDataViewController.m in Sources */,
+                               59A6B393171C74A40064A469 /* SoftButtonListViewController.m in Sources */,
+                               5966E9DC171C9D3900C3DE45 /* SoftButtonEditViewController.m in Sources */,
+                               59232EAE172182DE004AE3CE /* UnsubscribeVehicleDataViewController.m in Sources */,
+                               59EC682F1721C0B60065FE88 /* GetVehicleDataViewController.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -554,6 +614,7 @@
                                GCC_WARN_UNINITIALIZED_AUTOS = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+                               PRODUCT_NAME = "";
                                SDKROOT = iphoneos;
                        };
                        name = Debug;
@@ -576,6 +637,7 @@
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                IPHONEOS_DEPLOYMENT_TARGET = 5.0;
                                OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
+                               PRODUCT_NAME = "";
                                SDKROOT = iphoneos;
                                VALIDATE_PRODUCT = YES;
                        };
@@ -586,15 +648,16 @@
                        buildSettings = {
                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                CODE_SIGN_IDENTITY = "iPhone Developer";
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "\"$(SRCROOT)/..\"/**",
+                               );
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = "SmartDeviceLinkTester/SmartDeviceLinkTester-Prefix.pch";
-                               HEADER_SEARCH_PATHS = "../SmartDeviceLinkProxy/**";
+                               HEADER_SEARCH_PATHS = "";
                                INFOPLIST_FILE = "SmartDeviceLinkTester/SmartDeviceLinkTester-Info.plist";
                                IPHONEOS_DEPLOYMENT_TARGET = 5.0;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SRCROOT)/..\"",
-                               );
+                               LIBRARY_SEARCH_PATHS = "$(inherited)";
                                OTHER_LDFLAGS = "-all_load";
                                PRODUCT_NAME = SDLTester;
                                PROVISIONING_PROFILE = "";
@@ -607,15 +670,16 @@
                        buildSettings = {
                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                CODE_SIGN_IDENTITY = "iPhone Developer";
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "\"$(SRCROOT)/..\"/**",
+                               );
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = "SmartDeviceLinkTester/SmartDeviceLinkTester-Prefix.pch";
-                               HEADER_SEARCH_PATHS = "../SmartDeviceLinkProxy/**";
+                               HEADER_SEARCH_PATHS = "";
                                INFOPLIST_FILE = "SmartDeviceLinkTester/SmartDeviceLinkTester-Info.plist";
                                IPHONEOS_DEPLOYMENT_TARGET = 5.0;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SRCROOT)/..\"",
-                               );
+                               LIBRARY_SEARCH_PATHS = "$(inherited)";
                                OTHER_LDFLAGS = "-all_load";
                                PRODUCT_NAME = SDLTester;
                                PROVISIONING_PROFILE = "";

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddCommandViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddCommandViewController.h
index d68d473..b120988 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddCommandViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddCommandViewController.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  AddCommandViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
+#import "SmartDeviceLinkTester.h"
 #import "AddMenuOption.h"
 
 @interface AddCommandViewController : UIViewController <UITextFieldDelegate> {
@@ -12,12 +12,13 @@
     IBOutlet UITextField *addVRText;
     IBOutlet UITextField *parentIDText;
     IBOutlet UITextField *positionText;
+    IBOutlet UITextField *iconText;
     
-   
-    
+    IBOutlet UISegmentedControl *iconControl;
+
 }
 
--(IBAction)addCommandPressed:(id)sender;
+-(IBAction)sendRPC:(id)sender;
 
 @end
 

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddCommandViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddCommandViewController.m
index 9712c2a..8852895 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddCommandViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddCommandViewController.m
@@ -1,8 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  AddCommandViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "AddCommandViewController.h"
+#import "AppDelegate.h"
 
 @interface AddCommandViewController ()
 
@@ -11,18 +12,16 @@
 @implementation AddCommandViewController
 
 
--(IBAction)addCommandPressed:(id)sender {
+-(IBAction)sendRPC:(id)sender{
   
     NSArray *voiceCommand = nil;
     NSString *menuName = nil;
     NSString *menuNameTable = nil;
     if ([[menuNameText text] isEqualToString:@""]) {
-        [SDLDebugTool logInfo:@"menuNameText is empty"];
         menuNameTable = [[NSString stringWithFormat:@"[%@]", [addVRText text]] retain];
      
     }
     else {
-        [SDLDebugTool logInfo:@"menuNameText contains text"];
         menuName = [menuNameText text];
         menuNameTable = menuName;
     }
@@ -41,20 +40,38 @@
         position = [NSNumber numberWithInt:[[positionText text] intValue]];
     }
     
-    [SDLDebugTool logInfo:@"cmdID = %d", [[SDLBrain getInstance] getCMDID]];
+    [commandsIssued addObject:[[[AddMenuOption alloc] initWithMenuName:menuNameTable menuId:[NSNumber numberWithInt:[[SmartDeviceLinkTester getInstance] getCmdID]]] autorelease]];
     
-    [commandsIssued addObject:[[[AddMenuOption alloc] initWithMenuName:menuNameTable menuId:[NSNumber numberWithInt:[[SDLBrain getInstance] getCMDID]]] autorelease]];
-    
-    [SDLDebugTool logInfo:@"Added %@ to commandsIssued",[[commandsIssued lastObject] menuName]];
-    
-    [SDLDebugTool logInfo:@"Is index number %d",[commandsIssued indexOfObject:[commandsIssued lastObject]]];
-    
-    [[SDLBrain getInstance] addAdvancedCommandPressedwithMenuName:menuName position:position parentID:parentID vrCommands:voiceCommand];
+    if (iconControl.selectedSegmentIndex == 0) {
+        SDLAddCommand *req = [SDLRPCRequestFactory buildAddCommandWithID:[NSNumber numberWithInt:[[SmartDeviceLinkTester getInstance] getCmdID]] menuName:menuName parentID:parentID position:position vrCommands:voiceCommand iconValue:[iconText text] iconType:nil correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+        
+        [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+
+    }
+    else if (iconControl.selectedSegmentIndex == 1) {
+        SDLAddCommand *req = [SDLRPCRequestFactory buildAddCommandWithID:[NSNumber numberWithInt:[[SmartDeviceLinkTester getInstance] getCmdID]] menuName:menuName parentID:parentID position:position vrCommands:voiceCommand iconValue:[iconText text] iconType:[SDLImageType STATIC] correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+        
+        [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+        
+    }
+    else {
+        SDLAddCommand *req = [SDLRPCRequestFactory buildAddCommandWithID:[NSNumber numberWithInt:[[SmartDeviceLinkTester getInstance] getCmdID]] menuName:menuName parentID:parentID position:position vrCommands:voiceCommand iconValue:[iconText text] iconType:[SDLImageType DYNAMIC] correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+        
+        [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+
+    }
     
-    [SDLDebugTool logInfo:@"sent to Sync"];
+    [[SmartDeviceLinkTester getInstance] incCmdID];
     
     [menuNameText setText:@""];
     [addVRText setText:@""];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
 }
 
 
@@ -83,6 +100,7 @@
     addVRText.delegate = self;
     parentIDText.delegate = self;
     positionText.delegate = self;
+    iconText.delegate = self;
 }
 
 -(void) dealloc {

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddCommandViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddCommandViewController.xib
index 47c3a5b..73fb7ca 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddCommandViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddCommandViewController.xib
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
-                       <string>IBUITextField</string>
+                       <string>IBProxyObject</string>
                        <string>IBUIButton</string>
-                       <string>IBUIView</string>
                        <string>IBUILabel</string>
-                       <string>IBProxyObject</string>
+                       <string>IBUISegmentedControl</string>
+                       <string>IBUITextField</string>
+                       <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -40,7 +41,7 @@
                                        <object class="IBUILabel" id="736889432">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 25}, {93, 21}}</string>
+                                               <string key="NSFrame">{{13, 25}, {129, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="873092498"/>
@@ -50,10 +51,11 @@
                                                <int key="IBUIContentMode">7</int>
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Menu Name</string>
+                                               <string key="IBUIText">Commad Name: </string>
                                                <object class="NSColor" key="IBUITextColor" id="626908465">
                                                        <int key="NSColorSpace">1</int>
                                                        <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
                                                </object>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
@@ -62,8 +64,8 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">17</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="380444370">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="343741308">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">17</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -71,16 +73,16 @@
                                        <object class="IBUITextField" id="873092498">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{128, 20}, {172, 31}}</string>
+                                               <string key="NSFrame">{{141, 20}, {164, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="864442179"/>
+                                               <reference key="NSNextKeyView" ref="204151666"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">Command 1</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -98,8 +100,8 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">14</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="215003309">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="962475265">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">14</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -107,31 +109,31 @@
                                        <object class="IBUILabel" id="1024830825">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{33, 173}, {67, 21}}</string>
+                                               <string key="NSFrame">{{13, 173}, {75, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView"/>
+                                               <reference key="NSNextKeyView" ref="238950684"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <int key="IBUIContentMode">7</int>
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Position:</string>
+                                               <string key="IBUIText">Position #</string>
                                                <reference key="IBUITextColor" ref="626908465"/>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="117005730"/>
-                                               <reference key="IBUIFont" ref="380444370"/>
+                                               <reference key="IBUIFont" ref="343741308"/>
                                        </object>
                                        <object class="IBUITextField" id="354688449">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{128, 70}, {172, 31}}</string>
+                                               <string key="NSFrame">{{141, 70}, {164, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="593185263"/>
+                                               <reference key="NSNextKeyView" ref="17132919"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
@@ -150,7 +152,7 @@
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="581447106"/>
-                                               <reference key="IBUIFont" ref="215003309"/>
+                                               <reference key="IBUIFont" ref="962475265"/>
                                        </object>
                                        <object class="IBUILabel" id="864442179">
                                                <reference key="NSNextResponder" ref="191373211"/>
@@ -171,7 +173,7 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="117005730"/>
-                                               <reference key="IBUIFont" ref="380444370"/>
+                                               <reference key="IBUIFont" ref="343741308"/>
                                        </object>
                                        <object class="IBUILabel" id="307658069">
                                                <reference key="NSNextResponder" ref="191373211"/>
@@ -179,7 +181,7 @@
                                                <string key="NSFrame">{{28, 66}, {77, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="204151666"/>
+                                               <reference key="NSNextKeyView" ref="354688449"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
@@ -192,33 +194,33 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="117005730"/>
-                                               <reference key="IBUIFont" ref="380444370"/>
+                                               <reference key="IBUIFont" ref="343741308"/>
                                        </object>
                                        <object class="IBUILabel" id="204151666">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{29, 76}, {74, 20}}</string>
+                                               <string key="NSFrame">{{13, 76}, {104, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="354688449"/>
+                                               <reference key="NSNextKeyView" ref="593185263"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <int key="IBUIContentMode">7</int>
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">VR Name</string>
+                                               <string key="IBUIText">VR Synonym:</string>
                                                <reference key="IBUITextColor" ref="626908465"/>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="117005730"/>
-                                               <reference key="IBUIFont" ref="380444370"/>
+                                               <reference key="IBUIFont" ref="343741308"/>
                                        </object>
                                        <object class="IBUIButton" id="988233791">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{112, 234}, {97, 37}}</string>
+                                               <string key="NSFrame">{{112, 319}, {97, 37}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
@@ -227,15 +229,15 @@
                                                <int key="IBUIContentHorizontalAlignment">0</int>
                                                <int key="IBUIContentVerticalAlignment">0</int>
                                                <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
                                                <object class="NSColor" key="IBUIHighlightedTitleColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MQA</bytes>
                                                </object>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
                                                <object class="NSColor" key="IBUINormalTitleShadowColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MC41AA</bytes>
@@ -245,7 +247,7 @@
                                                        <double key="pointSize">15</double>
                                                </object>
                                                <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica-Bold</string>
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
                                                        <double key="NSSize">15</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -253,29 +255,29 @@
                                        <object class="IBUILabel" id="593185263">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 122}, {93, 21}}</string>
+                                               <string key="NSFrame">{{13, 122}, {117, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="17132919"/>
+                                               <reference key="NSNextKeyView" ref="864442179"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <int key="IBUIContentMode">7</int>
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Parent ID</string>
+                                               <string key="IBUIText">Add To Menu #</string>
                                                <reference key="IBUITextColor" ref="626908465"/>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <int key="IBUITextAlignment">1</int>
                                                <reference key="IBUIFontDescription" ref="117005730"/>
-                                               <reference key="IBUIFont" ref="380444370"/>
+                                               <reference key="IBUIFont" ref="343741308"/>
                                        </object>
                                        <object class="IBUITextField" id="17132919">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{128, 117}, {172, 31}}</string>
+                                               <string key="NSFrame">{{141, 117}, {164, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="1024830825"/>
@@ -284,7 +286,7 @@
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">0</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -297,20 +299,21 @@
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="581447106"/>
-                                               <reference key="IBUIFont" ref="215003309"/>
+                                               <reference key="IBUIFont" ref="962475265"/>
                                        </object>
                                        <object class="IBUITextField" id="238950684">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{128, 168}, {172, 31}}</string>
+                                               <string key="NSFrame">{{141, 168}, {164, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="547930122"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">0</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -323,7 +326,94 @@
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="581447106"/>
-                                               <reference key="IBUIFont" ref="215003309"/>
+                                               <reference key="IBUIFont" ref="962475265"/>
+                                       </object>
+                                       <object class="IBUITextField" id="1024320701">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{93, 250}, {212, 30}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="988233791"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">9</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="937681417"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="581447106"/>
+                                               <reference key="IBUIFont" ref="962475265"/>
+                                       </object>
+                                       <object class="IBUISegmentedControl" id="860092719">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{93, 218}, {212, 30}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="1024320701"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBSegmentControlStyle">2</int>
+                                               <int key="IBNumberOfSegments">3</int>
+                                               <int key="IBSelectedSegmentIndex">1</int>
+                                               <array key="IBSegmentTitles">
+                                                       <string>None</string>
+                                                       <string>Static</string>
+                                                       <string>Dynamic</string>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentWidths">
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentEnabledStates">
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentContentOffsets">
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentImages">
+                                                       <object class="NSNull" id="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                               </array>
+                                       </object>
+                                       <object class="IBUILabel" id="547930122">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{26, 236}, {54, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="860092719"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Icon:</string>
+                                               <reference key="IBUITextColor" ref="626908465"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <reference key="IBUIFontDescription" ref="117005730"/>
+                                               <reference key="IBUIFont" ref="343741308"/>
+                                               <bool key="IBUIAdjustsFontSizeToFit">NO</bool>
                                        </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
@@ -343,6 +433,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -350,7 +441,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -358,7 +449,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="354688449"/>
                                        </object>
-                                       <int key="connectionID">13</int>
+                                       <string key="id">13</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -366,7 +457,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="873092498"/>
                                        </object>
-                                       <int key="connectionID">14</int>
+                                       <string key="id">14</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -374,7 +465,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="17132919"/>
                                        </object>
-                                       <int key="connectionID">24</int>
+                                       <string key="id">24</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -382,28 +473,44 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="238950684"/>
                                        </object>
-                                       <int key="connectionID">26</int>
+                                       <string key="id">26</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">iconControl</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="860092719"/>
+                                       </object>
+                                       <string key="id">31</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">iconText</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="1024320701"/>
+                                       </object>
+                                       <string key="id">32</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">addCommandPressed:</string>
+                                               <string key="label">sendRPC:</string>
                                                <reference key="source" ref="988233791"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">17</int>
+                                       <string key="id">33</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="864442179"/>
@@ -417,75 +524,93 @@
                                                        <reference ref="204151666"/>
                                                        <reference ref="1024830825"/>
                                                        <reference ref="238950684"/>
+                                                       <reference ref="860092719"/>
+                                                       <reference ref="1024320701"/>
+                                                       <reference ref="547930122"/>
                                                </array>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
+                                               <string key="id">4</string>
                                                <reference key="object" ref="736889432"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
+                                               <string key="id">5</string>
                                                <reference key="object" ref="873092498"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">7</int>
+                                               <string key="id">7</string>
                                                <reference key="object" ref="1024830825"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">8</int>
+                                               <string key="id">8</string>
                                                <reference key="object" ref="354688449"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">9</int>
+                                               <string key="id">9</string>
                                                <reference key="object" ref="864442179"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">10</int>
+                                               <string key="id">10</string>
                                                <reference key="object" ref="307658069"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">11</int>
+                                               <string key="id">11</string>
                                                <reference key="object" ref="204151666"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">12</int>
+                                               <string key="id">12</string>
                                                <reference key="object" ref="988233791"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">22</int>
+                                               <string key="id">22</string>
                                                <reference key="object" ref="593185263"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">23</int>
+                                               <string key="id">23</string>
                                                <reference key="object" ref="17132919"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">25</int>
+                                               <string key="id">25</string>
                                                <reference key="object" ref="238950684"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">28</string>
+                                               <reference key="object" ref="1024320701"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">29</string>
+                                               <reference key="object" ref="860092719"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">30</string>
+                                               <reference key="object" ref="547930122"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
                                </array>
                        </object>
                        <dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -500,6 +625,10 @@
                                <string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="25.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="29.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <integer value="0" key="29.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/>
+                               <string key="30.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -510,7 +639,6 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">26</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -518,18 +646,20 @@
                                        <string key="className">AddCommandViewController</string>
                                        <string key="superclassName">UIViewController</string>
                                        <object class="NSMutableDictionary" key="actions">
-                                               <string key="NS.key.0">addCommandPressed:</string>
+                                               <string key="NS.key.0">sendRPC:</string>
                                                <string key="NS.object.0">id</string>
                                        </object>
                                        <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">addCommandPressed:</string>
+                                               <string key="NS.key.0">sendRPC:</string>
                                                <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">addCommandPressed:</string>
+                                                       <string key="name">sendRPC:</string>
                                                        <string key="candidateClassName">id</string>
                                                </object>
                                        </object>
                                        <dictionary class="NSMutableDictionary" key="outlets">
                                                <string key="addVRText">UITextField</string>
+                                               <string key="iconControl">UISegmentedControl</string>
+                                               <string key="iconText">UITextField</string>
                                                <string key="menuNameText">UITextField</string>
                                                <string key="parentIDText">UITextField</string>
                                                <string key="positionText">UITextField</string>
@@ -539,6 +669,14 @@
                                                        <string key="name">addVRText</string>
                                                        <string key="candidateClassName">UITextField</string>
                                                </object>
+                                               <object class="IBToOneOutletInfo" key="iconControl">
+                                                       <string key="name">iconControl</string>
+                                                       <string key="candidateClassName">UISegmentedControl</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="iconText">
+                                                       <string key="name">iconText</string>
+                                                       <string key="candidateClassName">UITextField</string>
+                                               </object>
                                                <object class="IBToOneOutletInfo" key="menuNameText">
                                                        <string key="name">menuNameText</string>
                                                        <string key="candidateClassName">UITextField</string>
@@ -561,12 +699,17 @@
                </object>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddMenuOption.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddMenuOption.h
index 47858bd..b4cc113 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddMenuOption.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddMenuOption.h
@@ -1,6 +1,6 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  AddMenuOption.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <Foundation/Foundation.h>
 

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddMenuOption.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddMenuOption.m
index 70f23a2..c41b4e1 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddMenuOption.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddMenuOption.m
@@ -1,6 +1,6 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  AddMenuOption.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "AddMenuOption.h"
 

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddSubMenuViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddSubMenuViewController.h
index 7b83ec8..abb8258 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddSubMenuViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddSubMenuViewController.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  AddSubMenuViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
+#import "SmartDeviceLinkTester.h"
 #import "AddMenuOption.h"
 
 @interface AddSubMenuViewController : UIViewController <UITextFieldDelegate> {
@@ -16,7 +16,7 @@
 }
 
 -(IBAction)displayPositionSlider:(id)sender;
--(IBAction)addSubMenuPressed:(id)sender;
+-(IBAction)sendRPC:(id)sender;
 
 @end
 

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddSubMenuViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddSubMenuViewController.m
index 87d72a1..c724c98 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddSubMenuViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddSubMenuViewController.m
@@ -1,8 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  AddSubMenuViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "AddSubMenuViewController.h"
+#import "AppDelegate.h"
 
 @interface AddSubMenuViewController ()
 
@@ -19,11 +20,18 @@
     return NO;
 }
 
--(IBAction)addSubMenuPressed:(id)sender {
+-(IBAction)sendRPC:(id)sender {
     
     [subMenuIssued addObject:[[AddMenuOption alloc] initWithMenuName:[menuNameText text] menuId:[NSNumber numberWithInt:[[menuIDText text] intValue]]]];
     
-    [[SDLBrain getInstance] addSubMenuPressedwithID:[NSNumber numberWithInt:[[menuIDText text] intValue]] menuName:[menuNameText text] position:[NSNumber numberWithDouble:round([positionSlider value])]];
+    [[SmartDeviceLinkTester getInstance] addSubMenuPressedwithID:[NSNumber numberWithInt:[[menuIDText text] intValue]] menuName:[menuNameText text] position:[NSNumber numberWithDouble:round([positionSlider value])]];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
 }
 
 

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddSubMenuViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddSubMenuViewController.xib
index 43f3e0b..a771cbe 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddSubMenuViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AddSubMenuViewController.xib
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
-                       <string>IBUITextField</string>
-                       <string>IBUISlider</string>
+                       <string>IBProxyObject</string>
                        <string>IBUIButton</string>
-                       <string>IBUIView</string>
                        <string>IBUILabel</string>
-                       <string>IBProxyObject</string>
+                       <string>IBUISlider</string>
+                       <string>IBUITextField</string>
+                       <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -35,15 +35,14 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="IBUILabel" id="1039241821">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 34}, {93, 21}}</string>
+                                               <string key="NSFrame">{{20, 34}, {123, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="607867175"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -51,10 +50,11 @@
                                                <int key="IBUIContentMode">7</int>
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Menu Name</string>
+                                               <string key="IBUIText">Submenu Name</string>
                                                <object class="NSColor" key="IBUITextColor" id="305368035">
                                                        <int key="NSColorSpace">1</int>
                                                        <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
                                                </object>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
@@ -63,8 +63,8 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">17</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="1027099400">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="775912404">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">17</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -72,16 +72,15 @@
                                        <object class="IBUITextField" id="607867175">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{128, 29}, {172, 31}}</string>
+                                               <string key="NSFrame">{{151, 29}, {149, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="287527532"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">Menu1</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -99,8 +98,8 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">14</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="473222855">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="26693325">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">14</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -110,7 +109,6 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{20, 87}, {93, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="347130499"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -124,21 +122,20 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="855957930"/>
-                                               <reference key="IBUIFont" ref="1027099400"/>
+                                               <reference key="IBUIFont" ref="775912404"/>
                                        </object>
                                        <object class="IBUITextField" id="347130499">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{128, 82}, {172, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="381413275"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">1</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -151,14 +148,13 @@
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="641742293"/>
-                                               <reference key="IBUIFont" ref="473222855"/>
+                                               <reference key="IBUIFont" ref="26693325"/>
                                        </object>
                                        <object class="IBUISlider" id="423709001">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{169, 144}, {118, 23}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="93740174"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -172,7 +168,6 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{36, 143}, {67, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="797397516"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -186,14 +181,13 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="855957930"/>
-                                               <reference key="IBUIFont" ref="1027099400"/>
+                                               <reference key="IBUIFont" ref="775912404"/>
                                        </object>
                                        <object class="IBUILabel" id="797397516">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{115, 144}, {42, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="423709001"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -207,29 +201,28 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="855957930"/>
-                                               <reference key="IBUIFont" ref="1027099400"/>
+                                               <reference key="IBUIFont" ref="775912404"/>
                                        </object>
                                        <object class="IBUIButton" id="93740174">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{112, 235}, {97, 37}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentHorizontalAlignment">0</int>
                                                <int key="IBUIContentVerticalAlignment">0</int>
                                                <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
                                                <object class="NSColor" key="IBUIHighlightedTitleColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MQA</bytes>
                                                </object>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
                                                <object class="NSColor" key="IBUINormalTitleShadowColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MC41AA</bytes>
@@ -239,15 +232,13 @@
                                                        <double key="pointSize">15</double>
                                                </object>
                                                <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica-Bold</string>
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
                                                        <double key="NSSize">15</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <reference key="NSNextKeyView" ref="1039241821"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
@@ -262,6 +253,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -269,7 +261,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -277,7 +269,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="347130499"/>
                                        </object>
-                                       <int key="connectionID">16</int>
+                                       <string key="id">16</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -285,7 +277,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="607867175"/>
                                        </object>
-                                       <int key="connectionID">17</int>
+                                       <string key="id">17</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -293,7 +285,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="797397516"/>
                                        </object>
-                                       <int key="connectionID">18</int>
+                                       <string key="id">18</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -301,7 +293,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="423709001"/>
                                        </object>
-                                       <int key="connectionID">19</int>
+                                       <string key="id">19</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
@@ -310,28 +302,28 @@
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">13</int>
                                        </object>
-                                       <int key="connectionID">21</int>
+                                       <string key="id">21</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">addSubMenuPressed:</string>
+                                               <string key="label">sendRPC:</string>
                                                <reference key="source" ref="93740174"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">20</int>
+                                       <string key="id">22</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="1039241821"/>
@@ -346,53 +338,53 @@
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
+                                               <string key="id">5</string>
                                                <reference key="object" ref="1039241821"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
+                                               <string key="id">6</string>
                                                <reference key="object" ref="607867175"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">7</int>
+                                               <string key="id">7</string>
                                                <reference key="object" ref="287527532"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">8</int>
+                                               <string key="id">8</string>
                                                <reference key="object" ref="347130499"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">12</int>
+                                               <string key="id">12</string>
                                                <reference key="object" ref="423709001"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">13</int>
+                                               <string key="id">13</string>
                                                <reference key="object" ref="381413275"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">14</int>
+                                               <string key="id">14</string>
                                                <reference key="object" ref="797397516"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">15</int>
+                                               <string key="id">15</string>
                                                <reference key="object" ref="93740174"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
@@ -417,66 +409,21 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">21</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">AddSubMenuViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <dictionary class="NSMutableDictionary" key="actions">
-                                               <string key="addSubMenuPressed:">id</string>
-                                               <string key="displayPositionSlider:">id</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="actionInfosByName">
-                                               <object class="IBActionInfo" key="addSubMenuPressed:">
-                                                       <string key="name">addSubMenuPressed:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                               <object class="IBActionInfo" key="displayPositionSlider:">
-                                                       <string key="name">displayPositionSlider:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="outlets">
-                                               <string key="menuIDText">UITextField</string>
-                                               <string key="menuNameText">UITextField</string>
-                                               <string key="positionLabel">UILabel</string>
-                                               <string key="positionSlider">UISlider</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <object class="IBToOneOutletInfo" key="menuIDText">
-                                                       <string key="name">menuIDText</string>
-                                                       <string key="candidateClassName">UITextField</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="menuNameText">
-                                                       <string key="name">menuNameText</string>
-                                                       <string key="candidateClassName">UITextField</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="positionLabel">
-                                                       <string key="name">positionLabel</string>
-                                                       <string key="candidateClassName">UILabel</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="positionSlider">
-                                                       <string key="name">positionSlider</string>
-                                                       <string key="candidateClassName">UISlider</string>
-                                               </object>
-                                       </dictionary>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/AddSubMenuViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertManeuverViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertManeuverViewController.h
new file mode 100644 (file)
index 0000000..0f9ffb1
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertManeuverViewController.h
@@ -0,0 +1,22 @@
+//  AlertManeuverViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+#import "SoftButtonListViewController.h"
+
+@interface AlertManeuverViewController : UIViewController <UITextViewDelegate> {
+ 
+    IBOutlet UITextView *ttsView;
+    
+    SoftButtonListViewController *softButtonListViewController;
+    
+    NSMutableArray *sbList;
+
+}
+
+-(IBAction)sendRPC:(id)sender;
+-(IBAction)softButtons:(id)sender;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertManeuverViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertManeuverViewController.m
new file mode 100644 (file)
index 0000000..01a685c
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertManeuverViewController.m
@@ -0,0 +1,90 @@
+//  AlertManeuverViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "AlertManeuverViewController.h"
+#import "AppDelegate.h"
+
+@implementation AlertManeuverViewController
+
+-(IBAction)sendRPC:(id)sender
+{
+    SDLAlertManeuver *req = [SDLRPCRequestFactory buildAlertManeuverWithTTSChunks:[[ttsView text] componentsSeparatedByString:@", "] softButtons:sbList correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+}
+
+- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
+    
+    if([text isEqualToString:@"\n"]) {
+        [textView resignFirstResponder];
+        return NO;
+    }
+    
+    return YES;
+}
+
+-(IBAction)softButtons:(id)sender {
+    [softButtonListViewController updateList:sbList];
+    [self.navigationController pushViewController:softButtonListViewController animated:YES];
+}
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"AlertManeuver";
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+        softButtonListViewController = [[SoftButtonListViewController alloc] initWithNibName:@"SoftButtonListViewController" bundle:nil];
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    ttsView.delegate = self;
+    
+    [[ttsView layer] setCornerRadius:10];
+    
+    //Example Soft Buttons
+    SDLSoftButton *sb1 = [[[SDLSoftButton alloc] init] autorelease];
+    sb1.softButtonID = [NSNumber numberWithInt:5509];
+    sb1.text = @"Reply";
+    sb1.type = [SDLSoftButtonType TEXT];
+    sb1.isHighlighted = [NSNumber numberWithBool:false];
+    sb1.systemAction = [SDLSystemAction STEAL_FOCUS];
+    
+    SDLSoftButton *sb2 = [[[SDLSoftButton alloc] init] autorelease];
+    sb2.softButtonID = [NSNumber numberWithInt:5510];
+    sb2.text = @"Close";
+    sb2.type = [SDLSoftButtonType TEXT];
+    sb2.isHighlighted = [NSNumber numberWithBool:false];
+    sb2.systemAction = [SDLSystemAction DEFAULT_ACTION];
+    
+    sbList = [[NSMutableArray alloc] initWithObjects:sb1,sb2,nil];
+    
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertManeuverViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertManeuverViewController.xib
new file mode 100644 (file)
index 0000000..1809dd7
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertManeuverViewController.xib
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       <string key="NS.object.0">3742</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUIButton</string>
+                       <string>IBUILabel</string>
+                       <string>IBUITextView</string>
+                       <string>IBUIView</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <object class="IBProxyObject" id="372490531">
+                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBProxyObject" id="975951072">
+                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBUIView" id="191373211">
+                               <nil key="NSNextResponder"/>
+                               <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUIButton" id="496830156">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{112, 310}, {97, 37}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <object class="NSColor" key="IBUINormalTitleColor" id="672866254">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
+                                               <object class="NSColor" key="IBUIHighlightedTitleColor" id="558694624">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MQA</bytes>
+                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleShadowColor" id="633481866">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MC41AA</bytes>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="748156101">
+                                                       <int key="type">2</int>
+                                                       <double key="pointSize">15</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="846676690">
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
+                                                       <double key="NSSize">15</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUIButton" id="162665082">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{106, 202}, {99, 36}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="496830156"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <reference key="IBUINormalTitleColor" ref="672866254"/>
+                                               <reference key="IBUIHighlightedTitleColor" ref="558694624"/>
+                                               <string key="IBUINormalTitle">Soft Buttons</string>
+                                               <reference key="IBUINormalTitleShadowColor" ref="633481866"/>
+                                               <reference key="IBUIFontDescription" ref="748156101"/>
+                                               <reference key="IBUIFont" ref="846676690"/>
+                                       </object>
+                                       <object class="IBUILabel" id="62928623">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 50}, {90, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="729252625"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">TTSChunks</string>
+                                               <object class="NSColor" key="IBUITextColor" id="83775735">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
+                                               </object>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">17</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">17</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUITextView" id="119432485">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 88}, {280, 82}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="162665082"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <object class="NSColor" key="IBUIBackgroundColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MSAxIDEAA</bytes>
+                                               </object>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <bool key="IBUIMultipleTouchEnabled">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">TTSChunk1, TTSChunk2, AnotherTTSChunk</string>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIAutocapitalizationType">2</int>
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">14</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">14</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUILabel" id="729252625">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 66}, {270, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="119432485"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Enter chunks separated by comma</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">13</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">13</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                               </array>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
+                               <reference key="NSNextKeyView" ref="62928623"/>
+                               <object class="NSColor" key="IBUIBackgroundColor">
+                                       <int key="NSColorSpace">1</int>
+                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                               </object>
+                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
+                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="191373211"/>
+                                       </object>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">ttsView</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="119432485"/>
+                                       </object>
+                                       <string key="id">32</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="496830156"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">31</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">softButtons:</string>
+                                               <reference key="source" ref="162665082"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">33</string>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <string key="id">0</string>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="191373211"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="496830156"/>
+                                                       <reference ref="62928623"/>
+                                                       <reference ref="119432485"/>
+                                                       <reference ref="729252625"/>
+                                                       <reference ref="162665082"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="372490531"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="975951072"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">17</string>
+                                               <reference key="object" ref="496830156"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">26</string>
+                                               <reference key="object" ref="162665082"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">27</string>
+                                               <reference key="object" ref="62928623"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">28</string>
+                                               <reference key="object" ref="119432485"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">29</string>
+                                               <reference key="object" ref="729252625"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.CustomClassName">AlertManeuverViewController</string>
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="-2.CustomClassName">UIResponder</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="29.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
+       </data>
+</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertViewController.h
index 6fd4fe7..2a30c02 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertViewController.h
@@ -1,25 +1,33 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  AlertViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
-#import "SDLTTSChunkFactory.h"
+#import <SmartDeviceLink/SmartDeviceLink.h>
+
+#import "SmartDeviceLinkTester.h"
+#import "SoftButtonListViewController.h"
 
 @interface AlertViewController : UIViewController <UITextFieldDelegate, UITextViewDelegate> {
     
     IBOutlet UITextView *ttsView;
     IBOutlet UITextField *line1Text;
     IBOutlet UITextField *line2Text;
+    IBOutlet UITextField *line3Text;
     IBOutlet UISwitch *toneSwitch;
+    IBOutlet UISwitch *sbSwitch;
     
     IBOutlet UILabel *durationLabel;
     IBOutlet UISlider *durationSlider;
     
+    SoftButtonListViewController *softButtonListViewController;
+    
+    NSMutableArray *sbList;
 }
 
--(IBAction)alertPressed:(id)sender;
+-(IBAction)sendRPC:(id)sender;
 -(IBAction)displayDurationSlider:(id)sender;
+-(IBAction)softButtons:(id)sender;
 
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertViewController.m
index a7da1dd..3bf3b4c 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertViewController.m
@@ -1,16 +1,13 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  AlertViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "AlertViewController.h"
-
-@interface AlertViewController ()
-
-@end
+#import "AppDelegate.h"
 
 @implementation AlertViewController
 
--(IBAction)alertPressed:(id)sender {
+-(IBAction)sendRPC:(id)sender {
     
     NSString *ttsstring = [ttsView text];
     NSArray *temp = [ttsstring componentsSeparatedByString:@", "];
@@ -18,10 +15,31 @@
     for (int i = 0; i < [temp count]; i++) {
         [ttschunks addObject:[SDLTTSChunkFactory buildTTSChunkForString:[temp objectAtIndex:i] type:[SDLSpeechCapabilities TEXT]]];
     }
- 
-    [[SDLBrain getInstance] alertAdvancedPressedwithTTSChunks:ttschunks alertText1:[line1Text text] alertText2:[line2Text text] playTone:[NSNumber numberWithBool:[toneSwitch isOn]] duration:[NSNumber numberWithDouble:(round([durationSlider value])*1000)]];
+    
+    if (sbSwitch.isOn) {
+        SDLAlert *req = [SDLRPCRequestFactory buildAlertWithTTSChunks:ttschunks alertText1:[line1Text text] alertText2:[line2Text text] alertText3:[line3Text text] playTone:[NSNumber numberWithBool:[toneSwitch isOn]] duration:[NSNumber numberWithDouble:(round([durationSlider value])*1000)] softButtons:sbList correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+        
+        [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    }
+    else {
+        SDLAlert *req = [SDLRPCRequestFactory buildAlertWithTTSChunks:ttschunks alertText1:[line1Text text] alertText2:[line2Text text] alertText3:[line3Text text] playTone:[NSNumber numberWithBool:[toneSwitch isOn]] duration:[NSNumber numberWithDouble:(round([durationSlider value])*1000)] softButtons:nil correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+        
+        [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    }
     
     [ttschunks release];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+}
+
+-(IBAction)softButtons:(id)sender {
+    [softButtonListViewController updateList:sbList];
+    [self.navigationController pushViewController:softButtonListViewController animated:YES];
 }
 
 -(IBAction)displayDurationSlider:(id)sender {
@@ -51,6 +69,7 @@
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
     if (self) {
         // Custom initialization
+        softButtonListViewController = [[SoftButtonListViewController alloc] initWithNibName:@"SoftButtonListViewController" bundle:nil];
     }
     return self;
 }
@@ -61,6 +80,7 @@
     ttsView.delegate = self;
     line1Text.delegate = self;
     line2Text.delegate = self;
+    line3Text.delegate = self;
     
     [[ttsView layer] setCornerRadius:10];
     
@@ -68,6 +88,26 @@
     durationSlider.maximumValue = 10;
     [durationSlider setValue:5];
     durationLabel.text = @"5";
+        
+    //Example Soft Buttons
+    SDLSoftButton *sb1 = [[[SDLSoftButton alloc] init] autorelease];
+    sb1.softButtonID = [NSNumber numberWithInt:5500];
+    sb1.text = @"One";
+    sb1.image = [[[SDLImage alloc] init] autorelease];
+    sb1.image.imageType = [SDLImageType STATIC];
+    sb1.image.value = @"9";
+    sb1.type = [SDLSoftButtonType BOTH];
+    sb1.isHighlighted = [NSNumber numberWithBool:false];
+    sb1.systemAction = [SDLSystemAction KEEP_CONTEXT];
+    
+    SDLSoftButton *sb2 = [[[SDLSoftButton alloc] init] autorelease];
+    sb2.softButtonID = [NSNumber numberWithInt:5501];
+    sb2.text = @"Two";
+    sb2.type = [SDLSoftButtonType TEXT];
+    sb2.isHighlighted = [NSNumber numberWithBool:true];
+    sb2.systemAction = [SDLSystemAction DEFAULT_ACTION];
+    
+    sbList = [[NSMutableArray alloc] initWithObjects:sb1,sb2,nil];
 }
 
 - (void)viewDidUnload

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertViewController.xib
index 404a526..bf20697 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AlertViewController.xib
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
                        <string>IBProxyObject</string>
                        <string>IBUIButton</string>
                        <string>IBUILabel</string>
+                       <string>IBUISlider</string>
                        <string>IBUISwitch</string>
                        <string>IBUITextField</string>
                        <string>IBUITextView</string>
-                       <string>IBUISlider</string>
                        <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
@@ -37,25 +37,26 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="IBUILabel" id="1056745409">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 8}, {95, 21}}</string>
+                                               <string key="NSFrame">{{20, 3}, {73, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="958736028"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <int key="IBUIContentMode">7</int>
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">TTS Chunks</string>
+                                               <string key="IBUIText">To Speak</string>
                                                <object class="NSColor" key="IBUITextColor" id="486709734">
                                                        <int key="NSColorSpace">1</int>
                                                        <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
                                                </object>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
@@ -64,8 +65,8 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">17</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="959112789">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="842303132">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">17</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -73,9 +74,9 @@
                                        <object class="IBUITextView" id="3391998">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 49}, {280, 78}}</string>
+                                               <string key="NSFrame">{{20, 41}, {280, 46}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="237540828"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <object class="NSColor" key="IBUIBackgroundColor">
                                                        <int key="NSColorSpace">1</int>
@@ -84,7 +85,7 @@
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <bool key="IBUIMultipleTouchEnabled">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">Text to Speak</string>
                                                <object class="IBUITextInputTraits" key="IBUITextInputTraits">
                                                        <int key="IBUIAutocapitalizationType">2</int>
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -93,8 +94,8 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">14</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="311392349">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="615876987">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">14</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -102,9 +103,8 @@
                                        <object class="IBUILabel" id="237540828">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 140}, {52, 21}}</string>
+                                               <string key="NSFrame">{{20, 97}, {52, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="437430860"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -118,22 +118,22 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="538254493"/>
-                                               <reference key="IBUIFont" ref="959112789"/>
+                                               <reference key="IBUIFont" ref="842303132"/>
                                        </object>
                                        <object class="IBUITextField" id="437430860">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{80, 135}, {220, 31}}</string>
+                                               <string key="NSFrame">{{80, 92}, {220, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="572416144"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">Alert Line 1</string>
                                                <int key="IBUIBorderStyle">3</int>
+                                               <string key="IBUIPlaceholder">Line 1</string>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MAA</bytes>
@@ -147,14 +147,13 @@
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="81757635"/>
-                                               <reference key="IBUIFont" ref="311392349"/>
+                                               <reference key="IBUIFont" ref="615876987"/>
                                        </object>
                                        <object class="IBUILabel" id="572416144">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 179}, {52, 21}}</string>
+                                               <string key="NSFrame">{{20, 136}, {52, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="630250575"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -168,21 +167,22 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="538254493"/>
-                                               <reference key="IBUIFont" ref="959112789"/>
+                                               <reference key="IBUIFont" ref="842303132"/>
                                        </object>
                                        <object class="IBUITextField" id="630250575">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{80, 174}, {220, 31}}</string>
+                                               <string key="NSFrame">{{80, 131}, {220, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="601913584"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">Alert Line 2</string>
                                                <int key="IBUIBorderStyle">3</int>
+                                               <string key="IBUIPlaceholder">Line 2</string>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MAA</bytes>
@@ -194,14 +194,14 @@
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="81757635"/>
-                                               <reference key="IBUIFont" ref="311392349"/>
+                                               <reference key="IBUIFont" ref="615876987"/>
                                        </object>
                                        <object class="IBUISwitch" id="869185800">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{171, 220}, {94, 27}}</string>
+                                               <string key="NSFrame">{{19, 233}, {94, 27}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="991076052"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -212,9 +212,9 @@
                                        <object class="IBUILabel" id="837098330">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{67, 223}, {42, 21}}</string>
+                                               <string key="NSFrame">{{51, 207}, {42, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="869185800"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
@@ -227,14 +227,14 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="538254493"/>
-                                               <reference key="IBUIFont" ref="959112789"/>
+                                               <reference key="IBUIFont" ref="842303132"/>
                                        </object>
                                        <object class="IBUISlider" id="379880273">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{166, 266}, {118, 23}}</string>
+                                               <string key="NSFrame">{{166, 236}, {118, 23}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="437238344"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -245,9 +245,9 @@
                                        <object class="IBUILabel" id="991076052">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{39, 266}, {70, 21}}</string>
+                                               <string key="NSFrame">{{182, 210}, {70, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="423066180"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
@@ -260,14 +260,14 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="538254493"/>
-                                               <reference key="IBUIFont" ref="959112789"/>
+                                               <reference key="IBUIFont" ref="842303132"/>
                                        </object>
                                        <object class="IBUILabel" id="423066180">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{113, 266}, {42, 21}}</string>
+                                               <string key="NSFrame">{{259, 210}, {42, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="379880273"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
@@ -280,39 +280,38 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="538254493"/>
-                                               <reference key="IBUIFont" ref="959112789"/>
+                                               <reference key="IBUIFont" ref="842303132"/>
                                        </object>
                                        <object class="IBUIButton" id="437238344">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{112, 310}, {97, 37}}</string>
+                                               <string key="NSFrame">{{112, 323}, {97, 37}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentHorizontalAlignment">0</int>
                                                <int key="IBUIContentVerticalAlignment">0</int>
                                                <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Send RPC</string>
-                                               <object class="NSColor" key="IBUIHighlightedTitleColor">
+                                               <object class="NSColor" key="IBUINormalTitleColor" id="300982307">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
+                                               <object class="NSColor" key="IBUIHighlightedTitleColor" id="238361154">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MQA</bytes>
                                                </object>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
-                                               <object class="NSColor" key="IBUINormalTitleShadowColor">
+                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleShadowColor" id="488252804">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MC41AA</bytes>
                                                </object>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="953153110">
                                                        <int key="type">2</int>
                                                        <double key="pointSize">15</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica-Bold</string>
+                                               <object class="NSFont" key="IBUIFont" id="809651059">
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
                                                        <double key="NSSize">15</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -320,9 +319,9 @@
                                        <object class="IBUILabel" id="958736028">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 27}, {270, 21}}</string>
+                                               <string key="NSFrame">{{20, 19}, {270, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="3391998"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
@@ -339,15 +338,90 @@
                                                        <double key="pointSize">13</double>
                                                </object>
                                                <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica</string>
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">13</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
+                                       <object class="IBUILabel" id="601913584">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 174}, {52, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="24931173"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Line 3:</string>
+                                               <reference key="IBUITextColor" ref="486709734"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="538254493"/>
+                                               <reference key="IBUIFont" ref="842303132"/>
+                                       </object>
+                                       <object class="IBUITextField" id="24931173">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{80, 169}, {220, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="837098330"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">Alert Line 3</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <string key="IBUIPlaceholder">Line 3</string>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="477982818"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="81757635"/>
+                                               <reference key="IBUIFont" ref="615876987"/>
+                                       </object>
+                                       <object class="IBUISwitch" id="763701224">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{158, 277}, {94, 27}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <bool key="IBUIOn">YES</bool>
+                                       </object>
+                                       <object class="IBUIButton" id="707563495">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{66, 273}, {99, 36}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <reference key="IBUINormalTitleColor" ref="300982307"/>
+                                               <reference key="IBUIHighlightedTitleColor" ref="238361154"/>
+                                               <string key="IBUINormalTitle">Soft Buttons</string>
+                                               <reference key="IBUINormalTitleShadowColor" ref="488252804"/>
+                                               <reference key="IBUIFontDescription" ref="953153110"/>
+                                               <reference key="IBUIFont" ref="809651059"/>
+                                       </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <reference key="NSNextKeyView" ref="1056745409"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
@@ -362,6 +436,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -369,7 +444,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -377,7 +452,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="437430860"/>
                                        </object>
-                                       <int key="connectionID">19</int>
+                                       <string key="id">19</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -385,7 +460,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="630250575"/>
                                        </object>
-                                       <int key="connectionID">20</int>
+                                       <string key="id">20</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -393,7 +468,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="423066180"/>
                                        </object>
-                                       <int key="connectionID">23</int>
+                                       <string key="id">23</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -401,7 +476,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="379880273"/>
                                        </object>
-                                       <int key="connectionID">24</int>
+                                       <string key="id">24</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -409,7 +484,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="869185800"/>
                                        </object>
-                                       <int key="connectionID">25</int>
+                                       <string key="id">25</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -417,7 +492,23 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="3391998"/>
                                        </object>
-                                       <int key="connectionID">26</int>
+                                       <string key="id">26</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">line3Text</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="24931173"/>
+                                       </object>
+                                       <string key="id">31</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">sbSwitch</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="763701224"/>
+                                       </object>
+                                       <string key="id">35</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
@@ -426,28 +517,37 @@
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">13</int>
                                        </object>
-                                       <int key="connectionID">28</int>
+                                       <string key="id">28</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">alertPressed:</string>
+                                               <string key="label">sendRPC:</string>
                                                <reference key="source" ref="437238344"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">27</int>
+                                       <string key="id">37</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">softButtons:</string>
+                                               <reference key="source" ref="707563495"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">38</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="3391998"/>
@@ -463,85 +563,109 @@
                                                        <reference ref="991076052"/>
                                                        <reference ref="423066180"/>
                                                        <reference ref="437238344"/>
+                                                       <reference ref="601913584"/>
+                                                       <reference ref="24931173"/>
+                                                       <reference ref="763701224"/>
+                                                       <reference ref="707563495"/>
                                                </array>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
+                                               <string key="id">4</string>
                                                <reference key="object" ref="1056745409"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">7</int>
+                                               <string key="id">7</string>
                                                <reference key="object" ref="237540828"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">8</int>
+                                               <string key="id">8</string>
                                                <reference key="object" ref="437430860"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">9</int>
+                                               <string key="id">9</string>
                                                <reference key="object" ref="572416144"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">10</int>
+                                               <string key="id">10</string>
                                                <reference key="object" ref="630250575"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
+                                               <string key="id">5</string>
                                                <reference key="object" ref="3391998"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">11</int>
+                                               <string key="id">11</string>
                                                <reference key="object" ref="869185800"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">12</int>
+                                               <string key="id">12</string>
                                                <reference key="object" ref="837098330"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">13</int>
+                                               <string key="id">13</string>
                                                <reference key="object" ref="379880273"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">14</int>
+                                               <string key="id">14</string>
                                                <reference key="object" ref="991076052"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">15</int>
+                                               <string key="id">15</string>
                                                <reference key="object" ref="423066180"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">16</int>
+                                               <string key="id">16</string>
                                                <reference key="object" ref="437238344"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">18</int>
+                                               <string key="id">18</string>
                                                <reference key="object" ref="958736028"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">29</string>
+                                               <reference key="object" ref="601913584"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">30</string>
+                                               <reference key="object" ref="24931173"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">32</string>
+                                               <reference key="object" ref="763701224"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">33</string>
+                                               <reference key="object" ref="707563495"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
                                </array>
                        </object>
                        <dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -558,6 +682,10 @@
                                <string key="15.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="29.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="30.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="32.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -568,76 +696,21 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">28</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">AlertViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <dictionary class="NSMutableDictionary" key="actions">
-                                               <string key="alertPressed:">id</string>
-                                               <string key="displayDurationSlider:">id</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="actionInfosByName">
-                                               <object class="IBActionInfo" key="alertPressed:">
-                                                       <string key="name">alertPressed:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                               <object class="IBActionInfo" key="displayDurationSlider:">
-                                                       <string key="name">displayDurationSlider:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="outlets">
-                                               <string key="durationLabel">UILabel</string>
-                                               <string key="durationSlider">UISlider</string>
-                                               <string key="line1Text">UITextField</string>
-                                               <string key="line2Text">UITextField</string>
-                                               <string key="toneSwitch">UISwitch</string>
-                                               <string key="ttsView">UITextView</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <object class="IBToOneOutletInfo" key="durationLabel">
-                                                       <string key="name">durationLabel</string>
-                                                       <string key="candidateClassName">UILabel</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="durationSlider">
-                                                       <string key="name">durationSlider</string>
-                                                       <string key="candidateClassName">UISlider</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="line1Text">
-                                                       <string key="name">line1Text</string>
-                                                       <string key="candidateClassName">UITextField</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="line2Text">
-                                                       <string key="name">line2Text</string>
-                                                       <string key="candidateClassName">UITextField</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="toneSwitch">
-                                                       <string key="name">toneSwitch</string>
-                                                       <string key="candidateClassName">UISwitch</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="ttsView">
-                                                       <string key="name">ttsView</string>
-                                                       <string key="candidateClassName">UITextView</string>
-                                               </object>
-                                       </dictionary>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/AlertViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AppDelegate.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AppDelegate.h
index d808463..89eb212 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AppDelegate.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AppDelegate.h
@@ -1,29 +1,24 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  AppDelegate.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import <AVFoundation/AVAudioSettings.h>
 
-#import "UserTestViewController.h"
 #import "RPCTestViewController.h"
-#import "AutoTestViewController.h"
 #import "ConsoleViewController.h"
 
+
 @interface AppDelegate : UIResponder <UIApplicationDelegate, UITabBarControllerDelegate> {
-    UserTestViewController *userTestViewController;
-    AutoTestViewController *autoTestViewController;
+    UIViewController *rpcTestViewController;
     ConsoleViewController *consoleViewController;
     
     UINavigationController *navController;
 }
   
 @property (strong, nonatomic) UIWindow *window;
-
 @property (strong, nonatomic) UITabBarController *tabBarController;
 
 
-
 @end
 
 

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AppDelegate.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AppDelegate.m
index f8529bc..eb00713 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AppDelegate.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AppDelegate.m
@@ -1,63 +1,49 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  AppDelegate.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "AppDelegate.h"
 
-
 @implementation AppDelegate
 
-@synthesize window = _window;
-@synthesize tabBarController = _tabBarController;
+@synthesize window;
+@synthesize tabBarController;
 
 
 - (void)dealloc
 {
-    [_window release];
-    [_tabBarController release];
+    [self.window release];
+    [self.tabBarController release];
     [super dealloc];
 }
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
+    
     // Override point for customization after application launch.
-    userTestViewController = [[[UserTestViewController alloc] initWithNibName:@"UserTestViewController" bundle:nil] autorelease];
-    UIViewController *rpcTestViewController = [[RPCTestViewController alloc] initWithStyle:UITableViewStyleGrouped];
-    rpcTestViewController.view.backgroundColor=[UIColor colorWithRed:(255/255.) green:(195/255.) blue:(135/255.) alpha:1];
-    autoTestViewController = [[[AutoTestViewController alloc] initWithNibName:@"AutoTestViewController" bundle:nil] autorelease];
+    rpcTestViewController = [[RPCTestViewController alloc] initWithStyle:UITableViewStyleGrouped];
     consoleViewController = [[[ConsoleViewController alloc] initWithNibName:@"ConsoleViewController" bundle:nil] autorelease];
 
     navController = nil;
     navController = [[UINavigationController alloc] initWithRootViewController:rpcTestViewController];
+    
 
     [rpcTestViewController release];
     
     self.tabBarController = [[[UITabBarController alloc] init] autorelease];
-    self.tabBarController.viewControllers = [NSArray arrayWithObjects:userTestViewController, navController, autoTestViewController,consoleViewController, nil];
-    self.tabBarController.selectedIndex = 3;
-    self.window.rootViewController = self.tabBarController;
-    [self.window makeKeyAndVisible];
-    
-    [[SDLBrain getInstance] setupProxy];
     
-    NSURL *url = (NSURL *)[launchOptions valueForKey:UIApplicationLaunchOptionsURLKey];
-    if (url != nil && [url isFileURL]) {
-        [autoTestViewController handleOpenURL:url];
-    }
+    self.tabBarController.viewControllers = [NSArray arrayWithObjects:navController, consoleViewController, nil];
     
-    [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:nil];
+    self.tabBarController.selectedIndex = 1;
+    self.window.rootViewController = self.tabBarController;
+    [self.window makeKeyAndVisible];
     
+    [[SmartDeviceLinkTester getInstance] setupProxy];
     
     return YES;
 }
 
--(BOOL) application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation {
-    if (url!= nil && [url isFileURL]) {
-            [autoTestViewController handleOpenURL:url];    
-    }
-    return YES;
-}
 
 - (void)applicationWillResignActive:(UIApplication *)application
 {
@@ -67,8 +53,6 @@
 
 - (void)applicationDidEnterBackground:(UIApplication *)application
 {
-    [SDLDebugTool logInfo:@"App did enter background"];
-
     // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
     // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
 }
@@ -84,29 +68,12 @@
 }
 
 - (void)applicationWillTerminate:(UIApplication *)application
-{
-    [SDLDebugTool logInfo:@"will terminate"];
+{        
+    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     
     [navController release];
     navController = nil;
-
-    NSLog(@"did terminate");
-
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
 }
 
-/*
-// Optional UITabBarControllerDelegate method.
-- (void)tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController
-{
-}
-*/
-
-/*
-// Optional UITabBarControllerDelegate method.
-- (void)tabBarController:(UITabBarController *)tabBarController didEndCustomizingViewControllers:(NSArray *)viewControllers changed:(BOOL)changed
-{
-}
-*/
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AutoTestViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AutoTestViewController.h
deleted file mode 100644 (file)
index da2d888..0000000
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AutoTestViewController.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <UIKit/UIKit.h>
-#import "SDLBrain.h"
-#import "SDLRPCRequestFactory.h"
-#import "SDLTTSChunkFactory.h"
-#import <MessageUI/MFMailComposeViewController.h>
-
-@interface AutoTestViewController : UIViewController <NSXMLParserDelegate, UIAlertViewDelegate,MFMailComposeViewControllerDelegate, UITextViewDelegate> {
-    
-    IBOutlet UITextView *xmlScriptText;
-    IBOutlet UILabel *resultOfXMLTest;
-    IBOutlet UILabel *testInProgress;
-    
-    NSData *xmlData;
-    NSXMLParser *testXMLParser;
-    NSThread *testThread;
-    NSCondition *condition;
-    SDLRPCResponse* response;
-    
-    BOOL isUnitTest;
-    BOOL unitTestIsNextElement;
-    BOOL integrationTestIsNextElement;
-    BOOL responseReceived;
-    BOOL didPassTest;
-    BOOL thisTestFailed;
-    BOOL integrationTestisComplete;
-    NSString *testName;
-    NSString *xmlURLText;
-    
-    NSMutableArray *testComponents;
-    
-    int numIterations;
-    
-    UIAlertView *alert;
-}
-
--(IBAction)beginAutomatedTesting:(id)sender;
--(void)handleOpenURL:(NSURL *)url;
-
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AutoTestViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AutoTestViewController.m
deleted file mode 100644 (file)
index a0ab5ab..0000000
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AutoTestViewController.m
+++ /dev/null
@@ -1,694 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "AutoTestViewController.h"
-
-@interface AutoTestViewController ()
-
--(void)runUnitTestwithName:(NSString *)xmlTestName attributes:(NSDictionary *)attributeDict;
--(void)masterTestThread;
--(void)onRPCResponse:(NSNotification *)notif;
--(void)showUserPromptWithMessage:(NSString *)msg;
--(void)showResultsofTest;
--(void)resetforNextTest;
--(void)showErrorAlert:(NSString *)errorMessage;
--(NSString *)dataFilePath;
--(void)writeToFile:(NSArray *)dataToWrite;
--(void)sendEmail;
--(void)compareResultwithAttributes:(NSDictionary *)attributeDict;
-
-@end
-
-@implementation AutoTestViewController
-
--(NSString *)dataFilePath {
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-    NSString *documentsDirectory = [paths objectAtIndex:0];
-    return [documentsDirectory stringByAppendingFormat:@"/xmltestresults.csv"];
-}
-
--(void)writeToFile:(NSArray *)dataToWrite {
-    NSFileHandle *handle;
-    handle = [NSFileHandle fileHandleForWritingAtPath:[self dataFilePath]];
-    [handle truncateFileAtOffset:[handle seekToEndOfFile]];
-
-    for (int i = 0; i < [dataToWrite count]; i++) {
-        [handle writeData:[[dataToWrite objectAtIndex:i] dataUsingEncoding:NSUTF8StringEncoding]];
-        [handle writeData:[@"," dataUsingEncoding:NSUTF8StringEncoding]];
-    }
-    [handle writeData:[@"\n" dataUsingEncoding:NSUTF8StringEncoding]];
-}
-
--(void)sendEmail {
-    if ([MFMailComposeViewController canSendMail]) {
-        MFMailComposeViewController *picker = [[MFMailComposeViewController alloc] init];
-        picker.mailComposeDelegate = self;
-        [picker setSubject:@"XML Test Result"];
-        [picker addAttachmentData:[NSData dataWithContentsOfFile:[self dataFilePath]] mimeType:@"test/csv" fileName:@"xmltestresults.csv"];
-        [picker setMessageBody:@"Attached is the csv output file." isHTML:NO];
-        [self presentModalViewController:picker animated:YES];
-        [picker release];
-    }
-    else {
-        [self performSelectorOnMainThread:@selector(showErrorAlert:) withObject:@"Error: Cannot Send Mail" waitUntilDone:NO];
-    }
-}
-
--(void)mailComposeController:(MFMailComposeViewController *)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error {
-    switch (result) {
-        case MFMailComposeResultCancelled:
-            [self performSelectorOnMainThread:@selector(showErrorAlert:) withObject:@"Mail Cancelled" waitUntilDone:NO];            
-            break;
-        case MFMailComposeResultFailed:
-            [self performSelectorOnMainThread:@selector(showErrorAlert:) withObject:@"Mail Failure" waitUntilDone:NO];
-            break;
-        default:
-            break;
-    }
-    [self dismissModalViewControllerAnimated:YES];
-}
-
-
--(void) handleOpenURL:(NSURL *)url {
-    NSLog(@"handleOpenURL");
-    xmlURLText = [[NSString stringWithFormat:@"%@",url] retain];
-    [xmlScriptText setText:xmlURLText];
-    NSError *outError;
-    xmlData = [[NSData alloc] initWithContentsOfURL:url options: NSDataReadingUncached error:&outError];
-}
-
--(IBAction)beginAutomatedTesting:(id)sender {
-    if (testThread) [testThread release];
-    testThread = [[NSThread alloc] initWithTarget:self selector:@selector(masterTestThread) object:nil];
-    [testThread start];
-}
-
--(void)compareResultwithAttributes:(NSDictionary *)attributeDict {
-    [condition lock];
-    
-    while (!responseReceived) {
-        [condition wait];
-    }
-    
-    if ([attributeDict valueForKey:@"correlationID"]) {
-        if (![[NSString stringWithFormat:@"%@",[response correlationID]] isEqualToString:[attributeDict valueForKey:@"correlationID"]]) {
-            didPassTest = NO;
-            thisTestFailed = YES;
-        }
-    }
-    if ([attributeDict valueForKey:@"return"]) {
-        if (![[NSString stringWithFormat:@"%@",[response resultCode]] isEqualToString:[attributeDict valueForKey:@"return"]]) {
-            didPassTest = NO;
-            thisTestFailed = YES;
-        }        
-    }
-    responseReceived = NO;
-    response = nil;
-    [condition unlock];
-}
-
--(void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName {
-    if ([elementName isEqualToString:@"test"]) {
-        
-        int numPasses = 0;
-        
-        for (int numLoops = numIterations; numLoops > 0; numLoops--) {
-            thisTestFailed = NO;
-            
-            if (isUnitTest) {
-                [NSThread sleepForTimeInterval:2];
-            }
-            else {
-                [NSThread sleepForTimeInterval:5];
-            }
-
-            for (int i = 0; i < [testComponents count]; i=i+2) {
-                
-                if ([[testComponents objectAtIndex:i] isEqualToString:@"userPrompt"]) {
-                    
-                    if (!thisTestFailed) {
-                        [self performSelectorOnMainThread:@selector(showUserPromptWithMessage:) withObject:[testComponents objectAtIndex:i+1] waitUntilDone:YES];
-                    
-                        [condition lock];
-                        while (!integrationTestisComplete) {
-                            [condition wait];
-                        }
-                    
-                        [condition unlock];
-                    }
-                    integrationTestisComplete = NO;
-                }
-                else if ([[testComponents objectAtIndex:i] isEqualToString:@"result"]) {
-                    [self compareResultwithAttributes:[testComponents objectAtIndex:i+1]];
-                }
-                else {
-                    [self runUnitTestwithName:[testComponents objectAtIndex:i] attributes:[testComponents objectAtIndex:i+1]];
-                }
-            }
-            if (!thisTestFailed) {
-                numPasses++;
-            }
-        }
-          
-        NSString *resultOfTest;
-        if (numPasses == numIterations) {
-            resultOfTest = @"Pass";
-        }
-        else {
-            resultOfTest = @"Fail";
-        }
-        
-            NSArray *results = [NSArray arrayWithObjects:testName,resultOfTest,[NSString stringWithFormat:@"%d", numPasses],[NSString stringWithFormat:@"%d",numIterations], nil];
-            [self writeToFile:results];
-    }
-}
-
-- (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName attributes:(NSDictionary *)attributeDict {
-    
-    if ([elementName isEqualToString:@"type"]) {
-        NSLog(@"go to type");
-        if ([[attributeDict valueForKey:@"type"] isEqualToString:@"unit"]) {
-            NSLog(@"Begin Unit Tests");
-            isUnitTest = YES;
-        }
-        else if ([[attributeDict valueForKey:@"type"] isEqualToString:@"integration"]) {
-            isUnitTest = NO;
-            NSLog(@"integration test");
-        }
-        else {
-            NSLog(@"Error: Neither Unit nor Integration Test");
-        }
-    }
-    else if ([elementName isEqualToString:@"result"]) {
-        integrationTestIsNextElement = NO;
-        unitTestIsNextElement = NO;
-        
-        [testComponents addObject:elementName];
-        [testComponents addObject:attributeDict];
-    }
-
-    else if (unitTestIsNextElement) {
-        [testComponents addObject:elementName];
-        [testComponents addObject:attributeDict];
-       
-    }
-    else if (integrationTestIsNextElement) {
-        integrationTestisComplete = NO;
-        [testComponents addObject:elementName];
-        [testComponents addObject:attributeDict];
-    }
-    else if ([elementName isEqualToString:@"test"]) {
-        if (isUnitTest) {
-             unitTestIsNextElement = YES;
-        }
-        else {
-            integrationTestIsNextElement = YES;
-        }
-        
-        testName = [NSString stringWithFormat:@"%@",[attributeDict valueForKey:@"testName"]];
-        [testComponents removeAllObjects];
-        
-        if ([attributeDict valueForKey:@"iterations"]) {
-            numIterations = [[attributeDict valueForKey:@"iterations"] intValue];
-        }
-        else {
-            numIterations = 1;
-        }
-        
-        if (numIterations < 1) {
-            numIterations = 1;
-        }
-        
-    }
-    else if ([elementName isEqualToString:@"userPrompt"] && !isUnitTest) {   
-        
-        [testComponents addObject:elementName];
-        [testComponents addObject:[attributeDict valueForKey:@"userPrompt"]];
-    }
-}
-
--(void)showUserPromptWithMessage:(NSString *)msg {
-    UIAlertView *alertPrompt = [[UIAlertView alloc] initWithTitle:@"User Prompt" message:msg delegate:self cancelButtonTitle:@"Yes" otherButtonTitles:@"No",nil];
-    [alertPrompt show];
-    [alertPrompt release];
-
-}
-
-- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
-    if (buttonIndex == 1) {
-        thisTestFailed = YES;
-        didPassTest = NO;
-    }
-    integrationTestisComplete = YES;
-}
-
--(void)showResultsofTest {
-    NSLog(@"show results of test");
-    if (didPassTest) {
-        [resultOfXMLTest setText:@"Success"];
-        [resultOfXMLTest setBackgroundColor:[UIColor greenColor]];
-    }
-    else {
-        [resultOfXMLTest setText:@"Failure"];
-        [resultOfXMLTest setBackgroundColor:[UIColor redColor]];
-    
-    }
-    [resultOfXMLTest setHidden:NO];
-    [testInProgress setHidden:YES];
-}
-
--(void)resetforNextTest {
-    [resultOfXMLTest setHidden:YES];
-    [testInProgress setHidden:NO];
-}
-
--(void)masterTestThread {
-    @autoreleasepool {    
-    if (testXMLParser) {
-        [testXMLParser release];
-        NSLog(@"release syncTestXMLParser");
-    }
-        
-    if (xmlData != nil) {
-        
-        if ([[NSFileManager defaultManager] fileExistsAtPath:[self dataFilePath]]) {
-            NSError *error;
-            if (![[NSFileManager defaultManager] removeItemAtPath:[self dataFilePath] error:&error]) {
-                NSLog(@"Error removing files: %@", error);
-            }
-            NSLog(@"removed file");
-        }
-        [[NSFileManager defaultManager] createFileAtPath:[self dataFilePath] contents:nil attributes:nil];
-        [self writeToFile:[NSArray arrayWithObjects:@"Test Name",@"Result",@"Number of Passes",@"Attempts",nil]];
-        NSLog(@"created file");
-        
-        testXMLParser = [[NSXMLParser alloc] initWithData:xmlData];
-        [testXMLParser setDelegate:self];
-        NSLog(@"Create syncTestXMLParser");
-        unitTestIsNextElement = NO;
-        integrationTestIsNextElement = NO;
-        isUnitTest = YES;
-        didPassTest = YES;
-        responseReceived = NO;
-        
-        [self performSelectorOnMainThread:@selector(resetforNextTest) withObject:nil waitUntilDone:NO]; 
-   
-        [testXMLParser parse];
-        
-        [self performSelectorOnMainThread:@selector(showResultsofTest) withObject:nil waitUntilDone:YES];
-        [NSThread sleepForTimeInterval:3];
-        [self performSelectorOnMainThread:@selector(sendEmail) withObject:nil waitUntilDone:YES];
-        
-    }
-    else {        
-        [self performSelectorOnMainThread:@selector(showErrorAlert:) withObject:@"We did not find an XML File. Make sure that you imported the file from your email." waitUntilDone:NO];
-    }
-    
-    NSLog(@"pool release");
-    }
-}
-
--(void)showErrorAlert:(NSString *)errorMessage {
-    alert = [[UIAlertView alloc] initWithTitle:@"Error" message:errorMessage delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil];
-    [alert show];
-    [alert release];
-}
-
-
-
--(void)onRPCResponse:(NSNotification *)notif {
-    responseReceived = YES;
-    response = (SDLRPCResponse*)[notif object];
-
-}
-
--(void)runUnitTestwithName:(NSString *)xmlTestName attributes:(NSDictionary *)attributeDict {
-    if ([xmlTestName isEqualToString:@"AddCommand"]) {
-        SDLAddCommand *req = [SDLRPCRequestFactory buildAddCommandWithID:nil menuName:nil parentID:nil position:nil vrCommands:nil correlationID:nil];
-        SDLMenuParams* menuParams = [[[SDLMenuParams alloc] init] autorelease];
-        menuParams.menuName = nil;
-        menuParams.parentID = nil;
-        menuParams.position = nil;
-        req.menuParams = menuParams;
-        NSMutableArray *vrCommands = [[NSMutableArray alloc] init];
-        
-        if ([attributeDict valueForKey:@"menuText"]) {
-            req.menuParams.menuName = [attributeDict valueForKey:@"menuText"];
-        }
-        if ([attributeDict valueForKey:@"position"]) {
-            req.menuParams.position = [NSNumber numberWithInt:[[attributeDict valueForKey:@"position"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"parentID"]) {
-            req.menuParams.parentID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"parentID"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"cmdID"]) {
-            req.cmdID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"cmdID"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"vrCommands"]) {
-           [vrCommands addObject:[attributeDict valueForKey:@"vrCommands"]];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        req.vrCommands = vrCommands;
-        [[SDLBrain getInstance] sendRPCMessage:req]; 
-        [vrCommands release];
-    }
-    else if ([xmlTestName isEqualToString:@"AddSubMenu"]) {
-        SDLAddSubMenu *req = [SDLRPCRequestFactory buildAddSubMenuWithID:nil menuName:nil position:nil correlationID:nil];
-        if ([attributeDict valueForKey:@"menuID"]) {
-            req.menuID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"menuID"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"position"]) {
-            req.position = [NSNumber numberWithInt:[[attributeDict valueForKey:@"position"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"menuName"]) {
-            req.menuName = [attributeDict valueForKey:@"menuName"];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }        
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"SetMediaClockTimer"]) {
-        SDLSetMediaClockTimer *req = [[[SDLSetMediaClockTimer alloc] init] autorelease];
-        SDLStartTime *startTime = [[[SDLStartTime alloc] init] autorelease];
-        req.startTime = startTime;
-        if ([attributeDict valueForKey:@"hours"]) {
-            req.startTime.hours = [NSNumber numberWithInt:[[attributeDict valueForKey:@"hours"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"minutes"]) {
-            req.startTime.minutes = [NSNumber numberWithInt:[[attributeDict valueForKey:@"minutes"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"seconds"]) {
-            req.startTime.seconds = [NSNumber numberWithInt:[[attributeDict valueForKey:@"second"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"updateMode"]) {
-            req.updateMode = [SDLUpdateMode valueOf:[attributeDict valueForKey:@"updateMode"]];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"CreateInteractionChoiceSet"]) {
-        SDLCreateInteractionChoiceSet *req = [[[SDLCreateInteractionChoiceSet alloc] init] autorelease];
-        SDLChoice *cho = [[SDLChoice alloc] init];
-      
-        NSMutableArray *choiceSet = [[NSMutableArray alloc] init];
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"choiceSet"]) {
-            cho.choiceID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"choiceSet"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"choiceSetName"]) {
-            cho.menuName = [attributeDict valueForKey:@"choiceSetName"];
-        }
-        if ([attributeDict valueForKey:@"choiceSetVrCommands"]) {
-            cho.vrCommands = [NSArray arrayWithObject:[attributeDict valueForKey:@"choiceSetVrCommands"]];
-        }
-        if ([attributeDict valueForKey:@"interactionChoiceSetID"]) {
-            req.interactionChoiceSetID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"interactionChoiceSetID"] intValue]];
-        }
-        [choiceSet addObject:cho];
-        req.choiceSet = choiceSet;
-        [[SDLBrain getInstance] sendRPCMessage:req];
-        [choiceSet release];
-        [cho release];
-    }
-    else if ([xmlTestName isEqualToString:@"DeleteInteractionChoiceSet"]) {
-        SDLDeleteInteractionChoiceSet *req = [[[SDLDeleteInteractionChoiceSet alloc] init] autorelease];
-        if ([attributeDict valueForKey:@"interactionChoiceSetID"]) {
-            req.interactionChoiceSetID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"interactionChoiceSetID"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"PerformInteraction"]) {
-        SDLPerformInteraction *req = [[[SDLPerformInteraction alloc] init] autorelease];
-        req.interactionMode = [SDLInteractionMode BOTH];
-        if ([attributeDict valueForKey:@"initialPrompt"]) {
-            req.initialPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:[attributeDict valueForKey:@"initialPrompt"]];
-        }
-        if ([attributeDict valueForKey:@"initialText"]) {
-            req.initialText = [attributeDict valueForKey:@"initialText"];
-        }
-        if ([attributeDict valueForKey:@"interactionChoiceSetID"]) {
-            req.interactionChoiceSetIDList = [NSArray arrayWithObject:[NSNumber numberWithInt:[[attributeDict valueForKey:@"interactionChoiceSetID"] intValue]]];
-        }
-        if ([attributeDict valueForKey:@"helpPrompt"]) {
-            req.helpPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:[attributeDict valueForKey:@"helpPrompt"]];
-        }
-        if ([attributeDict valueForKey:@"timeoutPrompt"]) {
-            req.timeoutPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:[attributeDict valueForKey:@"timeoutPrompt"]];
-        }
-        if ([attributeDict valueForKey:@"timeout"]) {
-            req.timeout = [NSNumber numberWithInt:[[attributeDict valueForKey:@"timeout"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"interactionMode"]) {
-            req.interactionMode = [SDLInteractionMode valueOf:[attributeDict valueForKey:@"interactionMode"]];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"DeleteCommand"]) {
-        SDLDeleteCommand *req = [[[SDLDeleteCommand alloc] init] autorelease];
-        if ([attributeDict valueForKey:@"cmdID"]) {
-            req.cmdID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"cmdID"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"DeleteSubMenu"]) {
-        SDLDeleteSubMenu *req = [[[SDLDeleteSubMenu alloc] init] autorelease];
-        if ([attributeDict valueForKey:@"menuID"]) {
-            req.menuID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"menuID"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"EncodedSyncPData"]) {
-        SDLEncodedSyncPData *req = [[[SDLEncodedSyncPData alloc] init] autorelease];
-        NSMutableArray *syncData = [[NSMutableArray alloc] init];
-        if ([attributeDict valueForKey:@"data"]) {
-            [syncData addObject:[attributeDict valueForKey:@"data"]];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        req.data = syncData;
-        [[SDLBrain getInstance] sendRPCMessage:req];
-        [syncData release];
-    }
-    else if ([xmlTestName isEqualToString:@"PauseMediaClockTimer"]) {
-        SDLSetMediaClockTimer *req = [SDLRPCRequestFactory buildSetMediaClockTimerWithUpdateMode:[SDLUpdateMode PAUSE] correlationID:nil];
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"ResumeMediaClockTimer"]) {
-        SDLSetMediaClockTimer *req = [SDLRPCRequestFactory buildSetMediaClockTimerWithUpdateMode:[SDLUpdateMode RESUME] correlationID:nil];
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"ClearMediaClockTimer"]) {
-        SDLShow *req = [SDLRPCRequestFactory buildShowWithMainField1:nil mainField2:nil statusBar:nil mediaClock:@"" mediaTrack:nil alignment:nil correlationID:nil];
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"SetGlobalProperties"]) {
-        SDLSetGlobalProperties *req = [[[SDLSetGlobalProperties alloc] init] autorelease];
-        if ([attributeDict valueForKey:@"helpPrompt"]) {
-            req.helpPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:[attributeDict valueForKey:@"helpPrompt"]];
-        }
-        if ([attributeDict valueForKey:@"timeoutPrompt"]) {
-            req.timeoutPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:[attributeDict valueForKey:@"timeoutPrompt"]];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"ResetGlobalProperties"]) {
-        SDLResetGlobalProperties *req = [[[SDLResetGlobalProperties alloc] init] autorelease];
-        if ([attributeDict valueForKey:@"properties"]) {
-            req.properties = [NSArray arrayWithObject:[SDLGlobalProperty valueOf:[attributeDict valueForKey:@"properties"]]];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"Show"]) {
-        SDLShow *req = [[[SDLShow alloc] init] autorelease];
-        if ([attributeDict valueForKey:@"mainField1"]) {
-            req.mainField1 = [attributeDict valueForKey:@"mainField1"];
-        }
-        if ([attributeDict valueForKey:@"mainField2"]) {
-            req.mainField2 = [attributeDict valueForKey:@"mainField2"];
-        }
-        if ([attributeDict valueForKey:@"alignment"]) {
-            req.alignment = [SDLTextAlignment valueOf:[attributeDict valueForKey:@"alignment"]];
-        }
-        if ([attributeDict valueForKey:@"statusBar"]) {
-            req.statusBar = [attributeDict valueForKey:@"statusBar"];
-        }
-        if ([attributeDict valueForKey:@"mediaClock"]) {
-            req.mediaClock = [attributeDict valueForKey:@"mediaClock"];
-        }
-        if ([attributeDict valueForKey:@"mediaTrack"]) {
-            req.mediaTrack = [attributeDict valueForKey:@"mediaTrack"];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"Speak"]) {
-        SDLSpeak *req = [[[SDLSpeak alloc] init] autorelease];
-        SDLTTSChunk* simpleChunk = [[[SDLTTSChunk alloc] init] autorelease];
-        simpleChunk.type = SDLSpeechCapabilities.TEXT;
-        if ([attributeDict valueForKey:@"ttsChunks"]) {
-            simpleChunk.text = [attributeDict valueForKey:@"ttsChunks"];
-        }
-        if ([attributeDict valueForKey:@"ttsType"]) {
-            simpleChunk.type = [SDLSpeechCapabilities valueOf:[attributeDict valueForKey:@"ttsType"]];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        req.ttsChunks = [NSMutableArray arrayWithObject:simpleChunk];
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"Alert"]) {
-        SDLAlert *req = [[[SDLAlert alloc] init] autorelease];
-        SDLTTSChunk* simpleChunk = [[[SDLTTSChunk alloc] init] autorelease];
-        simpleChunk.type = SDLSpeechCapabilities.TEXT;
-        if ([attributeDict valueForKey:@"ttsChunks"]) {
-            simpleChunk.text = [attributeDict valueForKey:@"ttsChunks"];
-        }
-        if ([attributeDict valueForKey:@"ttsType"]) {
-            simpleChunk.type = [SDLSpeechCapabilities valueOf:[attributeDict valueForKey:@"ttsType"]];
-        }
-        if ([attributeDict valueForKey:@"alertText1"]) {
-            req.alertText1 = [attributeDict valueForKey:@"alertText1"];
-        } if ([attributeDict valueForKey:@"alertText2"]) {
-            req.alertText2 = [attributeDict valueForKey:@"alertText2"];
-        }
-        if ([attributeDict valueForKey:@"duration"]) {
-            req.duration = [NSNumber numberWithDouble:[[attributeDict valueForKey:@"duration"] doubleValue]];
-        }
-        if ([attributeDict valueForKey:@"playTone"]) {
-            req.playTone = [NSNumber numberWithInt:[[attributeDict valueForKey:@"playTone"] intValue]];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        req.ttsChunks = [NSMutableArray arrayWithObject:simpleChunk];
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-
-    else if ([xmlTestName isEqualToString:@"SubscribeButton"]) {
-        SDLSubscribeButton *req = [[[SDLSubscribeButton alloc] init] autorelease];
-        if ([attributeDict valueForKey:@"buttonName"]) {
-            req.buttonName = [SDLButtonName valueOf:[attributeDict valueForKey:@"buttonName"]];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"UnsubscribeButton"]) {
-        SDLUnsubscribeButton *req = [[[SDLUnsubscribeButton alloc] init] autorelease];
-        if ([attributeDict valueForKey:@"buttonName"]) {
-            req.buttonName = [SDLButtonName valueOf:[attributeDict valueForKey:@"buttonName"]];
-        }
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else if ([xmlTestName isEqualToString:@"UnregisterAppInterface"]) {
-        SDLUnregisterAppInterface *req = [[[SDLUnregisterAppInterface alloc] init] autorelease];
-        if ([attributeDict valueForKey:@"correlationID"]) {
-            req.correlationID = [NSNumber numberWithInt:[[attributeDict valueForKey:@"correlationID"] intValue]];
-        }
-        [[SDLBrain getInstance] sendRPCMessage:req];
-    }
-    else {
-        [self performSelectorOnMainThread:@selector(showErrorAlert:) withObject:[NSString stringWithFormat:@"We encountered an unfamiliar RPC test: %@",xmlTestName] waitUntilDone:NO];
-    }
-    [SDLDebugTool logInfo:@"Sent RPC Request"];
-}
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onRPCResponse:) name:@"onRPCResponse" object:nil];
-        
-    xmlURLText = [NSString stringWithFormat:@""];
-    
-    testComponents = [[NSMutableArray alloc] init];
-    
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        self.title = NSLocalizedString(@"Automated Test", @"Automated Test");
-        self.tabBarItem.image = [UIImage imageNamed:@"database"];
-    }
-    return self;
-}
-
--(void) dealloc {
-    [testXMLParser release];
-    [testThread release];
-    [alert release];
-    [xmlURLText release];
-    [testComponents release];
-    [super dealloc];
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    NSLog(@"started viewDidLoad");
-    
-    if ([xmlURLText isEqualToString:@""]) {
-        [xmlScriptText setText: @"No script is loaded. You can load a script by opening up an email attachment."];
-    }
-    else {
-        [xmlScriptText setText:xmlURLText];
-    }
-    [xmlScriptText setEditable:NO];
-    [[xmlScriptText layer] setCornerRadius:5];
-    [resultOfXMLTest setHidden:YES];
-    [testInProgress setHidden:YES];
-    NSLog(@"finished viewDidLoad");
-}
-
-- (void)viewDidUnload
-{
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-    return (interfaceOrientation == UIInterfaceOrientationPortrait);
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/Blank-Blackboard-PSD.png b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/Blank-Blackboard-PSD.png
deleted file mode 100644 (file)
index 493e7fb..0000000
Binary files a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/Blank-Blackboard-PSD.png and /dev/null differ

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ChangeRegistrationViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ChangeRegistrationViewController.h
new file mode 100644 (file)
index 0000000..a732d34
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ChangeRegistrationViewController.h
@@ -0,0 +1,23 @@
+//  ChangeRegistrationViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+
+@interface ChangeRegistrationViewController : UIViewController <UITextFieldDelegate, UIPickerViewDataSource, UIPickerViewDelegate> {
+ 
+    IBOutlet UITextField *langtext;
+    IBOutlet UITextField *hmilangtext;
+    
+    UIPickerView *textPicker;
+    NSInteger currentTag;
+
+}
+
+-(IBAction)sendRPC:(id)sender;
+
+@property(nonatomic, retain) NSArray *pickerArray;
+@property(nonatomic, retain) NSArray *testArray;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ChangeRegistrationViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ChangeRegistrationViewController.m
new file mode 100644 (file)
index 0000000..cfd282a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ChangeRegistrationViewController.m
@@ -0,0 +1,210 @@
+//  ChangeRegistrationViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#define tagLangText 100
+#define tagHMILangText 101
+
+#import "ChangeRegistrationViewController.h"
+#import "AppDelegate.h"
+
+@interface ChangeRegistrationViewController ()
+
+@end
+
+@implementation ChangeRegistrationViewController
+
+@synthesize pickerArray;
+
+-(IBAction)sendRPC:(id)sender {
+    
+    SDLChangeRegistration *req = [SDLRPCRequestFactory buildChangeRegistrationWithLanguage:[SDLLanguage valueOf:[langtext text]] hmiDisplayLanguage:[SDLLanguage valueOf:[hmilangtext text]] correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return NO;
+}
+
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"ChangeRegistration";
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    langtext.delegate = self;
+    hmilangtext.delegate = self;
+    
+    textPicker = [[UIPickerView alloc] init];
+    textPicker.dataSource = self;
+    textPicker.delegate = self;
+    textPicker.showsSelectionIndicator = YES;
+    
+    langtext.inputView = textPicker;
+    langtext.inputAccessoryView = [self doneBar];
+    
+    hmilangtext.inputView = textPicker;
+    hmilangtext.inputAccessoryView = [self doneBar];
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+- (void)textFieldDidBeginEditing:(UITextField *)textField {
+    
+    currentTag = textField.tag;
+    
+    switch (currentTag) {
+        case tagLangText:
+        {
+            self.pickerArray = @[@"EN-US",
+                                 @"ES-MX",
+                                 @"FR-CA",
+                                 @"DE-DE",
+                                 @"ES-ES",
+                                 @"EN-GB",
+                                 @"RU-RU",
+                                 @"TR-TR",
+                                 @"PL-PL",
+                                 @"FR-FR",
+                                 @"IT-IT",
+                                 @"SV-SE",
+                                 @"PT-PT",
+                                 @"NL-NL",
+                                 @"EN-AU",
+                                 @"ZH-CN",
+                                 @"ZH-TW",
+                                 @"JA-JP",
+                                 @"AR-SA",
+                                 @"KO-KR",
+                                 @"PT-BR",
+                                 @"CS-CZ",
+                                 @"DA-DK",
+                                 @"NO-NO"];
+            [textPicker reloadAllComponents];
+            break;
+        }
+        case tagHMILangText:
+        {
+            self.pickerArray = @[@"EN-US",
+                                 @"ES-MX",
+                                 @"FR-CA",
+                                 @"DE-DE",
+                                 @"ES-ES",
+                                 @"EN-GB",
+                                 @"RU-RU",
+                                 @"TR-TR",
+                                 @"PL-PL",
+                                 @"FR-FR",
+                                 @"IT-IT",
+                                 @"SV-SE",
+                                 @"PT-PT",
+                                 @"NL-NL",
+                                 @"EN-AU",
+                                 @"ZH-CN",
+                                 @"ZH-TW",
+                                 @"JA-JP",
+                                 @"AR-SA",
+                                 @"KO-KR",
+                                 @"PT-BR",
+                                 @"CS-CZ",
+                                 @"DA-DK",
+                                 @"NO-NO"];
+            [textPicker reloadAllComponents];
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+
+#pragma mark - UIPickerViewDataSource
+
+- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView {
+    return 1;
+}
+
+- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component {
+    return [self.pickerArray count];
+}
+
+#pragma mark - UIPickerViewDelegate
+
+- (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component {
+    return [pickerArray objectAtIndex:row];
+}
+
+- (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component {
+    
+    switch (currentTag) {
+        case tagLangText:
+        {
+            langtext.text = [textPicker.delegate pickerView:pickerView titleForRow:row forComponent:component];
+            break;
+        }
+        case tagHMILangText:
+        {
+            hmilangtext.text = [textPicker.delegate pickerView:pickerView titleForRow:row forComponent:component];
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+#pragma mark - Miscellaneous
+
+- (UIToolbar*)doneBar {
+    UIToolbar *toolBar = [[UIToolbar alloc] init];
+    toolBar.barStyle = UIBarStyleBlackTranslucent;
+    [toolBar sizeToFit];
+    
+    UIBarButtonItem *flexibleSpaceLeft = [[UIBarButtonItem alloc]
+                                          initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
+                                          target:nil
+                                          action:nil];
+    
+    UIBarButtonItem *doneButton = [[UIBarButtonItem alloc] initWithTitle:@"Done"
+                                                                   style:UIBarButtonItemStyleBordered
+                                                                  target:self
+                                                                  action:@selector(doneButtonPressed)];
+    
+    [toolBar setItems:[NSArray arrayWithObjects:flexibleSpaceLeft, doneButton, nil]];
+    
+    return toolBar;
+}
+
+- (void) doneButtonPressed {
+    [self.view endEditing:YES];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ChangeRegistrationViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ChangeRegistrationViewController.xib
new file mode 100644 (file)
index 0000000..05dd4d2
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ChangeRegistrationViewController.xib
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       <string key="NS.object.0">3742</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUIButton</string>
+                       <string>IBUILabel</string>
+                       <string>IBUITextField</string>
+                       <string>IBUIView</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <object class="IBProxyObject" id="372490531">
+                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBProxyObject" id="975951072">
+                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBUIView" id="191373211">
+                               <nil key="NSNextResponder"/>
+                               <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUILabel" id="132657633">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 34}, {76, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="779417607"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Language</string>
+                                               <object class="NSColor" key="IBUITextColor" id="83775735">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
+                                               </object>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="878946683">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">17</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="667554552">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">17</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUITextField" id="779417607">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{71, 63}, {179, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="866960930"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUITag">100</int>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">EN-US</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <object class="NSColorSpace" key="NSCustomColorSpace" id="409597863">
+                                                               <int key="NSID">2</int>
+                                                       </object>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="946691039">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">14</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="1027558153">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">14</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUILabel" id="866960930">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 133}, {172, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="74819292"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">HMI Display Language</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="667554552"/>
+                                       </object>
+                                       <object class="IBUITextField" id="74819292">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{71, 162}, {179, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="496830156"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUITag">101</int>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">EN-US</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="1027558153"/>
+                                       </object>
+                                       <object class="IBUIButton" id="496830156">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{112, 310}, {97, 37}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
+                                               <object class="NSColor" key="IBUIHighlightedTitleColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MQA</bytes>
+                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleShadowColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MC41AA</bytes>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">2</int>
+                                                       <double key="pointSize">15</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
+                                                       <double key="NSSize">15</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                               </array>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
+                               <reference key="NSNextKeyView" ref="132657633"/>
+                               <object class="NSColor" key="IBUIBackgroundColor">
+                                       <int key="NSColorSpace">1</int>
+                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                               </object>
+                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
+                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="191373211"/>
+                                       </object>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">hmilangtext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="74819292"/>
+                                       </object>
+                                       <string key="id">29</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">langtext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="779417607"/>
+                                       </object>
+                                       <string key="id">30</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="496830156"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">31</string>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <string key="id">0</string>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="191373211"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="132657633"/>
+                                                       <reference ref="866960930"/>
+                                                       <reference ref="496830156"/>
+                                                       <reference ref="74819292"/>
+                                                       <reference ref="779417607"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="372490531"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="975951072"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">4</string>
+                                               <reference key="object" ref="132657633"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">5</string>
+                                               <reference key="object" ref="779417607"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">6</string>
+                                               <reference key="object" ref="866960930"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">7</string>
+                                               <reference key="object" ref="74819292"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">17</string>
+                                               <reference key="object" ref="496830156"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.CustomClassName">ChangeRegistrationViewController</string>
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="-2.CustomClassName">UIResponder</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
+       </data>
+</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ConsoleViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ConsoleViewController.h
index 78f3bc3..a286f95 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ConsoleViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ConsoleViewController.h
@@ -1,15 +1,13 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  ConsoleViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLConsoleController.h"
+#import <SmartDeviceLink/SmartDeviceLink.h>
 
 @interface ConsoleViewController : UIViewController <SDLDebugToolConsole> {
     UITableView* consoleView;
     SDLConsoleController *consoleController;
-    
-    
 }
 
 @property (nonatomic, retain) IBOutlet UITableView* consoleView;

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ConsoleViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ConsoleViewController.m
index 9562e37..2f1f11b 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ConsoleViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ConsoleViewController.m
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  ConsoleViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "ConsoleViewController.h"
-#import "SDLBrain.h"
+#import "SmartDeviceLinkTester.h"
 
 
 @interface ConsoleViewController ()
@@ -26,7 +26,6 @@
 
 -(void) postConsoleControllerMainThread:(NSNotification *)notif {
     [consoleController appendMessage:[notif object]];
-
 }
 
 -(void) postConsoleController:(NSNotification *)notif{
@@ -34,24 +33,30 @@
 }
 
 
-
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(postConsoleController:) name:@"NewConsoleControllerObject" object:nil];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(postConsoleController:) name:@"onRPCResponse" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(postConsoleController:) name:@"consoleLog" object:nil];
     
     
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
     if (self) {
         self.title = NSLocalizedString(@"Console", @"Console");
-        self.tabBarItem.image = [UIImage imageNamed:@"cog_02"];
+        self.tabBarItem.image = [UIImage imageNamed:@"database"];
     }
 
     return self;
 }
 
+- (void) viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    if (consoleView.contentSize.height > consoleView.frame.size.height)
+    {
+        CGPoint offset = CGPointMake(0, consoleView.contentSize.height - consoleView.frame.size.height);
+        [self.consoleView setContentOffset:offset animated:YES];
+    }
+}
+
 
 - (void)viewDidLoad
 {

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ConsoleViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ConsoleViewController.xib
index 0a0739e..75bccb5 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ConsoleViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ConsoleViewController.xib
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
                        <string>IBProxyObject</string>
-                       <string>IBUIView</string>
                        <string>IBUITableView</string>
+                       <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -38,7 +38,7 @@
                                        <object class="IBUITableView" id="112803668">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">274</int>
-                                               <string key="NSFrameSize">{320, 411}</string>
+                                               <string key="NSFrameSize">{320, 367}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
@@ -57,7 +57,7 @@
                                                <float key="IBUISectionFooterHeight">22</float>
                                        </object>
                                </array>
-                               <string key="NSFrame">{{0, 20}, {320, 411}}</string>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
                                <reference key="NSSuperview"/>
                                <reference key="NSWindow"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
@@ -68,11 +68,32 @@
                                        </object>
                                </object>
                                <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
                                <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics">
+                                       <string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string>
+                                       <object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <array key="dict.sortedKeys">
+                                                       <integer value="1"/>
+                                                       <integer value="3"/>
+                                               </array>
+                                               <array key="dict.values">
+                                                       <string>{320, 480}</string>
+                                                       <string>{480, 320}</string>
+                                               </array>
+                                       </object>
+                                       <string key="IBUITargetRuntime">IBCocoaTouchFramework</string>
+                                       <string key="IBUIDisplayName">Retina 3.5-inch Full Screen</string>
+                                       <int key="IBUIType">0</int>
+                               </object>
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -80,7 +101,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -88,19 +109,19 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="112803668"/>
                                        </object>
-                                       <int key="connectionID">5</int>
+                                       <string key="id">5</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="112803668"/>
@@ -108,18 +129,18 @@
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
+                                               <string key="id">4</string>
                                                <reference key="object" ref="112803668"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
@@ -137,7 +158,6 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">5</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -164,12 +184,17 @@
                </object>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/CreateInteractionChoiceSetViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/CreateInteractionChoiceSetViewController.h
index c27400a..784af61 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/CreateInteractionChoiceSetViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/CreateInteractionChoiceSetViewController.h
@@ -1,10 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  CreateInteractionChoiceSetViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
-#import "SDLChoice.h"
+#import <SmartDeviceLink/SmartDeviceLink.h>
+
+#import "SmartDeviceLinkTester.h"
 
 @interface CreateInteractionChoiceSetViewController : UIViewController <UITextViewDelegate, UITextFieldDelegate> {
     
@@ -15,6 +16,6 @@
     
 }
 
--(IBAction)createInteractionPressed:(id)sender;
+-(IBAction)sendRPC:(id)sender;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/CreateInteractionChoiceSetViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/CreateInteractionChoiceSetViewController.m
index 702cf27..2462a8b 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/CreateInteractionChoiceSetViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/CreateInteractionChoiceSetViewController.m
@@ -1,8 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  CreateInteractionChoiceSetViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "CreateInteractionChoiceSetViewController.h"
+#import "AppDelegate.h"
 
 @interface CreateInteractionChoiceSetViewController ()
 
@@ -10,22 +11,30 @@
 
 @implementation CreateInteractionChoiceSetViewController
 
--(IBAction)createInteractionPressed:(id)sender {
+-(IBAction)sendRPC:(id)sender {
     NSString *choicestring = [choiceSetView text];
     NSArray *tempchoices = [choicestring componentsSeparatedByString:@", "];
     
     NSMutableArray *choices = [[NSMutableArray alloc] init];
     for (int i = 0; i < [tempchoices count]; i++) {
-        SDLChoice *cho = [[SDLChoice alloc] init];
-        cho.menuName = [tempchoices objectAtIndex:i];
-        cho.choiceID = [NSNumber numberWithInt: choiceID++];
-        cho.vrCommands = [NSArray arrayWithObject:[tempchoices objectAtIndex:i]];
-        [choices addObject:cho];
-        [cho release];
+        SDLChoice *choice = [[SDLChoice alloc] init];
+        choice.menuName = [tempchoices objectAtIndex:i];
+        choice.choiceID = [NSNumber numberWithInt: choiceID++];
+        choice.vrCommands = [[NSArray arrayWithObject:[tempchoices objectAtIndex:i]] mutableCopy];
+        [choices addObject:choice];
+        [choice release];
     }
     
-
-    [[SDLBrain getInstance] createInteractionChoiceSetPressedWithID:[NSNumber numberWithInt:[[idText text] intValue]] choiceSet:choices];
+    SDLCreateInteractionChoiceSet *req = [SDLRPCRequestFactory buildCreateInteractionChoiceSetWithID:[NSNumber numberWithInt:[[idText text] intValue]] choiceSet:choices correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
 }
 
 

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/CreateInteractionChoiceSetViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/CreateInteractionChoiceSetViewController.xib
index 5bcab9d..6421f0c 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/CreateInteractionChoiceSetViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/CreateInteractionChoiceSetViewController.xib
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUIButton</string>
+                       <string>IBUILabel</string>
                        <string>IBUITextField</string>
                        <string>IBUITextView</string>
-                       <string>IBUIButton</string>
                        <string>IBUIView</string>
-                       <string>IBUILabel</string>
-                       <string>IBProxyObject</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -35,7 +35,7 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="IBUILabel" id="841980478">
@@ -43,7 +43,6 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{20, 43}, {42, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="383648689"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -55,6 +54,7 @@
                                                <object class="NSColor" key="IBUITextColor" id="997860393">
                                                        <int key="NSColorSpace">1</int>
                                                        <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
                                                </object>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
@@ -63,8 +63,8 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">17</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="616785531">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="424810575">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">17</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -74,14 +74,13 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{70, 38}, {230, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="736122499"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">1</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -99,8 +98,8 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">14</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="14498908">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="639444519">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">14</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -110,7 +109,6 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{70, 142}, {230, 128}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="546530793"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <object class="NSColor" key="IBUIBackgroundColor">
@@ -120,20 +118,19 @@
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <bool key="IBUIMultipleTouchEnabled">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">Choice1, Choice2, Choice3</string>
                                                <object class="IBUITextInputTraits" key="IBUITextInputTraits">
                                                        <int key="IBUIAutocapitalizationType">2</int>
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="226334057"/>
-                                               <reference key="IBUIFont" ref="14498908"/>
+                                               <reference key="IBUIFont" ref="639444519"/>
                                        </object>
                                        <object class="IBUILabel" id="736122499">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{20, 96}, {84, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="944549479"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -147,30 +144,28 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="311492297"/>
-                                               <reference key="IBUIFont" ref="616785531"/>
+                                               <reference key="IBUIFont" ref="424810575"/>
                                        </object>
                                        <object class="IBUIButton" id="546530793">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{112, 297}, {97, 37}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentHorizontalAlignment">0</int>
                                                <int key="IBUIContentVerticalAlignment">0</int>
                                                <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
                                                <object class="NSColor" key="IBUIHighlightedTitleColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MQA</bytes>
                                                </object>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
                                                <object class="NSColor" key="IBUINormalTitleShadowColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MC41AA</bytes>
@@ -180,7 +175,7 @@
                                                        <double key="pointSize">15</double>
                                                </object>
                                                <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica-Bold</string>
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
                                                        <double key="NSSize">15</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -190,7 +185,6 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{20, 113}, {270, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="125957551"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -208,15 +202,13 @@
                                                        <double key="pointSize">13</double>
                                                </object>
                                                <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica</string>
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">13</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <reference key="NSNextKeyView" ref="841980478"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
@@ -231,6 +223,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -238,7 +231,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -246,7 +239,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="125957551"/>
                                        </object>
-                                       <int key="connectionID">9</int>
+                                       <string key="id">9</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -254,28 +247,28 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="383648689"/>
                                        </object>
-                                       <int key="connectionID">10</int>
+                                       <string key="id">10</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">createInteractionPressed:</string>
+                                               <string key="label">sendRPC:</string>
                                                <reference key="source" ref="546530793"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">11</int>
+                                       <string key="id">13</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="841980478"/>
@@ -288,43 +281,43 @@
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
+                                               <string key="id">4</string>
                                                <reference key="object" ref="841980478"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
+                                               <string key="id">5</string>
                                                <reference key="object" ref="383648689"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
+                                               <string key="id">6</string>
                                                <reference key="object" ref="125957551"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">7</int>
+                                               <string key="id">7</string>
                                                <reference key="object" ref="736122499"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">8</int>
+                                               <string key="id">8</string>
                                                <reference key="object" ref="546530793"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">12</int>
+                                               <string key="id">12</string>
                                                <reference key="object" ref="944549479"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
@@ -347,53 +340,21 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">12</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">CreateInteractionChoiceSetViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <string key="NS.key.0">createInteractionPressed:</string>
-                                               <string key="NS.object.0">id</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">createInteractionPressed:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">createInteractionPressed:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
-                                       <dictionary class="NSMutableDictionary" key="outlets">
-                                               <string key="choiceSetView">UITextView</string>
-                                               <string key="idText">UITextField</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <object class="IBToOneOutletInfo" key="choiceSetView">
-                                                       <string key="name">choiceSetView</string>
-                                                       <string key="candidateClassName">UITextView</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="idText">
-                                                       <string key="name">idText</string>
-                                                       <string key="candidateClassName">UITextField</string>
-                                               </object>
-                                       </dictionary>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/CreateInteractionChoiceSetViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteCommandViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteCommandViewController.h
index 844df93..cc31d47 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteCommandViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteCommandViewController.h
@@ -1,11 +1,12 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  DeleteCommandViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
+#import <SmartDeviceLink/SmartDeviceLink.h>
+
+#import "SmartDeviceLinkTester.h"
 #import "AddCommandViewController.h"
-#import "SDLAddCommandResponse.h"
 #import "AddMenuOption.h"
 
 @interface DeleteCommandViewController : UIViewController <UITableViewDelegate, UITableViewDataSource> {

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteCommandViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteCommandViewController.m
index 1ca8203..a840f36 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteCommandViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteCommandViewController.m
@@ -1,6 +1,6 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  DeleteCommandViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "DeleteCommandViewController.h"
 
@@ -14,7 +14,7 @@
 @implementation DeleteCommandViewController
 
 -(void)updateTable {
-    [SDLDebugTool logInfo:@"reloadData with Table"];
+//    [SDLDebugTool logInfo:@"reloadData with Table"];
     [commandsTable reloadData];
 }
 
@@ -27,9 +27,9 @@
     
     AddMenuOption *amo = [self returnAddMenuOptionWithMenuName:chosenCommand];
     
-    [SDLDebugTool logInfo:@"Menu Option Selected = %@", [amo menuName]];
+//    [SDLDebugTool logInfo:@"Menu Option Selected = %@", [amo menuName]];
     
-    [[SDLBrain getInstance] deleteCommandPressed:[amo menuID]];
+    [[SmartDeviceLinkTester getInstance] deleteCommandPressed:[amo menuID]];
      
     [commandsIssued removeObject:amo];
     [self updateTable];
@@ -63,33 +63,24 @@
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    
-    [SDLDebugTool logInfo:@"Got to cellForRowAtIndexPath"];
     static NSString *CellIdentifier = @"Cell";
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
     
     if (cell == nil) { 
         cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; 
-    } 
-    
-    [SDLDebugTool logInfo:@"right before figuring out cell text"];
-    [SDLDebugTool logInfo:@"indexPath = %d", indexPath.row];
+    }
     
     @try {
-        [SDLDebugTool logInfo:@"about to print %@",[[commandsIssued objectAtIndex:indexPath.row] menuName]];
-        
         // Configure the cell. 
         cell.textLabel.text = [NSString stringWithFormat:@"%@",[[commandsIssued objectAtIndex:indexPath.row] menuName]]; 
     }
     @catch (NSException *exception) {
-        [SDLDebugTool logInfo:@"Failed to print out name of commandsIssued"];
+
     }
     @finally {
-        [SDLDebugTool logInfo:@"Finally"];
+
     }
     
-    [SDLDebugTool logInfo:@"finished cellForRowAtIndexPath"];
-    
     return cell;
 }
 

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteCommandViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteCommandViewController.xib
index 9b99c65..2407f17 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteCommandViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteCommandViewController.xib
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
                        <string>IBProxyObject</string>
-                       <string>IBUIView</string>
                        <string>IBUITableView</string>
+                       <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -32,7 +32,7 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="IBUITableView" id="636802009">
@@ -40,7 +40,6 @@
                                                <int key="NSvFlags">274</int>
                                                <string key="NSFrameSize">{320, 367}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <object class="NSColor" key="IBUIBackgroundColor">
                                                        <int key="NSColorSpace">1</int>
@@ -59,9 +58,6 @@
                                        </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
-                               <reference key="NSNextKeyView"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
                                        <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
@@ -75,6 +71,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -82,7 +79,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -90,19 +87,19 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="636802009"/>
                                        </object>
-                                       <int key="connectionID">17</int>
+                                       <string key="id">17</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="636802009"/>
@@ -110,18 +107,18 @@
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">16</int>
+                                               <string key="id">16</string>
                                                <reference key="object" ref="636802009"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
@@ -139,39 +136,21 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">17</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">DeleteCommandViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <object class="NSMutableDictionary" key="outlets">
-                                               <string key="NS.key.0">commandsTable</string>
-                                               <string key="NS.object.0">UITableView</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <string key="NS.key.0">commandsTable</string>
-                                               <object class="IBToOneOutletInfo" key="NS.object.0">
-                                                       <string key="name">commandsTable</string>
-                                                       <string key="candidateClassName">UITableView</string>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/DeleteCommandViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteInteractionChoiceSetViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteInteractionChoiceSetViewController.h
index ad2ee44..561d380 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteInteractionChoiceSetViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteInteractionChoiceSetViewController.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  DeleteInteractionChoiceSetViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
+#import "SmartDeviceLinkTester.h"
 
 @interface DeleteInteractionChoiceSetViewController : UIViewController <UITextFieldDelegate> {
     
@@ -11,6 +11,6 @@
     
 }
 
--(IBAction)deleteInteractionPressed:(id)sender;
+-(IBAction)sendRPC:(id)sender;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteInteractionChoiceSetViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteInteractionChoiceSetViewController.m
index 9ae6bed..90b4900 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteInteractionChoiceSetViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteInteractionChoiceSetViewController.m
@@ -1,8 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  DeleteInteractionChoiceSetViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "DeleteInteractionChoiceSetViewController.h"
+#import "AppDelegate.h"
 
 @interface DeleteInteractionChoiceSetViewController ()
 
@@ -11,8 +12,18 @@
 @implementation DeleteInteractionChoiceSetViewController
 
 
--(IBAction)deleteInteractionPressed:(id)sender {
-    [[SDLBrain getInstance] deleteInteractionChoiceSetPressedWithID:[NSNumber numberWithInt:[[idText text] intValue]]];
+-(IBAction)sendRPC:(id)sender
+{
+    SDLDeleteInteractionChoiceSet *req = [SDLRPCRequestFactory buildDeleteInteractionChoiceSetWithID:[NSNumber numberWithInt:[[idText text] intValue]] correlationID: [[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
 }
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteInteractionChoiceSetViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteInteractionChoiceSetViewController.xib
index 00c3d8e..b288480 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteInteractionChoiceSetViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteInteractionChoiceSetViewController.xib
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
-                       <string>IBUITextField</string>
+                       <string>IBProxyObject</string>
                        <string>IBUIButton</string>
-                       <string>IBUIView</string>
                        <string>IBUILabel</string>
-                       <string>IBProxyObject</string>
+                       <string>IBUITextField</string>
+                       <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -34,7 +34,7 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="IBUILabel" id="168417619">
@@ -42,7 +42,6 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{20, 57}, {42, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="429674578"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -54,6 +53,7 @@
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">1</int>
                                                        <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
                                                </object>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
@@ -63,7 +63,7 @@
                                                        <double key="pointSize">17</double>
                                                </object>
                                                <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica</string>
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">17</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -73,7 +73,6 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{70, 52}, {230, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="363279639"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -99,7 +98,7 @@
                                                        <double key="pointSize">14</double>
                                                </object>
                                                <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica</string>
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">14</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -109,22 +108,21 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{112, 209}, {97, 37}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentHorizontalAlignment">0</int>
                                                <int key="IBUIContentVerticalAlignment">0</int>
                                                <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
                                                <object class="NSColor" key="IBUIHighlightedTitleColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MQA</bytes>
                                                </object>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
                                                <object class="NSColor" key="IBUINormalTitleShadowColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MC41AA</bytes>
@@ -134,15 +132,13 @@
                                                        <double key="pointSize">15</double>
                                                </object>
                                                <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica-Bold</string>
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
                                                        <double key="NSSize">15</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <reference key="NSNextKeyView" ref="168417619"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
@@ -157,6 +153,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -164,7 +161,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -172,28 +169,28 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="429674578"/>
                                        </object>
-                                       <int key="connectionID">8</int>
+                                       <string key="id">8</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">deleteInteractionPressed:</string>
+                                               <string key="label">sendRPC:</string>
                                                <reference key="source" ref="363279639"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">9</int>
+                                       <string key="id">10</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="168417619"/>
@@ -203,28 +200,28 @@
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
+                                               <string key="id">5</string>
                                                <reference key="object" ref="168417619"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
+                                               <string key="id">6</string>
                                                <reference key="object" ref="429674578"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">7</int>
+                                               <string key="id">7</string>
                                                <reference key="object" ref="363279639"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
@@ -244,50 +241,21 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">9</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">DeleteInteractionChoiceSetViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <string key="NS.key.0">deleteInteractionPressed:</string>
-                                               <string key="NS.object.0">id</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">deleteInteractionPressed:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">deleteInteractionPressed:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="outlets">
-                                               <string key="NS.key.0">idText</string>
-                                               <string key="NS.object.0">UITextField</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <string key="NS.key.0">idText</string>
-                                               <object class="IBToOneOutletInfo" key="NS.object.0">
-                                                       <string key="name">idText</string>
-                                                       <string key="candidateClassName">UITextField</string>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/DeleteInteractionChoiceSetViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteSubMenuViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteSubMenuViewController.h
index 6085db2..69b5145 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteSubMenuViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteSubMenuViewController.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  DeleteSubMenuViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
+#import "SmartDeviceLinkTester.h"
 #import "AddSubMenuViewController.h"
 #import "AddMenuOption.h"
 

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteSubMenuViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteSubMenuViewController.m
index 3448fa4..bd1e811 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteSubMenuViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteSubMenuViewController.m
@@ -1,6 +1,6 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  DeleteSubMenuViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "DeleteSubMenuViewController.h"
 
@@ -25,7 +25,7 @@
     
     AddMenuOption *amo = [self returnAddMenuOptionWithMenuName:chosenSubMenu];
     
-    [[SDLBrain getInstance] deleteSubMenuPressedwithID:[amo menuID]];
+    [[SmartDeviceLinkTester getInstance] deleteSubMenuPressedwithID:[amo menuID]];
     
     [subMenuIssued removeObject:amo];
     [self updateTable];

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteSubMenuViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteSubMenuViewController.xib
index 434dda8..f3f16f9 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteSubMenuViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/DeleteSubMenuViewController.xib
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
                        <string>IBProxyObject</string>
-                       <string>IBUIView</string>
                        <string>IBUITableView</string>
+                       <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -32,7 +32,7 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="IBUITableView" id="618310672">
@@ -40,7 +40,6 @@
                                                <int key="NSvFlags">274</int>
                                                <string key="NSFrameSize">{320, 367}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <object class="NSColor" key="IBUIBackgroundColor">
                                                        <int key="NSColorSpace">1</int>
@@ -59,9 +58,6 @@
                                        </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
-                               <reference key="NSNextKeyView"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
                                        <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
@@ -75,6 +71,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -82,7 +79,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -90,19 +87,19 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="618310672"/>
                                        </object>
-                                       <int key="connectionID">11</int>
+                                       <string key="id">11</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="618310672"/>
@@ -110,18 +107,18 @@
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">10</int>
+                                               <string key="id">10</string>
                                                <reference key="object" ref="618310672"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
@@ -139,39 +136,21 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">11</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">DeleteSubMenuViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <object class="NSMutableDictionary" key="outlets">
-                                               <string key="NS.key.0">subMenuTable</string>
-                                               <string key="NS.object.0">UITableView</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <string key="NS.key.0">subMenuTable</string>
-                                               <object class="IBToOneOutletInfo" key="NS.object.0">
-                                                       <string key="name">subMenuTable</string>
-                                                       <string key="candidateClassName">UITableView</string>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/DeleteSubMenuViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EncodedSyncPDataViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EncodedSyncPDataViewController.h
deleted file mode 100644 (file)
index 3544062..0000000
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EncodedSyncPDataViewController.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <UIKit/UIKit.h>
-#import "SDLBrain.h"
-
-@interface EncodedSyncPDataViewController : UIViewController <UITextViewDelegate> {
-    IBOutlet UITextView *encodedDataText; 
-}
-
--(IBAction)sendESPData:(id)sender;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EncodedSyncPDataViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EncodedSyncPDataViewController.m
deleted file mode 100644 (file)
index 99063b6..0000000
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EncodedSyncPDataViewController.m
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "EncodedSyncPDataViewController.h"
-
-@interface EncodedSyncPDataViewController ()
-
-@end
-
-@implementation EncodedSyncPDataViewController
-
-
--(IBAction)sendESPData:(id)sender {
-    [[SDLBrain getInstance] sendEncodedSyncPData:[NSMutableArray arrayWithObjects:[encodedDataText text], nil]];
-}
-
-
-- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
-    
-    if([text isEqualToString:@"\n"]) {
-        [textView resignFirstResponder];
-        return NO;
-    }
-    
-    return YES;
-}
-
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self.title = @"EncodedSyncPData";
-    
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        // Custom initialization
-    }
-    return self;
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    encodedDataText.delegate = self;
-    [[encodedDataText layer] setCornerRadius:10];
-}
-
-- (void)viewDidUnload
-{
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-    return (interfaceOrientation == UIInterfaceOrientationPortrait);
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EndAudioPassThruViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EndAudioPassThruViewController.h
new file mode 100644 (file)
index 0000000..9c31646
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EndAudioPassThruViewController.h
@@ -0,0 +1,14 @@
+//  EndAudioPassThruViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+
+@interface EndAudioPassThruViewController : UIViewController {
+ 
+}
+
+-(IBAction)sendRPC:(id)sender;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EndAudioPassThruViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EndAudioPassThruViewController.m
new file mode 100644 (file)
index 0000000..0953aae
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EndAudioPassThruViewController.m
@@ -0,0 +1,62 @@
+//  EndAudioPassThruViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "EndAudioPassThruViewController.h"
+#import "AppDelegate.h"
+
+@interface EndAudioPassThruViewController ()
+
+@end
+
+@implementation EndAudioPassThruViewController
+
+
+-(IBAction)sendRPC:(id)sender {
+    
+    [[SmartDeviceLinkTester getInstance] buildEndAudioPassThru];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return NO;
+}
+
+
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"EndAudioPassThru";
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EndAudioPassThruViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EndAudioPassThruViewController.xib
new file mode 100644 (file)
index 0000000..4ce3fc6
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EndAudioPassThruViewController.xib
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       <string key="NS.object.0">3742</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUIButton</string>
+                       <string>IBUIView</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <object class="IBProxyObject" id="372490531">
+                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBProxyObject" id="975951072">
+                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBUIView" id="191373211">
+                               <nil key="NSNextResponder"/>
+                               <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUIButton" id="496830156">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{40, 162}, {240, 44}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
+                                               <object class="NSColor" key="IBUIHighlightedTitleColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MQA</bytes>
+                                               </object>
+                                               <string key="IBUINormalTitle">Send EndAudioPassThru RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleShadowColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MC41AA</bytes>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">2</int>
+                                                       <double key="pointSize">15</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
+                                                       <double key="NSSize">15</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                               </array>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
+                               <reference key="NSNextKeyView" ref="496830156"/>
+                               <object class="NSColor" key="IBUIBackgroundColor">
+                                       <int key="NSColorSpace">1</int>
+                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                               </object>
+                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
+                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="191373211"/>
+                                       </object>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="496830156"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">27</string>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <string key="id">0</string>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="191373211"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="496830156"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="372490531"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="975951072"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">17</string>
+                                               <reference key="object" ref="496830156"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.CustomClassName">EndAudioPassThruViewController</string>
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="-2.CustomClassName">UIResponder</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
+       </data>
+</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetDTCsViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetDTCsViewController.h
new file mode 100644 (file)
index 0000000..fe09652
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetDTCsViewController.h
@@ -0,0 +1,16 @@
+//  GetDTCsViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+
+@interface GetDTCsViewController : UIViewController <UITextFieldDelegate> {
+ 
+    IBOutlet UITextField *ecunametext;
+    
+}
+
+-(IBAction)sendRPC:(id)sender;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetDTCsViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetDTCsViewController.m
new file mode 100644 (file)
index 0000000..2b62a40
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetDTCsViewController.m
@@ -0,0 +1,66 @@
+//  SGetDTCsViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "GetDTCsViewController.h"
+#import "AppDelegate.h"
+
+@interface GetDTCsViewController ()
+
+@end
+
+@implementation GetDTCsViewController
+
+
+-(IBAction)sendRPC:(id)sender {
+    
+    SDLGetDTCs *req = [SDLRPCRequestFactory buildGetDTCsWithECUName:[NSNumber numberWithInt:[[ecunametext text] intValue]] correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return NO;
+}
+
+
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"GetDTCs";
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    ecunametext.delegate = self;
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetDTCsViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetDTCsViewController.xib
new file mode 100644 (file)
index 0000000..77ae12b
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetDTCsViewController.xib
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       <string key="NS.object.0">3742</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUIButton</string>
+                       <string>IBUILabel</string>
+                       <string>IBUITextField</string>
+                       <string>IBUIView</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <object class="IBProxyObject" id="372490531">
+                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBProxyObject" id="975951072">
+                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBUIView" id="191373211">
+                               <nil key="NSNextResponder"/>
+                               <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUIButton" id="496830156">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{112, 310}, {97, 37}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
+                                               <object class="NSColor" key="IBUIHighlightedTitleColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MQA</bytes>
+                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleShadowColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MC41AA</bytes>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">2</int>
+                                                       <double key="pointSize">15</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
+                                                       <double key="NSSize">15</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUILabel" id="811884398">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 25}, {86, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="459427216"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">ECU Name</string>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
+                                               </object>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">17</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">17</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUITextField" id="459427216">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{134, 20}, {166, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">2000</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <object class="NSColorSpace" key="NSCustomColorSpace">
+                                                               <int key="NSID">2</int>
+                                                       </object>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIKeyboardType">4</int>
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">14</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">14</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                               </array>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
+                               <reference key="NSNextKeyView" ref="811884398"/>
+                               <object class="NSColor" key="IBUIBackgroundColor">
+                                       <int key="NSColorSpace">1</int>
+                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                               </object>
+                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
+                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="191373211"/>
+                                       </object>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">ecunametext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="459427216"/>
+                                       </object>
+                                       <string key="id">34</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="496830156"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">33</string>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <string key="id">0</string>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="191373211"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="496830156"/>
+                                                       <reference ref="811884398"/>
+                                                       <reference ref="459427216"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="372490531"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="975951072"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">17</string>
+                                               <reference key="object" ref="496830156"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">27</string>
+                                               <reference key="object" ref="811884398"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">28</string>
+                                               <reference key="object" ref="459427216"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.CustomClassName">GetDTCsViewController</string>
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="-2.CustomClassName">UIResponder</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
+       </data>
+</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetVehicleDataViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetVehicleDataViewController.h
new file mode 100644 (file)
index 0000000..d2b0efb
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetVehicleDataViewController.h
@@ -0,0 +1,16 @@
+//  GetVehicleDataViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+
+@interface GetVehicleDataViewController : UIViewController <UITableViewDataSource, UITableViewDelegate> {
+    
+    NSMutableArray *vehicleDataList;
+    IBOutlet UITableView *vehicleDataTable;
+    
+}
+
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetVehicleDataViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetVehicleDataViewController.m
new file mode 100644 (file)
index 0000000..c30be6e
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetVehicleDataViewController.m
@@ -0,0 +1,186 @@
+//  GetVehicleDataViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "GetVehicleDataViewController.h"
+#import "AppDelegate.h"
+
+@interface GetVehicleDataViewController ()
+
+@end
+
+@implementation GetVehicleDataViewController
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+    NSString *chosenVehicleData =  cell.textLabel.text;
+    
+    SDLGetVehicleData *req = [[SDLGetVehicleData alloc] init];
+    
+    if ([chosenVehicleData isEqualToString:@"GPS"]) {
+        req.gps = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"Speed"]) {
+        req.speed = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"RPM"]) {
+        req.rpm = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"FuelLevel"]) {
+        req.fuelLevel = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"FuelLevelState"]) {
+        req.fuelLevelState = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"InstantFuelConsuption"]) {
+        req.instantFuelConsumption = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"ExternalTemperature"]) {
+        req.externalTemperature = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"VIN"]) {
+        req.vin = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"PRNDL"]) {
+        req.prndl = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"TirePressure"]) {
+        req.tirePressure = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"Odometer"]) {
+        req.odometer = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"BeltStatus"]) {
+        req.beltStatus = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"BodyInformation"]) {
+        req.bodyInformation = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"DeviceStatus"]) {
+        req.deviceStatus = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"DriverBraking"]) {
+        req.driverBraking = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"WiperStatus"]) {
+        req.wiperStatus = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"HeadLampStatus"]) {
+        req.headLampStatus = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"EngineTorque"]) {
+        req.engineTorque = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"AccPedalPosition"]) {
+        req.accPedalPosition = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"SteeringWheelAngle"]) {
+        req.steeringWheelAngle = [NSNumber numberWithBool:true];
+    }
+    
+    req.correlationID = [[SmartDeviceLinkTester getInstance] getNextCorrID];
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+        
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+    
+    [req release];
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+    return @"Select Vehicle Data";
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return [vehicleDataList count]; 
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    static NSString *CellIdentifier = @"Cell";
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+    
+    if (cell == nil) { 
+        cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; 
+    } 
+    
+    // Configure the cell. 
+    cell.textLabel.text = [vehicleDataList objectAtIndex:indexPath.row]; 
+    
+    return cell;
+}
+
+
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"GetVehicleData";
+        
+    NSArray *tempArray = [NSArray arrayWithObjects: @"GPS",
+                          @"Speed",
+                          @"RPM",
+                          @"FuelLevel",
+                          @"FuelLevelState",
+                          @"InstantFuelConsuption",
+                          @"ExternalTemperature",
+                          @"VIN",
+                          @"PRNDL",
+                          @"TirePressure",
+                          @"Odometer",
+                          @"BeltStatus",
+                          @"BodyInformation",
+                          @"DeviceStatus",
+                          @"DriverBraking",
+                          @"WiperStatus",
+                          @"HeadLampStatus",
+                          @"EngineTorque",
+                          @"AccPedalPosition",
+                          @"SteeringWheelAngle",
+                          nil];
+    
+    vehicleDataList = [[NSMutableArray alloc] init];
+    [vehicleDataList addObjectsFromArray:tempArray];
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+-(void)dealloc {
+    [vehicleDataList release];
+    [super dealloc];
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    vehicleDataTable.delegate = self;
+    vehicleDataTable.dataSource = self;
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetVehicleDataViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetVehicleDataViewController.xib
new file mode 100644 (file)
index 0000000..dba8a82
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/GetVehicleDataViewController.xib
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       <string key="NS.object.0">3742</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUITableView</string>
+                       <string>IBUIView</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <object class="IBProxyObject" id="372490531">
+                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBProxyObject" id="975951072">
+                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBUIView" id="191373211">
+                               <nil key="NSNextResponder"/>
+                               <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUITableView" id="369649950">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">274</int>
+                                               <string key="NSFrameSize">{320, 367}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <object class="NSColor" key="IBUIBackgroundColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                                               </object>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <bool key="IBUIAlwaysBounceVertical">YES</bool>
+                                               <int key="IBUIStyle">1</int>
+                                               <int key="IBUISeparatorStyle">2</int>
+                                               <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+                                               <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+                                               <float key="IBUIRowHeight">44</float>
+                                               <float key="IBUISectionHeaderHeight">10</float>
+                                               <float key="IBUISectionFooterHeight">10</float>
+                                       </object>
+                               </array>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
+                               <reference key="NSNextKeyView" ref="369649950"/>
+                               <object class="NSColor" key="IBUIBackgroundColor">
+                                       <int key="NSColorSpace">1</int>
+                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                               </object>
+                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
+                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="191373211"/>
+                                       </object>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">vehicleDataTable</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="369649950"/>
+                                       </object>
+                                       <string key="id">7</string>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <string key="id">0</string>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="191373211"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="369649950"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="372490531"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="975951072"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">4</string>
+                                               <reference key="object" ref="369649950"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.CustomClassName">GetVehicleDataViewController</string>
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="-2.CustomClassName">UIResponder</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <dictionary class="NSMutableDictionary" key="4.IBAttributePlaceholdersKey"/>
+                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
+       </data>
+</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformAudioPassThruViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformAudioPassThruViewController.h
new file mode 100644 (file)
index 0000000..a4468be
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformAudioPassThruViewController.h
@@ -0,0 +1,23 @@
+//  PerformAudioPassThruViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+
+@interface PerformAudioPassThruViewController : UIViewController <UITextFieldDelegate> {
+ 
+    IBOutlet UITextField *prompttext;
+    IBOutlet UITextField *line1text;
+    IBOutlet UITextField *line2text;
+    IBOutlet UITextField *sampleratetext;
+    IBOutlet UITextField *durtext;
+    IBOutlet UITextField *bitspersampletext;
+    IBOutlet UITextField *audiotypetext;
+    IBOutlet UITextField *mutetext;
+    
+}
+
+-(IBAction)sendRPC:(id)sender;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformAudioPassThruViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformAudioPassThruViewController.m
new file mode 100644 (file)
index 0000000..22ffdf1
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformAudioPassThruViewController.m
@@ -0,0 +1,70 @@
+//  PerformAudioPassThruViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "PerformAudioPassThruViewController.h"
+#import "AppDelegate.h"
+
+@interface PerformAudioPassThruViewController ()
+
+@end
+
+@implementation PerformAudioPassThruViewController
+
+
+-(IBAction)sendRPC:(id)sender {
+    
+    [[SmartDeviceLinkTester getInstance] buildPerformAudioPassThru:[prompttext text] audioPassThruDisplayText1:[line1text text] audioPassThruDisplayText2:[line2text text] samplingRate:[SDLSamplingRate valueOf:[sampleratetext text]] maxDuration:[NSNumber numberWithInt:[[durtext text] intValue]] bitsPerSample:[SDLBitsPerSample valueOf:[bitspersampletext text]] audioType:[SDLAudioType valueOf:[audiotypetext text]] muteAudio:[NSNumber numberWithBool:[[mutetext text] boolValue]]];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return NO;
+}
+
+
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"PerformAudioPassThru";
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    prompttext.delegate = self;
+    line1text.delegate = self;
+    line2text.delegate = self;
+    sampleratetext.delegate = self;
+    durtext.delegate = self;
+    bitspersampletext.delegate = self;
+    audiotypetext.delegate = self;
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformAudioPassThruViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformAudioPassThruViewController.xib
new file mode 100644 (file)
index 0000000..4aed297
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformAudioPassThruViewController.xib
@@ -0,0 +1,729 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       <string key="NS.object.0">3742</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUIButton</string>
+                       <string>IBUILabel</string>
+                       <string>IBUITextField</string>
+                       <string>IBUIView</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <object class="IBProxyObject" id="372490531">
+                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBProxyObject" id="975951072">
+                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBUIView" id="191373211">
+                               <nil key="NSNextResponder"/>
+                               <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUILabel" id="132657633">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 51}, {52, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="779417607"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Line 1:</string>
+                                               <object class="NSColor" key="IBUITextColor" id="83775735">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
+                                               </object>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="878946683">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">17</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="1050715747">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">17</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUITextField" id="779417607">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{80, 46}, {220, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="866960930"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">APT Display Text 1</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <object class="NSColorSpace" key="NSCustomColorSpace" id="409597863">
+                                                               <int key="NSID">2</int>
+                                                       </object>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="946691039">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">14</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="256739505">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">14</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUILabel" id="866960930">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 89}, {52, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="74819292"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Line 2:</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="1050715747"/>
+                                       </object>
+                                       <object class="IBUITextField" id="74819292">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{80, 84}, {220, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="243375765"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">APT Display Text 2</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="256739505"/>
+                                       </object>
+                                       <object class="IBUITextField" id="905157747">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{134, 121}, {166, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="368983458"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">8KHZ</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="256739505"/>
+                                       </object>
+                                       <object class="IBUILabel" id="243375765">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 126}, {103, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="905157747"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Sample Rate:</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="1050715747"/>
+                                       </object>
+                                       <object class="IBUITextField" id="500774048">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{134, 158}, {166, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="126855498"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">10000</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="256739505"/>
+                                       </object>
+                                       <object class="IBUILabel" id="368983458">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 163}, {106, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="500774048"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Max Duration:</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="1050715747"/>
+                                       </object>
+                                       <object class="IBUITextField" id="725526490">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{134, 195}, {166, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="255313930"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">8_BIT</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="256739505"/>
+                                       </object>
+                                       <object class="IBUILabel" id="126855498">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 200}, {105, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="725526490"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Bits / Sample:</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="1050715747"/>
+                                       </object>
+                                       <object class="IBUIButton" id="496830156">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{112, 310}, {97, 37}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
+                                               <object class="NSColor" key="IBUIHighlightedTitleColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MQA</bytes>
+                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleShadowColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MC41AA</bytes>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">2</int>
+                                                       <double key="pointSize">15</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
+                                                       <double key="NSSize">15</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUITextField" id="68818936">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{134, 232}, {166, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="591505240"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">PCM</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="256739505"/>
+                                       </object>
+                                       <object class="IBUILabel" id="255313930">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 237}, {91, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="68818936"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Audio Type:</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="1050715747"/>
+                                       </object>
+                                       <object class="IBUITextField" id="471967435">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{134, 270}, {166, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="496830156"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">NO</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="256739505"/>
+                                       </object>
+                                       <object class="IBUILabel" id="591505240">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 275}, {91, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="471967435"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Mute Audio:</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="1050715747"/>
+                                       </object>
+                                       <object class="IBUILabel" id="403619870">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{17, 14}, {60, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="73998249"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Prompt:</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="1050715747"/>
+                                       </object>
+                                       <object class="IBUITextField" id="73998249">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{80, 9}, {220, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="132657633"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">Initial Prompt</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="256739505"/>
+                                       </object>
+                               </array>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
+                               <reference key="NSNextKeyView" ref="403619870"/>
+                               <object class="NSColor" key="IBUIBackgroundColor">
+                                       <int key="NSColorSpace">1</int>
+                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                               </object>
+                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
+                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="191373211"/>
+                                       </object>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">line1text</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="779417607"/>
+                                       </object>
+                                       <string key="id">18</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">line2text</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="74819292"/>
+                                       </object>
+                                       <string key="id">19</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">sampleratetext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="905157747"/>
+                                       </object>
+                                       <string key="id">32</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">prompttext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="73998249"/>
+                                       </object>
+                                       <string key="id">33</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">durtext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="500774048"/>
+                                       </object>
+                                       <string key="id">34</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">bitspersampletext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="725526490"/>
+                                       </object>
+                                       <string key="id">35</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">audiotypetext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="68818936"/>
+                                       </object>
+                                       <string key="id">36</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="496830156"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">31</string>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <string key="id">0</string>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="191373211"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="132657633"/>
+                                                       <reference ref="779417607"/>
+                                                       <reference ref="866960930"/>
+                                                       <reference ref="74819292"/>
+                                                       <reference ref="725526490"/>
+                                                       <reference ref="126855498"/>
+                                                       <reference ref="905157747"/>
+                                                       <reference ref="243375765"/>
+                                                       <reference ref="500774048"/>
+                                                       <reference ref="368983458"/>
+                                                       <reference ref="496830156"/>
+                                                       <reference ref="68818936"/>
+                                                       <reference ref="255313930"/>
+                                                       <reference ref="403619870"/>
+                                                       <reference ref="73998249"/>
+                                                       <reference ref="471967435"/>
+                                                       <reference ref="591505240"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="372490531"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="975951072"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">4</string>
+                                               <reference key="object" ref="132657633"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">5</string>
+                                               <reference key="object" ref="779417607"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">6</string>
+                                               <reference key="object" ref="866960930"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">7</string>
+                                               <reference key="object" ref="74819292"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">8</string>
+                                               <reference key="object" ref="905157747"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">9</string>
+                                               <reference key="object" ref="243375765"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">11</string>
+                                               <reference key="object" ref="500774048"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">12</string>
+                                               <reference key="object" ref="368983458"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">13</string>
+                                               <reference key="object" ref="725526490"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">14</string>
+                                               <reference key="object" ref="126855498"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">17</string>
+                                               <reference key="object" ref="496830156"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">27</string>
+                                               <reference key="object" ref="68818936"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">28</string>
+                                               <reference key="object" ref="255313930"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">29</string>
+                                               <reference key="object" ref="403619870"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">30</string>
+                                               <reference key="object" ref="73998249"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">37</string>
+                                               <reference key="object" ref="471967435"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">38</string>
+                                               <reference key="object" ref="591505240"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.CustomClassName">PerformAudioPassThruViewController</string>
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="-2.CustomClassName">UIResponder</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="29.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="30.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="37.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="38.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
+       </data>
+</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformInteractionViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformInteractionViewController.h
index e09f026..84734c3 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformInteractionViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformInteractionViewController.h
@@ -1,11 +1,11 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  PerformInteractionViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
-#import "SDLInteractionMode.h"
-#import "SDLTTSChunkFactory.h"
+#import <SmartDeviceLink/SmartDeviceLink.h>
+
+#import "SmartDeviceLinkTester.h"
 
 @interface PerformInteractionViewController : UIViewController <UITextFieldDelegate, UITextViewDelegate> {
     
@@ -25,6 +25,6 @@
 }
 
 -(IBAction)displayTimeoutSlider:(id)sender;
--(IBAction)performInteractionPressed:(id)sender;
+-(IBAction)sendRPC:(id)sender;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformInteractionViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformInteractionViewController.m
index 8e47d35..2242354 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformInteractionViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformInteractionViewController.m
@@ -1,8 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  PerformInteractionViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "PerformInteractionViewController.h"
+#import "AppDelegate.h"
 
 @interface PerformInteractionViewController ()
 
@@ -10,7 +11,7 @@
 
 @implementation PerformInteractionViewController
 
--(IBAction)performInteractionPressed:(id)sender {
+-(IBAction)sendRPC:(id)sender {
     
     NSArray *tempPrompt = [[initPromptText text] componentsSeparatedByString:@", "];
     NSMutableArray *initialPrompt = [[NSMutableArray alloc] init];
@@ -41,11 +42,18 @@
         im = [SDLInteractionMode BOTH];
     }
     
-    [[SDLBrain getInstance] performInteractionPressedwithInitialPrompt:initialPrompt initialText:[initialText text] interactionChoiceSetIDList:[NSArray arrayWithObject:[NSNumber numberWithInt:[[choiceIDText text] intValue]]] helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:im timeout:[NSNumber numberWithDouble:(round([timeoutSlider value])*1000)]];
+    [[SmartDeviceLinkTester getInstance] performInteractionPressedwithInitialPrompt:initialPrompt initialText:[initialText text] interactionChoiceSetIDList:[NSArray arrayWithObject:[NSNumber numberWithInt:[[choiceIDText text] intValue]]] helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:im timeout:[NSNumber numberWithDouble:(round([timeoutSlider value])*1000)]];
     
     [initialPrompt release];
     [helpChunks release];
     [timeoutChunks release];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
 }
 
 

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformInteractionViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformInteractionViewController.xib
index 3208235..59debcf 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformInteractionViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/PerformInteractionViewController.xib
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
                        <string>IBProxyObject</string>
-                       <string>IBUISlider</string>
-                       <string>IBUILabel</string>
                        <string>IBUIButton</string>
+                       <string>IBUILabel</string>
+                       <string>IBUIScrollView</string>
+                       <string>IBUISegmentedControl</string>
+                       <string>IBUISlider</string>
                        <string>IBUITextField</string>
                        <string>IBUITextView</string>
-                       <string>IBUISegmentedControl</string>
-                       <string>IBUIScrollView</string>
                        <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
@@ -38,11 +38,9 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
                                        <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
@@ -55,7 +53,7 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIScrollView" id="537223134">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="IBUITextView" id="748105586">
@@ -63,7 +61,6 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{40, 451}, {280, 98}}</string>
                                                <reference key="NSSuperview" ref="537223134"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="649070709"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <object class="NSColor" key="IBUIBackgroundColor" id="297752020">
@@ -82,8 +79,8 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">14</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="374068860">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="626254668">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">14</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -93,7 +90,6 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{128, 629}, {42, 21}}</string>
                                                <reference key="NSSuperview" ref="537223134"/>
-                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
@@ -104,6 +100,7 @@
                                                <object class="NSColor" key="IBUITextColor" id="993445497">
                                                        <int key="NSColorSpace">1</int>
                                                        <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
                                                </object>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
@@ -112,8 +109,8 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">17</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="631696776">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="463066967">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">17</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -127,7 +124,6 @@
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{20, 20}, {101, 21}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="280580786"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -141,14 +137,13 @@
                                                                <int key="IBUIBaselineAdjustment">0</int>
                                                                <float key="IBUIMinimumFontSize">10</float>
                                                                <reference key="IBUIFontDescription" ref="315224406"/>
-                                                               <reference key="IBUIFont" ref="631696776"/>
+                                                               <reference key="IBUIFont" ref="463066967"/>
                                                        </object>
                                                        <object class="IBUILabel" id="280580786">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{20, 35}, {270, 21}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="846861908"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -165,8 +160,8 @@
                                                                        <int key="type">1</int>
                                                                        <double key="pointSize">13</double>
                                                                </object>
-                                                               <object class="NSFont" key="IBUIFont" id="318228490">
-                                                                       <string key="NSName">Helvetica</string>
+                                                               <object class="NSFont" key="IBUIFont" id="1000667857">
+                                                                       <string key="NSName">HelveticaNeue</string>
                                                                        <double key="NSSize">13</double>
                                                                        <int key="NSfFlags">16</int>
                                                                </object>
@@ -176,34 +171,32 @@
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{20, 59}, {280, 98}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="436280209"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <reference key="IBUIBackgroundColor" ref="297752020"/>
                                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                                <bool key="IBUIMultipleTouchEnabled">YES</bool>
                                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                                               <string key="IBUIText"/>
+                                                               <string key="IBUIText">Initial Prompt</string>
                                                                <object class="IBUITextInputTraits" key="IBUITextInputTraits">
                                                                        <int key="IBUIAutocapitalizationType">2</int>
                                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                                </object>
                                                                <reference key="IBUIFontDescription" ref="926054998"/>
-                                                               <reference key="IBUIFont" ref="374068860"/>
+                                                               <reference key="IBUIFont" ref="626254668"/>
                                                        </object>
                                                        <object class="IBUITextField" id="1025632434">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{111, 168}, {189, 31}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="144555284"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
                                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                                               <string key="IBUIText"/>
+                                                               <string key="IBUIText">Initial Text</string>
                                                                <int key="IBUIBorderStyle">3</int>
                                                                <object class="NSColor" key="IBUITextColor">
                                                                        <int key="NSColorSpace">3</int>
@@ -218,14 +211,13 @@
                                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                                </object>
                                                                <reference key="IBUIFontDescription" ref="926054998"/>
-                                                               <reference key="IBUIFont" ref="374068860"/>
+                                                               <reference key="IBUIFont" ref="626254668"/>
                                                        </object>
                                                        <object class="IBUILabel" id="436280209">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{20, 173}, {78, 21}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="1025632434"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -239,14 +231,13 @@
                                                                <int key="IBUIBaselineAdjustment">0</int>
                                                                <float key="IBUIMinimumFontSize">10</float>
                                                                <reference key="IBUIFontDescription" ref="315224406"/>
-                                                               <reference key="IBUIFont" ref="631696776"/>
+                                                               <reference key="IBUIFont" ref="463066967"/>
                                                        </object>
                                                        <object class="IBUILabel" id="144555284">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{20, 207}, {105, 21}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="760496177"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -260,21 +251,20 @@
                                                                <int key="IBUIBaselineAdjustment">0</int>
                                                                <float key="IBUIMinimumFontSize">10</float>
                                                                <reference key="IBUIFontDescription" ref="315224406"/>
-                                                               <reference key="IBUIFont" ref="631696776"/>
+                                                               <reference key="IBUIFont" ref="463066967"/>
                                                        </object>
                                                        <object class="IBUITextField" id="760496177">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{142, 202}, {158, 31}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="1006942692"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
                                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                                               <string key="IBUIText"/>
+                                                               <string key="IBUIText">1</string>
                                                                <int key="IBUIBorderStyle">3</int>
                                                                <object class="NSColor" key="IBUITextColor">
                                                                        <int key="NSColorSpace">3</int>
@@ -287,34 +277,32 @@
                                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                                </object>
                                                                <reference key="IBUIFontDescription" ref="926054998"/>
-                                                               <reference key="IBUIFont" ref="374068860"/>
+                                                               <reference key="IBUIFont" ref="626254668"/>
                                                        </object>
                                                        <object class="IBUITextView" id="136966045">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{20, 283}, {280, 98}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="922953631"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <reference key="IBUIBackgroundColor" ref="297752020"/>
                                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                                <bool key="IBUIMultipleTouchEnabled">YES</bool>
                                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                                               <string key="IBUIText"/>
+                                                               <string key="IBUIText">Help Text</string>
                                                                <object class="IBUITextInputTraits" key="IBUITextInputTraits">
                                                                        <int key="IBUIAutocapitalizationType">2</int>
                                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                                </object>
                                                                <reference key="IBUIFontDescription" ref="926054998"/>
-                                                               <reference key="IBUIFont" ref="374068860"/>
+                                                               <reference key="IBUIFont" ref="626254668"/>
                                                        </object>
                                                        <object class="IBUILabel" id="1006942692">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{20, 246}, {74, 21}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="712369115"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -328,14 +316,13 @@
                                                                <int key="IBUIBaselineAdjustment">0</int>
                                                                <float key="IBUIMinimumFontSize">10</float>
                                                                <reference key="IBUIFontDescription" ref="315224406"/>
-                                                               <reference key="IBUIFont" ref="631696776"/>
+                                                               <reference key="IBUIFont" ref="463066967"/>
                                                        </object>
                                                        <object class="IBUILabel" id="922953631">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{20, 389}, {125, 21}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="960911"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -349,14 +336,13 @@
                                                                <int key="IBUIBaselineAdjustment">0</int>
                                                                <float key="IBUIMinimumFontSize">10</float>
                                                                <reference key="IBUIFontDescription" ref="315224406"/>
-                                                               <reference key="IBUIFont" ref="631696776"/>
+                                                               <reference key="IBUIFont" ref="463066967"/>
                                                        </object>
                                                        <object class="IBUILabel" id="712369115">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{20, 264}, {270, 21}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="136966045"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -370,14 +356,13 @@
                                                                <int key="IBUIBaselineAdjustment">0</int>
                                                                <float key="IBUIMinimumFontSize">10</float>
                                                                <reference key="IBUIFontDescription" ref="436667969"/>
-                                                               <reference key="IBUIFont" ref="318228490"/>
+                                                               <reference key="IBUIFont" ref="1000667857"/>
                                                        </object>
                                                        <object class="IBUILabel" id="960911">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{20, 410}, {270, 21}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="703828246"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -391,14 +376,13 @@
                                                                <int key="IBUIBaselineAdjustment">0</int>
                                                                <float key="IBUIMinimumFontSize">10</float>
                                                                <reference key="IBUIFontDescription" ref="436667969"/>
-                                                               <reference key="IBUIFont" ref="318228490"/>
+                                                               <reference key="IBUIFont" ref="1000667857"/>
                                                        </object>
                                                        <object class="IBUILabel" id="973909308">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{20, 541}, {130, 21}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="489940124"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -412,14 +396,13 @@
                                                                <int key="IBUIBaselineAdjustment">0</int>
                                                                <float key="IBUIMinimumFontSize">10</float>
                                                                <reference key="IBUIFontDescription" ref="315224406"/>
-                                                               <reference key="IBUIFont" ref="631696776"/>
+                                                               <reference key="IBUIFont" ref="463066967"/>
                                                        </object>
                                                        <object class="IBUISlider" id="1030580644">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{161, 610}, {118, 23}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="550615246"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -433,7 +416,6 @@
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{34, 609}, {70, 21}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="460073365"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -447,14 +429,13 @@
                                                                <int key="IBUIBaselineAdjustment">0</int>
                                                                <float key="IBUIMinimumFontSize">10</float>
                                                                <reference key="IBUIFontDescription" ref="315224406"/>
-                                                               <reference key="IBUIFont" ref="631696776"/>
+                                                               <reference key="IBUIFont" ref="463066967"/>
                                                        </object>
                                                        <object class="IBUIButton" id="550615246">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{107, 653}, {97, 37}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="748105586"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -462,15 +443,15 @@
                                                                <int key="IBUIContentHorizontalAlignment">0</int>
                                                                <int key="IBUIContentVerticalAlignment">0</int>
                                                                <int key="IBUIButtonType">1</int>
-                                                               <string key="IBUINormalTitle">Send RPC</string>
+                                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                                       <int key="NSColorSpace">1</int>
+                                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                                               </object>
                                                                <object class="NSColor" key="IBUIHighlightedTitleColor">
                                                                        <int key="NSColorSpace">3</int>
                                                                        <bytes key="NSWhite">MQA</bytes>
                                                                </object>
-                                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                                       <int key="NSColorSpace">1</int>
-                                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                                               </object>
+                                                               <string key="IBUINormalTitle">Send RPC</string>
                                                                <object class="NSColor" key="IBUINormalTitleShadowColor">
                                                                        <int key="NSColorSpace">3</int>
                                                                        <bytes key="NSWhite">MC41AA</bytes>
@@ -480,7 +461,7 @@
                                                                        <double key="pointSize">15</double>
                                                                </object>
                                                                <object class="NSFont" key="IBUIFont">
-                                                                       <string key="NSName">Helvetica-Bold</string>
+                                                                       <string key="NSName">HelveticaNeue-Bold</string>
                                                                        <double key="NSSize">15</double>
                                                                        <int key="NSfFlags">16</int>
                                                                </object>
@@ -490,27 +471,25 @@
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{20, 439}, {280, 98}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="973909308"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <reference key="IBUIBackgroundColor" ref="297752020"/>
                                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                                <bool key="IBUIMultipleTouchEnabled">YES</bool>
                                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                                               <string key="IBUIText"/>
+                                                               <string key="IBUIText">Timeout Prompt</string>
                                                                <object class="IBUITextInputTraits" key="IBUITextInputTraits">
                                                                        <int key="IBUIAutocapitalizationType">2</int>
                                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                                </object>
                                                                <reference key="IBUIFontDescription" ref="926054998"/>
-                                                               <reference key="IBUIFont" ref="374068860"/>
+                                                               <reference key="IBUIFont" ref="626254668"/>
                                                        </object>
                                                        <object class="IBUILabel" id="460073365">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{111, 609}, {26, 23}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="1030580644"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -524,14 +503,13 @@
                                                                <int key="IBUIBaselineAdjustment">0</int>
                                                                <float key="IBUIMinimumFontSize">10</float>
                                                                <reference key="IBUIFontDescription" ref="315224406"/>
-                                                               <reference key="IBUIFont" ref="631696776"/>
+                                                               <reference key="IBUIFont" ref="463066967"/>
                                                        </object>
                                                        <object class="IBUISegmentedControl" id="489940124">
                                                                <reference key="NSNextResponder" ref="1040341725"/>
                                                                <int key="NSvFlags">292</int>
                                                                <string key="NSFrame">{{52, 566}, {207, 30}}</string>
                                                                <reference key="NSSuperview" ref="1040341725"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="348196913"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="IBUIOpaque">NO</bool>
@@ -568,7 +546,6 @@
                                                </array>
                                                <string key="NSFrameSize">{320, 710}</string>
                                                <reference key="NSSuperview" ref="537223134"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="437390617"/>
                                                <string key="NSReuseIdentifierKey">_NS:10</string>
                                                <object class="NSColor" key="IBUIBackgroundColor">
@@ -579,8 +556,6 @@
                                        </object>
                                </array>
                                <string key="NSFrameSize">{320, 728}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <reference key="NSNextKeyView" ref="1040341725"/>
                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                <object class="NSColor" key="IBUIBackgroundColor">
@@ -595,6 +570,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -602,7 +578,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -610,7 +586,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="537223134"/>
                                        </object>
-                                       <int key="connectionID">46</int>
+                                       <string key="id">46</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -618,7 +594,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="760496177"/>
                                        </object>
-                                       <int key="connectionID">51</int>
+                                       <string key="id">51</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -626,7 +602,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="136966045"/>
                                        </object>
-                                       <int key="connectionID">52</int>
+                                       <string key="id">52</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -634,7 +610,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="1025632434"/>
                                        </object>
-                                       <int key="connectionID">53</int>
+                                       <string key="id">53</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -642,7 +618,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="846861908"/>
                                        </object>
-                                       <int key="connectionID">54</int>
+                                       <string key="id">54</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -650,7 +626,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="489940124"/>
                                        </object>
-                                       <int key="connectionID">55</int>
+                                       <string key="id">55</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -658,7 +634,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="460073365"/>
                                        </object>
-                                       <int key="connectionID">56</int>
+                                       <string key="id">56</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -666,7 +642,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="1030580644"/>
                                        </object>
-                                       <int key="connectionID">57</int>
+                                       <string key="id">57</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -674,7 +650,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="703828246"/>
                                        </object>
-                                       <int key="connectionID">58</int>
+                                       <string key="id">58</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
@@ -683,45 +659,45 @@
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">13</int>
                                        </object>
-                                       <int key="connectionID">59</int>
+                                       <string key="id">59</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">performInteractionPressed:</string>
+                                               <string key="label">sendRPC:</string>
                                                <reference key="source" ref="550615246"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">60</int>
+                                       <string key="id">61</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
+                                               <string key="id">4</string>
                                                <reference key="object" ref="537223134"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="748105586"/>
@@ -731,17 +707,17 @@
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">25</int>
+                                               <string key="id">25</string>
                                                <reference key="object" ref="649070709"/>
                                                <reference key="parent" ref="537223134"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">17</int>
+                                               <string key="id">17</string>
                                                <reference key="object" ref="748105586"/>
                                                <reference key="parent" ref="537223134"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">44</int>
+                                               <string key="id">44</string>
                                                <reference key="object" ref="1040341725"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="550615246"/>
@@ -767,97 +743,97 @@
                                                <reference key="parent" ref="537223134"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
+                                               <string key="id">5</string>
                                                <reference key="object" ref="437390617"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">8</int>
+                                               <string key="id">8</string>
                                                <reference key="object" ref="280580786"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">9</int>
+                                               <string key="id">9</string>
                                                <reference key="object" ref="846861908"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">10</int>
+                                               <string key="id">10</string>
                                                <reference key="object" ref="1025632434"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">11</int>
+                                               <string key="id">11</string>
                                                <reference key="object" ref="436280209"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">12</int>
+                                               <string key="id">12</string>
                                                <reference key="object" ref="144555284"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">13</int>
+                                               <string key="id">13</string>
                                                <reference key="object" ref="760496177"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">15</int>
+                                               <string key="id">15</string>
                                                <reference key="object" ref="136966045"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">16</int>
+                                               <string key="id">16</string>
                                                <reference key="object" ref="1006942692"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">18</int>
+                                               <string key="id">18</string>
                                                <reference key="object" ref="922953631"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">19</int>
+                                               <string key="id">19</string>
                                                <reference key="object" ref="712369115"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">20</int>
+                                               <string key="id">20</string>
                                                <reference key="object" ref="960911"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">21</int>
+                                               <string key="id">21</string>
                                                <reference key="object" ref="973909308"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">23</int>
+                                               <string key="id">23</string>
                                                <reference key="object" ref="1030580644"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">24</int>
+                                               <string key="id">24</string>
                                                <reference key="object" ref="348196913"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">26</int>
+                                               <string key="id">26</string>
                                                <reference key="object" ref="550615246"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">48</int>
+                                               <string key="id">48</string>
                                                <reference key="object" ref="703828246"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">49</int>
+                                               <string key="id">49</string>
                                                <reference key="object" ref="460073365"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">50</int>
+                                               <string key="id">50</string>
                                                <reference key="object" ref="489940124"/>
                                                <reference key="parent" ref="1040341725"/>
                                        </object>
@@ -898,91 +874,21 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">60</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">PerformInteractionViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <dictionary class="NSMutableDictionary" key="actions">
-                                               <string key="displayTimeoutSlider:">id</string>
-                                               <string key="performInteractionPressed:">id</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="actionInfosByName">
-                                               <object class="IBActionInfo" key="displayTimeoutSlider:">
-                                                       <string key="name">displayTimeoutSlider:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                               <object class="IBActionInfo" key="performInteractionPressed:">
-                                                       <string key="name">performInteractionPressed:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="outlets">
-                                               <string key="choiceIDText">UITextField</string>
-                                               <string key="helpText">UITextView</string>
-                                               <string key="initPromptText">UITextView</string>
-                                               <string key="initialText">UITextField</string>
-                                               <string key="interactionModeControl">UISegmentedControl</string>
-                                               <string key="scrollView">UIScrollView</string>
-                                               <string key="timeoutLabel">UILabel</string>
-                                               <string key="timeoutSlider">UISlider</string>
-                                               <string key="timeoutText">UITextView</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <object class="IBToOneOutletInfo" key="choiceIDText">
-                                                       <string key="name">choiceIDText</string>
-                                                       <string key="candidateClassName">UITextField</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="helpText">
-                                                       <string key="name">helpText</string>
-                                                       <string key="candidateClassName">UITextView</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="initPromptText">
-                                                       <string key="name">initPromptText</string>
-                                                       <string key="candidateClassName">UITextView</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="initialText">
-                                                       <string key="name">initialText</string>
-                                                       <string key="candidateClassName">UITextField</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="interactionModeControl">
-                                                       <string key="name">interactionModeControl</string>
-                                                       <string key="candidateClassName">UISegmentedControl</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="scrollView">
-                                                       <string key="name">scrollView</string>
-                                                       <string key="candidateClassName">UIScrollView</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="timeoutLabel">
-                                                       <string key="name">timeoutLabel</string>
-                                                       <string key="candidateClassName">UILabel</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="timeoutSlider">
-                                                       <string key="name">timeoutSlider</string>
-                                                       <string key="candidateClassName">UISlider</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="timeoutText">
-                                                       <string key="name">timeoutText</string>
-                                                       <string key="candidateClassName">UITextView</string>
-                                               </object>
-                                       </dictionary>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/PerformInteractionViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/RPCTestViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/RPCTestViewController.h
index fd6e000..2193c7e 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/RPCTestViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/RPCTestViewController.h
@@ -1,50 +1,74 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  RPCTestViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "UnregisterAppInterfaceViewController.h"
+
 #import "AlertViewController.h"
 #import "SpeakViewController.h"
 #import "ShowViewController.h"
-#import "SetMediaClockTimerViewController.h"
+#import "SubscribeButtonViewController.h"
+#import "UnsubscribeButtonViewController.h"
 #import "AddCommandViewController.h"
 #import "DeleteCommandViewController.h"
 #import "AddSubMenuViewController.h"
 #import "DeleteSubMenuViewController.h"
+#import "SetGlobalPropertiesViewController.h"
+#import "ResetGlobalPropertiesViewController.h"
+#import "SetMediaClockTimerViewController.h"
 #import "CreateInteractionChoiceSetViewController.h"
 #import "DeleteInteractionChoiceSetViewController.h"
 #import "PerformInteractionViewController.h"
-#import "SubscribeButtonViewController.h"
-#import "UnsubscribeButtonViewController.h"
-#import "EncodedSyncPDataViewController.h"
-#import "SetGlobalPropertiesViewController.h"
-#import "ResetGlobalPropertiesViewController.h"
-
-
-
+#import "SliderViewController.h"
+#import "ScrollableMessageViewController.h"
+#import "ChangeRegistrationViewController.h"
+#import "SetAppIconViewController.h"
+#import "PerformAudioPassThruViewController.h"
+#import "EndAudioPassThruViewController.h"
+#import "SubscribeVehicleDataViewController.h"
+#import "UnsubscribeVehicleDataViewController.h"
+#import "GetVehicleDataViewController.h"
+#import "ReadDIDViewController.h"
+#import "GetDTCsViewController.h"
+#import "ShowConstantTBTViewController.h"
+#import "AlertManeuverViewController.h"
+#import "UpdateTurnListViewController.h"
+#import "UnregisterAppInterfaceViewController.h"
 
-@interface RPCTestViewController : UITableViewController  {
+@interface RPCTestViewController : UITableViewController <AVAudioPlayerDelegate>  {
 
     NSMutableArray *rpclist;
     
-    UnregisterAppInterfaceViewController *unregisterappinterfacevc;
     AlertViewController *alertvc;
     SpeakViewController *speakvc;
     ShowViewController *showvc;
-    SetMediaClockTimerViewController *setmediaclocktimervc;
+    SubscribeButtonViewController *subscribebuttonvc;
+    UnsubscribeButtonViewController *unsubscribebuttonvc;
     AddCommandViewController *addcommandvc;
     DeleteCommandViewController *deletecommandvc;
     AddSubMenuViewController *addsubmenuvc;
     DeleteSubMenuViewController *deletesubmenuvc;
+    SetGlobalPropertiesViewController *setglobalpropertiesvc;
+    ResetGlobalPropertiesViewController *resetglobalpropertiesvc;
+    SetMediaClockTimerViewController *setmediaclocktimervc;
     CreateInteractionChoiceSetViewController *createinteractionchoicesetvc;
     DeleteInteractionChoiceSetViewController *deleteinteractionchoicesetvc;
     PerformInteractionViewController *performinteractionvc;
-    SubscribeButtonViewController *subscribebuttonvc;
-    UnsubscribeButtonViewController *unsubscribebuttonvc;
-    EncodedSyncPDataViewController *encodedsyncpdatavc;
-    SetGlobalPropertiesViewController *setglobalpropertiesvc;
-    ResetGlobalPropertiesViewController *resetglobalpropertiesvc;
+    SliderViewController *slidervc;
+    ScrollableMessageViewController *scrollablemessagevc;
+    ChangeRegistrationViewController *changeregistrationvc;
+    SetAppIconViewController *setappiconvc;
+    PerformAudioPassThruViewController *performaudiopassthruvc;
+    EndAudioPassThruViewController *endaudiopassthruvc;
+    SubscribeVehicleDataViewController *subscribevehicledatavc;
+    UnsubscribeVehicleDataViewController *unsubscribevehicledatavc;
+    GetVehicleDataViewController *getvehicledatavc;
+    ReadDIDViewController *readdidvc;
+    GetDTCsViewController *getdtcsvc;
+    ShowConstantTBTViewController *showconstanttbtvc;
+    AlertManeuverViewController *alertmaneuvervc;
+    UpdateTurnListViewController *updateturnlistvc;
+    UnregisterAppInterfaceViewController *unregisterappinterfacevc;
 }
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/RPCTestViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/RPCTestViewController.m
index e3eb395..cf4d2d1 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/RPCTestViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/RPCTestViewController.m
@@ -1,41 +1,98 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  RPCTestViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <AVFoundation/AVFoundation.h>
 
 #import "RPCTestViewController.h"
+#import "AppDelegate.h"
+
 
-@interface RPCTestViewController ()
+@interface RPCTestViewController()
+    
+@property (nonatomic, strong) AVAudioPlayer *audioPlayer;
+@property (nonatomic, assign) BOOL isMusicPlaying;
 
 @end
 
+
 @implementation RPCTestViewController
 
+@synthesize isMusicPlaying;
+
 
 - (id)initWithStyle:(UITableViewStyle)style {
-    self.title = @"RPC Test";
     
-    NSArray *tempArray = [NSArray arrayWithObjects: @"UnregisterAppInterface", @"Alert",@"Speak",@"Show",@"SetMediaClockTimer",@"AddCommand",@"DeleteCommand",@"AddSubMenu",@"DeleteSubMenu",@"CreateInteractionChoiceSet",@"DeleteInteractionChoiceSet",@"PerformInteraction",@"SubscribeButton",@"UnsubscribeButton", @"EncodedSyncPData",@"SetGlobalProperties",@"ResetGlobalProperties", nil];
+    NSArray *tempArray = [NSArray arrayWithObjects:
+                          @"AddCommand",
+                          @"AddSubMenu",
+                          @"Alert",
+                          @"AlertManeuver",
+                          @"ChangeRegistration",
+                          @"CreateInteractionChoiceSet",
+                          @"DeleteCommand",
+                          @"DeleteInteractionChoiceSet",
+                          @"DeleteSubMenu",
+                          @"EndAudioPassThru",
+                          @"GetDTCs",
+                          @"GetVehicleData",
+                          @"PerformAudioPassThru",
+                          @"PerformInteraction",
+                          @"ReadDID",
+                          @"ResetGlobalProperties",
+                          @"SetAppIcon",
+                          @"SetGlobalProperties",
+                          @"SetMediaClockTimer",
+                          @"ScrollableMessage",
+                          @"Slider",
+                          @"Speak",
+                          @"Show",
+                          @"ShowConstantTBT",
+                          @"SubscribeButton",
+                          @"SubscribeVehicleData",
+                          @"UpdateTurnList",
+                          @"UnregisterAppInterface",
+                          @"UnsubscribeButton",
+                          @"UnsubscribeVehicleData",
+                          @"~CycleProxy~",
+                          @"~GetProxyVersion~",
+                          @"~Play/Pause Audio~",
+                          nil];
+    
     rpclist = [[NSMutableArray alloc] init];
     [rpclist addObjectsFromArray:tempArray];
     
-    unregisterappinterfacevc = [[UnregisterAppInterfaceViewController alloc] initWithNibName:@"UnregisterAppInterfaceViewController" bundle:nil];
+    
     alertvc = [[AlertViewController alloc] initWithNibName:@"AlertViewController" bundle:nil];    
     speakvc = [[SpeakViewController alloc] initWithNibName:@"SpeakViewController" bundle:nil];
     showvc = [[ShowViewController alloc] initWithNibName:@"ShowViewController" bundle:nil];
-    setmediaclocktimervc = [[SetMediaClockTimerViewController alloc] initWithNibName:@"SetMediaClockTimerViewController" bundle:nil];
+    subscribebuttonvc = [[SubscribeButtonViewController alloc] initWithNibName:@"SubscribeButtonViewController" bundle:nil];
+    unsubscribebuttonvc = [[UnsubscribeButtonViewController alloc] initWithNibName:@"UnsubscribeButtonViewController" bundle:nil];
     addcommandvc = [[AddCommandViewController alloc] initWithNibName:@"AddCommandViewController" bundle:nil];
     deletecommandvc = [[DeleteCommandViewController alloc] initWithNibName:@"DeleteCommandViewController" bundle:nil];
     addsubmenuvc = [[AddSubMenuViewController alloc] initWithNibName:@"AddSubMenuViewController" bundle:nil];
     deletesubmenuvc = [[DeleteSubMenuViewController alloc] initWithNibName:@"DeleteSubMenuViewController" bundle:nil];
+    setglobalpropertiesvc = [[SetGlobalPropertiesViewController alloc] initWithNibName:@"SetGlobalPropertiesViewController" bundle:nil];
+    resetglobalpropertiesvc = [[ResetGlobalPropertiesViewController alloc] initWithNibName:@"ResetGlobalPropertiesViewController" bundle:nil];
+    setmediaclocktimervc = [[SetMediaClockTimerViewController alloc] initWithNibName:@"SetMediaClockTimerViewController" bundle:nil];
     createinteractionchoicesetvc = [[CreateInteractionChoiceSetViewController alloc] initWithNibName:@"CreateInteractionChoiceSetViewController" bundle:nil];
     deleteinteractionchoicesetvc = [[DeleteInteractionChoiceSetViewController alloc] initWithNibName:@"DeleteInteractionChoiceSetViewController" bundle:nil];
     performinteractionvc = [[PerformInteractionViewController alloc] initWithNibName:@"PerformInteractionViewController" bundle:nil];
-    subscribebuttonvc = [[SubscribeButtonViewController alloc] initWithNibName:@"SubscribeButtonViewController" bundle:nil];
-    unsubscribebuttonvc = [[UnsubscribeButtonViewController alloc] initWithNibName:@"UnsubscribeButtonViewController" bundle:nil];
-    encodedsyncpdatavc = [[EncodedSyncPDataViewController alloc] initWithNibName:@"EncodedSyncPDataViewController" bundle:nil];
-    setglobalpropertiesvc = [[SetGlobalPropertiesViewController alloc] initWithNibName:@"SetGlobalPropertiesViewController" bundle:nil];
-    resetglobalpropertiesvc = [[ResetGlobalPropertiesViewController alloc] initWithNibName:@"ResetGlobalPropertiesViewController" bundle:nil];
-
+    slidervc = [[SliderViewController alloc] initWithNibName:@"SliderViewController" bundle:nil];
+    scrollablemessagevc = [[ScrollableMessageViewController alloc] initWithNibName:@"ScrollableMessageViewController" bundle:nil];
+    changeregistrationvc = [[ChangeRegistrationViewController alloc] initWithNibName:@"ChangeRegistrationViewController" bundle:nil];
+    setappiconvc = [[SetAppIconViewController alloc] initWithNibName:@"SetAppIconViewController" bundle:nil];
+    performaudiopassthruvc = [[PerformAudioPassThruViewController alloc] initWithNibName:@"PerformAudioPassThruViewController" bundle:nil];
+    endaudiopassthruvc = [[EndAudioPassThruViewController alloc] initWithNibName:@"EndAudioPassThruViewController" bundle:nil];
+    subscribevehicledatavc = [[SubscribeVehicleDataViewController alloc] initWithNibName:@"SubscribeVehicleDataViewController" bundle:nil];
+    unsubscribevehicledatavc = [[UnsubscribeVehicleDataViewController alloc] initWithNibName:@"UnsubscribeVehicleDataViewController" bundle:nil];
+    getvehicledatavc = [[GetVehicleDataViewController alloc] initWithNibName:@"GetVehicleDataViewController" bundle:nil];
+    readdidvc = [[ReadDIDViewController alloc] initWithNibName:@"ReadDIDViewController" bundle:nil];
+    getdtcsvc = [[GetDTCsViewController alloc] initWithNibName:@"GetDTCsViewController" bundle:nil];
+    showconstanttbtvc = [[ShowConstantTBTViewController alloc] initWithNibName:@"ShowConstantTBTViewController" bundle:nil];
+    alertmaneuvervc = [[AlertManeuverViewController alloc] initWithNibName:@"AlertManeuverViewController" bundle:nil];
+    updateturnlistvc = [[UpdateTurnListViewController alloc] initWithNibName:@"UpdateTurnListViewController" bundle:nil];
+    unregisterappinterfacevc = [[UnregisterAppInterfaceViewController alloc] initWithNibName:@"UnregisterAppInterfaceViewController" bundle:nil];
     
     
     self = [super initWithStyle:style];
@@ -51,6 +108,18 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+    
+    [self setIsMusicPlaying:NO];
+    
+    // Set AudioSession
+    NSError *error = nil;
+    [[AVAudioSession sharedInstance] setDelegate:self];
+    [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:&error];
+    
+    NSURL *path = [[NSBundle mainBundle] URLForResource:@"Sample" withExtension:@"mp3"];
+    self.audioPlayer = [[AVAudioPlayer alloc] initWithContentsOfURL:path error:&error];
+    self.audioPlayer.volume = 0.5;
+    self.audioPlayer.numberOfLoops = -1;
 }
 
 - (void)viewDidUnload
@@ -94,10 +163,8 @@
 {
     UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
     NSString *selectedrpc =  cell.textLabel.text;
-   if ([selectedrpc isEqualToString:@"UnregisterAppInterface"]) {
-       [self.navigationController pushViewController:unregisterappinterfacevc animated:YES];
-    }
-    else if ([selectedrpc isEqualToString:@"Alert"]) {
+    
+    if ([selectedrpc isEqualToString:@"Alert"]) {
         [self.navigationController pushViewController:alertvc animated:YES];
     }
     else if ([selectedrpc isEqualToString:@"Speak"]) {
@@ -106,57 +173,131 @@
     else if ([selectedrpc isEqualToString:@"Show"]) {
         [self.navigationController pushViewController:showvc animated:YES];
     }
-    else if ([selectedrpc isEqualToString:@"SetMediaClockTimer"]) {
-        [self.navigationController pushViewController:setmediaclocktimervc animated:YES];
-
+    else if ([selectedrpc isEqualToString:@"SubscribeButton"]) {
+        [self.navigationController pushViewController:subscribebuttonvc animated:YES];
+    }
+    else if ([selectedrpc isEqualToString:@"UnsubscribeButton"]) {
+        [self.navigationController pushViewController:unsubscribebuttonvc animated:YES];
     }
     else if ([selectedrpc isEqualToString:@"AddCommand"]) {
         [self.navigationController pushViewController:addcommandvc animated:YES];
-
     }
     else if ([selectedrpc isEqualToString:@"DeleteCommand"]) {
         [self.navigationController pushViewController:deletecommandvc animated:YES];
     }
     else if ([selectedrpc isEqualToString:@"AddSubMenu"]) {
         [self.navigationController pushViewController:addsubmenuvc animated:YES];
-
     }
     else if ([selectedrpc isEqualToString:@"DeleteSubMenu"]) {
         [self.navigationController pushViewController:deletesubmenuvc animated:YES];
-
+    }
+    else if ([selectedrpc isEqualToString:@"SetGlobalProperties"]) {
+        [self.navigationController pushViewController:setglobalpropertiesvc animated:YES];
+    }
+    else if ([selectedrpc isEqualToString:@"ResetGlobalProperties"]) {
+        [self.navigationController pushViewController:resetglobalpropertiesvc animated:YES];
+    }
+    else if ([selectedrpc isEqualToString:@"SetMediaClockTimer"]) {
+        [self.navigationController pushViewController:setmediaclocktimervc animated:YES];
     }
     else if ([selectedrpc isEqualToString:@"CreateInteractionChoiceSet"]) {
         [self.navigationController pushViewController:createinteractionchoicesetvc animated:YES];
-
     }
     else if ([selectedrpc isEqualToString:@"DeleteInteractionChoiceSet"]) {
         [self.navigationController pushViewController:deleteinteractionchoicesetvc animated:YES];
-
     }
     else if ([selectedrpc isEqualToString:@"PerformInteraction"]) {
         [self.navigationController pushViewController:performinteractionvc animated:YES];
-
     }
-    else if ([selectedrpc isEqualToString:@"SubscribeButton"]) {
-        [self.navigationController pushViewController:subscribebuttonvc animated:YES];
-
+    else if ([selectedrpc isEqualToString:@"Slider"]) {
+        [self.navigationController pushViewController:slidervc animated:YES];
     }
-    else if ([selectedrpc isEqualToString:@"EncodedSyncPData"]) {
-        [self.navigationController pushViewController:encodedsyncpdatavc animated:YES];
-
+    else if ([selectedrpc isEqualToString:@"ScrollableMessage"]) {
+        [self.navigationController pushViewController:scrollablemessagevc animated:YES];
     }
-    else if ([selectedrpc isEqualToString:@"UnsubscribeButton"]) {
-        [self.navigationController pushViewController:unsubscribebuttonvc animated:YES];
-
+    else if ([selectedrpc isEqualToString:@"ChangeRegistration"]) {
+        [self.navigationController pushViewController:changeregistrationvc animated:YES];
     }
-    else if ([selectedrpc isEqualToString:@"SetGlobalProperties"]) {
-        [self.navigationController pushViewController:setglobalpropertiesvc animated:YES];
-
+    else if ([selectedrpc isEqualToString:@"SetAppIcon"]) {
+        [self.navigationController pushViewController:setappiconvc animated:YES];
     }
-    else if ([selectedrpc isEqualToString:@"ResetGlobalProperties"]) {
-        [self.navigationController pushViewController:resetglobalpropertiesvc animated:YES];
-
+    else if ([selectedrpc isEqualToString:@"PerformAudioPassThru"]) {
+        [self.navigationController pushViewController:performaudiopassthruvc animated:YES];
+    }
+    else if ([selectedrpc isEqualToString:@"EndAudioPassThru"]) {
+        [self.navigationController pushViewController:endaudiopassthruvc animated:YES];
+    }
+    else if ([selectedrpc isEqualToString:@"SubscribeVehicleData"]) {
+        [self.navigationController pushViewController:subscribevehicledatavc animated:YES];
+    }
+    else if ([selectedrpc isEqualToString:@"UnsubscribeVehicleData"]) {
+        [self.navigationController pushViewController:unsubscribevehicledatavc animated:YES];
     }
+    else if ([selectedrpc isEqualToString:@"GetVehicleData"]) {
+        [self.navigationController pushViewController:getvehicledatavc animated:YES];
+    }
+    else if ([selectedrpc isEqualToString:@"ReadDID"]) {
+        [self.navigationController pushViewController:readdidvc animated:YES];
+    }
+    else if ([selectedrpc isEqualToString:@"GetDTCs"]) {
+        [self.navigationController pushViewController:getdtcsvc animated:YES];
+    }
+    else if ([selectedrpc isEqualToString:@"ShowConstantTBT"]) {
+        [self.navigationController pushViewController:showconstanttbtvc animated:YES];
+    }
+    else if ([selectedrpc isEqualToString:@"AlertManeuver"]) {
+        [self.navigationController pushViewController:alertmaneuvervc animated:YES];
+    }
+    else if ([selectedrpc isEqualToString:@"UpdateTurnList"]) {
+        [self.navigationController pushViewController:updateturnlistvc animated:YES];
+    }
+    else if ([selectedrpc isEqualToString:@"UnregisterAppInterface"]) {
+        [self.navigationController pushViewController:unregisterappinterfacevc animated:YES];
+    }
+    else if ([selectedrpc isEqualToString:@"~CycleProxy~"]) {
+        [[SmartDeviceLinkTester getInstance] cycleProxy];
+        
+        //Go Back To RPC List View
+        [self.navigationController popToRootViewControllerAnimated:YES];
+        
+        //Go To Console View
+        AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+        appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+        
+    }
+    else if ([selectedrpc isEqualToString:@"~GetProxyVersion~"]) {
+        [[SmartDeviceLinkTester getInstance] postToConsoleLog:[[[SmartDeviceLinkTester getInstance] proxy] getProxyVersion]];
+        
+        //Go Back To RPC List View
+        [self.navigationController popToRootViewControllerAnimated:YES];
+        
+        //Go To Console View
+        AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+        appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+        
+    }
+    else if ([selectedrpc isEqualToString:@"~Play/Pause Audio~"]) {
+        
+        if (isMusicPlaying){
+            [self setIsMusicPlaying:NO];
+            [self.audioPlayer pause];
+            [[SmartDeviceLinkTester getInstance] postToConsoleLog:@"Audio Paused"];
+        }
+        else{
+            [self setIsMusicPlaying:YES];
+            [self.audioPlayer play];
+            [[SmartDeviceLinkTester getInstance] postToConsoleLog:@"Audio Playing"];
+        }
+        
+        //Go Back To RPC List View
+        [self.navigationController popToRootViewControllerAnimated:YES];
+        
+        //Go To Console View
+        AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+        appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+        
+    }
+    
     
 }
 
@@ -167,23 +308,36 @@
 
 -(void) dealloc {
     [rpclist release];
-    [unregisterappinterfacevc release];
     [alertvc release];
     [speakvc release];
     [showvc release];
-    [setmediaclocktimervc release];
+    [subscribebuttonvc release];
+    [unsubscribebuttonvc release];
     [addcommandvc release];
     [deletecommandvc release]; 
     [addsubmenuvc release];
     [deletesubmenuvc release];
+    [setglobalpropertiesvc release];
+    [resetglobalpropertiesvc release];
+    [setmediaclocktimervc release];    
     [createinteractionchoicesetvc release];
     [deleteinteractionchoicesetvc release];
     [performinteractionvc release];
-    [subscribebuttonvc release];
-    [unsubscribebuttonvc release];
-    [encodedsyncpdatavc release]; 
-    [setglobalpropertiesvc release];
-    [resetglobalpropertiesvc release];
+    [slidervc release];
+    [scrollablemessagevc release];
+    [changeregistrationvc release];
+    [setappiconvc release];
+    [performaudiopassthruvc release];
+    [endaudiopassthruvc release];
+    [subscribevehicledatavc release];
+    [unsubscribevehicledatavc release];
+    [getvehicledatavc release];
+    [readdidvc release];
+    [getdtcsvc release];
+    [showconstanttbtvc release];
+    [alertmaneuvervc release];
+    [updateturnlistvc release];
+    [unregisterappinterfacevc release];
  
     [super dealloc];
 }

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ReadDIDViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ReadDIDViewController.h
new file mode 100644 (file)
index 0000000..6e36afa
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ReadDIDViewController.h
@@ -0,0 +1,19 @@
+//  ReadDIDViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import <SmartDeviceLink/SmartDeviceLink.h>
+
+#import "SmartDeviceLinkTester.h"
+
+@interface ReadDIDViewController : UIViewController <UITextFieldDelegate> {
+ 
+    IBOutlet UITextField *ecunametext;
+    IBOutlet UITextField *didloctext;
+    
+}
+
+-(IBAction)sendRPC:(id)sender;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ReadDIDViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ReadDIDViewController.m
new file mode 100644 (file)
index 0000000..ebfe44f
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ReadDIDViewController.m
@@ -0,0 +1,77 @@
+//  ReadDIDViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "ReadDIDViewController.h"
+#import "AppDelegate.h"
+
+@interface ReadDIDViewController ()
+
+@end
+
+@implementation ReadDIDViewController
+
+
+-(IBAction)sendRPC:(id)sender {
+    
+    NSArray *tempStringArray = [[didloctext text] componentsSeparatedByString:@" "];
+
+    NSMutableArray *tempNumberArray = [[NSMutableArray alloc] init];
+    
+    for (NSString *string in tempStringArray) {
+        [tempNumberArray addObject:[NSNumber numberWithInt:[string intValue]]];
+    }
+    
+    SDLReadDID *req = [SDLRPCRequestFactory buildReadDIDWithECUName:[NSNumber numberWithInt:[[ecunametext text] intValue]] didLocation:tempNumberArray correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    
+    [tempNumberArray release];
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return NO;
+}
+
+
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"ReadDID";
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    ecunametext.delegate = self;
+    didloctext.delegate = self;
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ReadDIDViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ReadDIDViewController.xib
new file mode 100644 (file)
index 0000000..c9637e7
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ReadDIDViewController.xib
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       <string key="NS.object.0">3742</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUIButton</string>
+                       <string>IBUILabel</string>
+                       <string>IBUITextField</string>
+                       <string>IBUIView</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <object class="IBProxyObject" id="372490531">
+                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBProxyObject" id="975951072">
+                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBUIView" id="191373211">
+                               <nil key="NSNextResponder"/>
+                               <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUILabel" id="132657633">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 25}, {91, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="779417607"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">ECU Name:</string>
+                                               <object class="NSColor" key="IBUITextColor" id="83775735">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
+                                               </object>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="878946683">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">17</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="430852169">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">17</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUITextField" id="779417607">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{134, 20}, {166, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="866960930"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">2000</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <object class="NSColorSpace" key="NSCustomColorSpace" id="409597863">
+                                                               <int key="NSID">2</int>
+                                                       </object>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="946691039">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">14</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="428689444">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">14</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUILabel" id="866960930">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 69}, {123, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="74819292"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">DID Location(s):</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="430852169"/>
+                                       </object>
+                                       <object class="IBUITextField" id="74819292">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 109}, {280, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">56832</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="428689444"/>
+                                       </object>
+                                       <object class="IBUIButton" id="496830156">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{112, 310}, {97, 37}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
+                                               <object class="NSColor" key="IBUIHighlightedTitleColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MQA</bytes>
+                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleShadowColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MC41AA</bytes>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">2</int>
+                                                       <double key="pointSize">15</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
+                                                       <double key="NSSize">15</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUILabel" id="1010998190">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 86}, {270, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Enter Multiple Locations Seperated By Spaces</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">13</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">13</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                               </array>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
+                               <reference key="NSNextKeyView" ref="132657633"/>
+                               <object class="NSColor" key="IBUIBackgroundColor">
+                                       <int key="NSColorSpace">1</int>
+                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                               </object>
+                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
+                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="191373211"/>
+                                       </object>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">didloctext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="74819292"/>
+                                       </object>
+                                       <string key="id">27</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">ecunametext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="779417607"/>
+                                       </object>
+                                       <string key="id">28</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="496830156"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">30</string>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <string key="id">0</string>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="191373211"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="496830156"/>
+                                                       <reference ref="132657633"/>
+                                                       <reference ref="779417607"/>
+                                                       <reference ref="866960930"/>
+                                                       <reference ref="74819292"/>
+                                                       <reference ref="1010998190"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="372490531"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="975951072"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">4</string>
+                                               <reference key="object" ref="132657633"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">5</string>
+                                               <reference key="object" ref="779417607"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">6</string>
+                                               <reference key="object" ref="866960930"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">7</string>
+                                               <reference key="object" ref="74819292"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">17</string>
+                                               <reference key="object" ref="496830156"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">32</string>
+                                               <reference key="object" ref="1010998190"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.CustomClassName">ReadDIDViewController</string>
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="-2.CustomClassName">UIResponder</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="32.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
+       </data>
+</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ResetGlobalPropertiesViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ResetGlobalPropertiesViewController.h
index e8f511f..43bb90e 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ResetGlobalPropertiesViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ResetGlobalPropertiesViewController.h
@@ -1,14 +1,14 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  ResetGlobalPropertiesViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
+#import "SmartDeviceLinkTester.h"
 
 @interface ResetGlobalPropertiesViewController : UIViewController {
     
 }
 
--(IBAction)resetGlobalPropertiesPressed:(id)sender;
+-(IBAction)sendRPC:(id)sender;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ResetGlobalPropertiesViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ResetGlobalPropertiesViewController.m
index b044e71..eb7965a 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ResetGlobalPropertiesViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ResetGlobalPropertiesViewController.m
@@ -1,8 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  ResetGlobalPropertiesViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "ResetGlobalPropertiesViewController.h"
+#import "AppDelegate.h"
 
 @interface ResetGlobalPropertiesViewController ()
 
@@ -11,17 +12,33 @@
 @implementation ResetGlobalPropertiesViewController
 
 
--(IBAction)resetGlobalPropertiesPressed:(id)sender {
+-(IBAction)sendRPC:(id)sender
+{
     UIButton *tempButton = (UIButton *)sender;
     SDLGlobalProperty *globalProperty;
     if ([tempButton.titleLabel.text isEqualToString:@"Reset Help Prompt"]) {
         globalProperty = [SDLGlobalProperty HELPPROMPT];
     }
-    else {
+    else if ([tempButton.titleLabel.text isEqualToString:@"Reset Timeout Prompt"]) {
         globalProperty = [SDLGlobalProperty TIMEOUTPROMPT];
     }
+    else if ([tempButton.titleLabel.text isEqualToString:@"VR Help Title"]) {
+        globalProperty = [SDLGlobalProperty VRHELPTITLE];
+    }
+    else {
+        globalProperty = [SDLGlobalProperty VRHELPITEMS];
+    }
+    
+    SDLResetGlobalProperties *req = [SDLRPCRequestFactory buildResetGlobalPropertiesWithProperties:[NSArray arrayWithObject:globalProperty] correlationID: [[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
     
-    [[SDLBrain getInstance] resetGlobalPropertiesPressedwithProperties:[NSArray arrayWithObject:globalProperty]];
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
 }
 
 

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ResetGlobalPropertiesViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ResetGlobalPropertiesViewController.xib
index 524cabf..1e82670 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ResetGlobalPropertiesViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ResetGlobalPropertiesViewController.xib
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
                        <string>IBProxyObject</string>
-                       <string>IBUIView</string>
                        <string>IBUIButton</string>
+                       <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -32,15 +32,14 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="IBUIButton" id="820029264">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{80, 101}, {160, 37}}</string>
+                                               <string key="NSFrame">{{67, 24}, {186, 44}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="626873011"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -48,15 +47,15 @@
                                                <int key="IBUIContentHorizontalAlignment">0</int>
                                                <int key="IBUIContentVerticalAlignment">0</int>
                                                <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Reset Help Prompt</string>
+                                               <object class="NSColor" key="IBUINormalTitleColor" id="22857230">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
                                                <object class="NSColor" key="IBUIHighlightedTitleColor" id="876414419">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MQA</bytes>
                                                </object>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
+                                               <string key="IBUINormalTitle">Reset Help Prompt</string>
                                                <object class="NSColor" key="IBUINormalTitleShadowColor" id="175405514">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MC41AA</bytes>
@@ -65,8 +64,8 @@
                                                        <int key="type">2</int>
                                                        <double key="pointSize">15</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="1038247691">
-                                                       <string key="NSName">Helvetica-Bold</string>
+                                               <object class="NSFont" key="IBUIFont" id="729151236">
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
                                                        <double key="NSSize">15</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -74,29 +73,59 @@
                                        <object class="IBUIButton" id="626873011">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{67, 184}, {186, 37}}</string>
+                                               <string key="NSFrame">{{67, 94}, {186, 44}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentHorizontalAlignment">0</int>
                                                <int key="IBUIContentVerticalAlignment">0</int>
                                                <int key="IBUIButtonType">1</int>
+                                               <reference key="IBUINormalTitleColor" ref="22857230"/>
+                                               <reference key="IBUIHighlightedTitleColor" ref="876414419"/>
                                                <string key="IBUINormalTitle">Reset Timeout Prompt</string>
+                                               <reference key="IBUINormalTitleShadowColor" ref="175405514"/>
+                                               <reference key="IBUIFontDescription" ref="191623313"/>
+                                               <reference key="IBUIFont" ref="729151236"/>
+                                       </object>
+                                       <object class="IBUIButton" id="458344107">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{67, 163}, {186, 44}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <reference key="IBUINormalTitleColor" ref="22857230"/>
                                                <reference key="IBUIHighlightedTitleColor" ref="876414419"/>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
+                                               <string key="IBUINormalTitle">VR Help Title</string>
                                                <reference key="IBUINormalTitleShadowColor" ref="175405514"/>
                                                <reference key="IBUIFontDescription" ref="191623313"/>
-                                               <reference key="IBUIFont" ref="1038247691"/>
+                                               <reference key="IBUIFont" ref="729151236"/>
+                                       </object>
+                                       <object class="IBUIButton" id="185201401">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{67, 232}, {186, 44}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <reference key="IBUINormalTitleColor" ref="22857230"/>
+                                               <reference key="IBUIHighlightedTitleColor" ref="876414419"/>
+                                               <string key="IBUINormalTitle">VR Help Items</string>
+                                               <reference key="IBUINormalTitleShadowColor" ref="175405514"/>
+                                               <reference key="IBUIFontDescription" ref="191623313"/>
+                                               <reference key="IBUIFont" ref="729151236"/>
                                        </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <reference key="NSNextKeyView" ref="820029264"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
@@ -111,6 +140,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -118,65 +148,95 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">resetGlobalPropertiesPressed:</string>
+                                               <string key="label">sendRPC:</string>
                                                <reference key="source" ref="820029264"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">7</int>
+                                       <string key="id">18</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">resetGlobalPropertiesPressed:</string>
+                                               <string key="label">sendRPC:</string>
                                                <reference key="source" ref="626873011"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">8</int>
+                                       <string key="id">19</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="458344107"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">20</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="185201401"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">21</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
-                                                       <reference ref="626873011"/>
                                                        <reference ref="820029264"/>
+                                                       <reference ref="626873011"/>
+                                                       <reference ref="458344107"/>
+                                                       <reference ref="185201401"/>
                                                </array>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
+                                               <string key="id">5</string>
                                                <reference key="object" ref="820029264"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
+                                               <string key="id">6</string>
                                                <reference key="object" ref="626873011"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">9</string>
+                                               <reference key="object" ref="458344107"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">11</string>
+                                               <reference key="object" ref="185201401"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
                                </array>
                        </object>
                        <dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -185,46 +245,30 @@
                                <string key="-2.CustomClassName">UIResponder</string>
                                <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                        </dictionary>
                        <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">8</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">ResetGlobalPropertiesViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <string key="NS.key.0">resetGlobalPropertiesPressed:</string>
-                                               <string key="NS.object.0">id</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">resetGlobalPropertiesPressed:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">resetGlobalPropertiesPressed:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/ResetGlobalPropertiesViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SDLBrain.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SDLBrain.h
deleted file mode 100644 (file)
index 0519ce2..0000000
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SDLBrain.h
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import "SDLProxyFactory.h"
-#import "SDLProxy.h" 
-#import "SDLIAPTransport.h"
-#import "SDLProtocol.h"
-#import "SDLDebugTool.h"
-#import "SDLConsoleController.h"
-#import "SDLRPCRequest.h"
-#import <AVFoundation/AVFoundation.h>
-
-@interface SDLBrain : NSObject   <SDLProxyListener> {
-    SDLProxy* proxy;
-    int autoIncCorrID;
-
-    int cmdID;
-    BOOL firstTimeStartUp;
-}
-
-+(SDLBrain *)getInstance;
-
--(int)getCMDID;
-
--(void) setupProxy;
--(void) setup;
--(void) sendRPCMessage:(SDLRPCRequest *)rpcMsg;
-
--(void) showPressed:(NSString *)message;
--(void) showAdvancedPressedWithLine1Text:(NSString *)line1Text line2:(NSString *)line2Text statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment *)textAlignment;
--(void) speakPressed:(NSString *)message;
--(void) speakTTSChunksPressed;
--(void) unregisterAppInterfacePressed;
--(void) setMediaClockTimerPressedwithHours:(NSNumber *)hours minutes:(NSNumber *)minutes seconds:(NSNumber *)seconds updateMode:(SDLUpdateMode *)updateMode;
--(void) alertPressed:(NSString *)message;
--(void) alertAdvancedPressedwithTTSChunks:(NSArray *)ttsChucks alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 playTone:(NSNumber *)playTone duration:(NSNumber *)duration;
--(void) addCommand:(NSString *)message;
--(void) addAdvancedCommandPressedwithMenuName:(NSString *)menuName position:(NSNumber *)position parentID:(NSNumber *)parentID vrCommands:(NSArray *) vrCommands;
--(void) deleteCommandPressed:(NSNumber *)cmdID;
--(void) addSubMenuPressedwithID:(NSNumber *)menuID menuName:(NSString *)menuName position:(NSNumber *)position; 
--(void) deleteSubMenuPressedwithID:(NSNumber *)menuID;
--(void) createInteractionChoiceSetPressedWithID:(NSNumber *)interactionChoiceSetID choiceSet:(NSArray *)choices;
--(void) deleteInteractionChoiceSetPressedWithID:(NSNumber *)interactionChoiceSetID;
--(void) performInteractionPressedwithInitialPrompt:(NSArray*)initialChunks initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpChunks:(NSArray*)helpChunks timeoutChunks:(NSArray*)timeoutChunks interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout;
--(void) subscribeButtonPressed:(SDLButtonName *)buttonName;
--(void) unsubscribeButtonPressed:(SDLButtonName *)buttonName;
--(void) sendEncodedSyncPData:(NSMutableArray *)data;
--(void) setGlobalPropertiesPressedWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText;
--(void) resetGlobalPropertiesPressedwithProperties:(NSArray *)properties;
-
-
-
-@end
-
-

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SDLBrain.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SDLBrain.m
deleted file mode 100644 (file)
index 4ed8280..0000000
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SDLBrain.m
+++ /dev/null
@@ -1,420 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "SDLBrain.h"
-#import "SDLNames.h"
-#import "SDLTTSChunkFactory.h"
-#import "SDLGenericResponse.h"
-#import "SDLProxyFactory.h"
-#import "SDLIAPTransport.h"
-#import "SDLProtocol.h"
-#import "SDLDebugTool.h"
-#import "SDLConsoleController.h"
-#import "SDLVersion.h"
-#import <MediaPlayer/MediaPlayer.h>
-
-
-#define PREFS_MTU_SIZE @"mtuSize"
-#define PREFS_SEND_DELAY @"sendDelay"  
-
-#define PREFS_FIRST_RUN @"firstRun"
-
-#define PREFS_PROTOCOL @"protocol"
-#define PREFS_IPADDRESS @"ipaddress"
-#define PREFS_PORT @"port"
-
-#define PREFS_TYPE @"type"
-
-
-
-@implementation SDLBrain  
-
-static SDLBrain *gInstance = NULL; 
-
-+ (SDLBrain *)getInstance
-{
-       @synchronized(self)
-       {
-               if (gInstance == NULL)
-                       gInstance = [[self alloc] init];
-       }
-       return gInstance;
-}
-
-//Populating Sync Display Screen with relevant information upon creation
--(void) setup {
-    SDLShow* msg = [SDLRPCRequestFactory buildShowWithMainField1:@"Smart Device" mainField2:@"Link Tester" alignment:[SDLTextAlignment CENTERED] correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-       msg.mediaTrack = @"SDL";
-    [proxy sendRPCRequest:msg];
-    
-    [SDLDebugTool logInfo:@"SDLProxy Version: %@: ", VERSION_STRING];
-}
-
--(void) sendRPCMessage:(SDLRPCRequest *)rpcMsg {
-    [proxy sendRPCRequest:rpcMsg];
-    
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:rpcMsg]];
-
-}
-
-
-// =====================================
-// RPC Function Calls
-// =====================================
-
-- (void) showPressed:(NSString *)message {    
-    SDLShow* msg = [SDLRPCRequestFactory buildShowWithMainField1:message mainField2:@"SDL Tester" alignment:[SDLTextAlignment CENTERED] correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-       msg.mediaTrack = @"SDL";
-    [proxy sendRPCRequest:msg];
-    
-    
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:msg]];
-    
-}
-
-
-
--(void) showAdvancedPressedWithLine1Text:(NSString *)line1Text line2:(NSString *)line2Text statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment *)textAlignment {
-    
-    SDLShow *msg = [SDLRPCRequestFactory buildShowWithMainField1:line1Text mainField2:line2Text statusBar:statusBar mediaClock:mediaClock mediaTrack:mediaTrack alignment:textAlignment correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:msg];
-    
-    
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:msg]];
-}
-
--(void) unregisterAppInterfacePressed {
-       SDLUnregisterAppInterface* req = [SDLRPCRequestFactory buildUnregisterAppInterfaceWithCorrelationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
--(void) setMediaClockTimerPressedwithHours:(NSNumber *)hours minutes:(NSNumber *)minutes seconds:(NSNumber *)seconds updateMode:(SDLUpdateMode *)updateMode {
-    SDLSetMediaClockTimer *req = [SDLRPCRequestFactory buildSetMediaClockTimerWithHours:hours minutes:minutes seconds:seconds updateMode:updateMode correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
-- (void) speakPressed:(NSString *)message {
-    SDLSpeak* req = [SDLRPCRequestFactory buildSpeakWithTTS:message correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
-- (void) alertPressed:(NSString *)message {
-    SDLAlert* req = [SDLRPCRequestFactory buildAlertWithTTS:message alertText1:message alertText2:@"" playTone:[NSNumber numberWithBool:YES] duration:[NSNumber numberWithInt:5000] correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
--(void) alertAdvancedPressedwithTTSChunks:(NSArray *)ttsChucks alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 playTone:(NSNumber *)playTone duration:(NSNumber *)duration {
-    
-    SDLAlert *req = [SDLRPCRequestFactory buildAlertWithTTSChunks:ttsChucks alertText1:alertText1 alertText2:alertText2 playTone:playTone duration:duration correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
--(void) addCommand:(NSString *)message {
-    
-    NSArray *vrc = [NSArray arrayWithObjects:message, nil];
-    SDLAddCommand *command = [SDLRPCRequestFactory buildAddCommandWithID:[NSNumber numberWithInt:cmdID] menuName:message vrCommands:vrc correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:command];
-    cmdID++;
-    
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:command]];
-    
-
-       
-}
-
--(void) addAdvancedCommandPressedwithMenuName:(NSString *)menuName position:(NSNumber *)position parentID:(NSNumber *)parentID vrCommands:(NSArray *) vrCommands {
-    
-    [SDLDebugTool logInfo:@"Added addCommand with cmdID = %d and correlationID = %d", cmdID, autoIncCorrID];
-    
-    SDLAddCommand *command = [SDLRPCRequestFactory buildAddCommandWithID:[NSNumber numberWithInt:cmdID] menuName:menuName parentID:parentID position:position vrCommands:vrCommands correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:command];
-    cmdID++;
-
-    
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:command]];
-    
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"AddCommandRequest" object:command]];
-                                                                                                                                                                
-}
-
-- (void) speakTTSChunksPressed {
-    SDLSpeak* req = [SDLRPCRequestFactory buildSpeakWithTTS:@"Speak, here comes a jingle" correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [(NSMutableArray*)req.ttsChunks addObject:[SDLTTSChunkFactory buildTTSChunkForString:SDLJingle.INITIAL_JINGLE type:SDLSpeechCapabilities.PRE_RECORDED]];
-       [(NSMutableArray*)req.ttsChunks addObject:[SDLTTSChunkFactory buildTTSChunkForString:@", ah, that's nice. Now example of SAPI Phonemes. Live." type:SDLSpeechCapabilities.TEXT]];
-    [(NSMutableArray*)req.ttsChunks addObject:[SDLTTSChunkFactory buildTTSChunkForString:@"_ l ay v ." type:SDLSpeechCapabilities.SAPI_PHONEMES]];
-    [(NSMutableArray*)req.ttsChunks addObject:[SDLTTSChunkFactory buildTTSChunkForString:@", Read." type:SDLSpeechCapabilities.TEXT]];
-    [(NSMutableArray*)req.ttsChunks addObject:[SDLTTSChunkFactory buildTTSChunkForString:@"_ R eh d ." type:SDLSpeechCapabilities.SAPI_PHONEMES]];
-    [proxy sendRPCRequest:req];
-    
-     [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
--(void) deleteCommandPressed:(NSNumber *)commandID {
-    SDLDeleteCommand *req = [SDLRPCRequestFactory buildDeleteCommandWithID:commandID correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
--(void) addSubMenuPressedwithID:(NSNumber *)menuID menuName:(NSString *)menuName position:(NSNumber *)position {
-    SDLAddSubMenu *req = [SDLRPCRequestFactory buildAddSubMenuWithID:menuID menuName:menuName position:position correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-    
-     [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"AddSubMenuRequest" object:req]];
-}
-
--(void) deleteSubMenuPressedwithID:(NSNumber *)menuID {
-    SDLDeleteSubMenu *req = [SDLRPCRequestFactory buildDeleteSubMenuWithID:menuID correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
--(void) createInteractionChoiceSetPressedWithID:(NSNumber *)interactionChoiceSetID choiceSet:(NSArray *)choices {
-    SDLCreateInteractionChoiceSet *req = [SDLRPCRequestFactory buildCreateInteractionChoiceSetWithID:interactionChoiceSetID choiceSet:choices correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
--(void) deleteInteractionChoiceSetPressedWithID:(NSNumber *)interactionChoiceSetID {
-    SDLDeleteInteractionChoiceSet *req = [SDLRPCRequestFactory buildDeleteInteractionChoiceSetWithID:interactionChoiceSetID correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
--(void) performInteractionPressedwithInitialPrompt:(NSArray*)initialChunks initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpChunks:(NSArray*)helpChunks timeoutChunks:(NSArray*)timeoutChunks interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout {
-    
-    SDLPerformInteraction *req = [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:interactionMode timeout:timeout correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
--(void) subscribeButtonPressed:(SDLButtonName *)buttonName {
-    SDLSubscribeButton *req = [SDLRPCRequestFactory buildSubscribeButtonWithName:buttonName correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-    
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"SubscribeButtonRequest" object:req]];
-    
-}
-
--(void) unsubscribeButtonPressed:(SDLButtonName *)buttonName {
-    SDLUnsubscribeButton *req = [SDLRPCRequestFactory buildUnsubscribeButtonWithName:buttonName correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
--(void) sendEncodedSyncPData:(NSMutableArray *)data {
-    SDLEncodedSyncPData* req = [SDLRPCRequestFactory buildEncodedSyncPDataWithData:data correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
--(void) setGlobalPropertiesPressedWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText {
-    SDLSetGlobalProperties *req = [SDLRPCRequestFactory buildSetGlobalPropertiesWithHelpText:helpText timeoutText:timeoutText correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
--(void) resetGlobalPropertiesPressedwithProperties:(NSArray *)properties {
-    SDLResetGlobalProperties *req = [SDLRPCRequestFactory buildResetGlobalPropertiesWithProperties:properties correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
-    [proxy sendRPCRequest:req];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:req]];
-}
-
-
--(int)getCMDID {
-    return cmdID;
-}
-
-// =====================================
-// Proxy Life Management Functions
-// =====================================
-
--(void) savePreferences {
-       
-       int mtuSize = 1000, delayAfterSend = 0;
-       
-       NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
-    
-       [prefs setObject:[NSString stringWithFormat:@"%i", mtuSize] forKey:PREFS_MTU_SIZE];
-       [prefs setObject:[NSString stringWithFormat:@"%i", delayAfterSend] forKey:PREFS_SEND_DELAY];
-    
-    //Set to match settings.bundle defaults
-    if (![[prefs objectForKey:PREFS_FIRST_RUN] isEqualToString:@"False"]) {
-        [prefs setObject:@"False" forKey:PREFS_FIRST_RUN];
-        [prefs setObject:@"iap" forKey:PREFS_PROTOCOL];
-        [prefs setObject:@"192.168.0.1" forKey:PREFS_IPADDRESS];
-        [prefs setObject:@"50007" forKey:PREFS_PORT];
-        [prefs setObject:@"media" forKey:PREFS_TYPE];
-    }
-
-       [prefs synchronize];
-}
-
-
--(void)  setupProxy{
-    [self savePreferences];
-    
-    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
-    if ([[prefs objectForKey:PREFS_PROTOCOL] isEqualToString:@"tcpl"]) {
-        proxy = [[SDLProxyFactory buildProxyWithListener: self
-                                                   tcpIPAddress: nil
-                                                        tcpPort: [prefs objectForKey:PREFS_PORT]] retain];
-    } else if ([[prefs objectForKey:PREFS_PROTOCOL] isEqualToString:@"tcps"]) {
-        proxy = [[SDLProxyFactory buildProxyWithListener: self
-                                                   tcpIPAddress: [prefs objectForKey:PREFS_IPADDRESS]
-                                                        tcpPort: [prefs objectForKey:PREFS_PORT]] retain];
-    } else
-        proxy = [[SDLProxyFactory buildProxyWithListener: self] retain];
-    
-    autoIncCorrID = 101;
-    cmdID = 1;
-}
-
--(void) tearDownProxy {
-       
-       [proxy dispose];
-       [SDLDebugTool logInfo:@"Proxy retain count = %i", proxy.retainCount];
-       [SDLDebugTool logInfo:@"releasing proxy"];
-       [proxy release];
-       proxy = nil;
-}
-
-
-// =====================================
-// Implementation of ProxyListener
-// =====================================
-
--(void) onOnHMIStatus:(SDLOnHMIStatus*) notification {
-    if (notification.hmiLevel == SDLHMILevel.HMI_FULL) {
-        if (firstTimeStartUp == YES) {
-            [self setup];
-            firstTimeStartUp = NO;
-        }
-    }
-
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:notification]];
-}   
-
-
--(void) onOnButtonEvent:(SDLOnButtonEvent*) notification {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:notification]];
-}
--(void) onOnButtonPress:(SDLOnButtonPress*) notification {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:notification]];
-}
--(void) onOnCommand:(SDLOnCommand*) notification {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:notification]];
-}
--(void) onOnAppInterfaceUnregistered:(SDLOnAppInterfaceUnregistered*) notification {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:notification]];
-}
-
--(void) onAddCommandResponse:(SDLAddCommandResponse*) response {
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
--(void) onAddSubMenuResponse:(SDLAddSubMenuResponse*) response {
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
--(void) onCreateInteractionChoiceSetResponse:(SDLCreateInteractionChoiceSetResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
--(void) onDeleteCommandResponse:(SDLDeleteCommandResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
--(void) onDeleteInteractionChoiceSetResponse:(SDLDeleteInteractionChoiceSetResponse*) response {
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];}
--(void) onDeleteSubMenuResponse:(SDLDeleteSubMenuResponse*) response {
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];}
--(void) onPerformInteractionResponse:(SDLPerformInteractionResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
--(void) onRegisterAppInterfaceResponse:(SDLRegisterAppInterfaceResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
--(void) onSetGlobalPropertiesResponse:(SDLSetGlobalPropertiesResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
--(void) onResetGlobalPropertiesResponse:(SDLResetGlobalPropertiesResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
--(void) onSetMediaClockTimerResponse:(SDLSetMediaClockTimerResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
-
--(void) onShowResponse:(SDLShowResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
-
--(void) onSpeakResponse:(SDLSpeakResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
--(void) onAlertResponse:(SDLAlertResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
--(void) onSubscribeButtonResponse:(SDLSubscribeButtonResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
--(void) onUnregisterAppInterfaceResponse:(SDLUnregisterAppInterfaceResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
--(void) onUnsubscribeButtonResponse:(SDLUnsubscribeButtonResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
--(void) onGenericResponse:(SDLGenericResponse*) response
-{
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:response]];
-}
-
-
--(void) onEncodedSyncPDataResponse:(SDLEncodedSyncPDataResponse*) response {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"onRPCResponse" object:response]];
-}
-
--(void) onOnDriverDistraction:(SDLOnDriverDistraction*) notification {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:notification]];
-}
--(void) onOnTBTClientState:(SDLOnTBTClientState*) notification {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:notification]];
-}
--(void) onOnEncodedSyncPData:(SDLOnEncodedSyncPData*) notification {
-       [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:notification]];
-}
-
--(void) onProxyOpened {
-    firstTimeStartUp = YES;
-    
-    SDLRegisterAppInterface* regRequest = [SDLRPCRequestFactory buildRegisterAppInterfaceWithAppName:@"SDLTester"];
-    
-    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
-    if ([[prefs objectForKey:PREFS_TYPE] isEqualToString:@"nonmedia"]) {
-        regRequest.isMediaApplication = [NSNumber numberWithBool:NO];
-    } else {
-        regRequest.isMediaApplication = [NSNumber numberWithBool:YES];
-    }
-    
-    regRequest.ngnMediaScreenAppName = nil;
-       regRequest.vrSynonyms = nil;
-    [proxy sendRPCRequest:regRequest];
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"NewConsoleControllerObject" object:regRequest]];
-}
-
--(void) onError:(NSException*) e {
-       [SDLDebugTool logInfo:@"proxy error occurred: %@", e];
-}
-
--(void) onProxyClosed {
-    [SDLDebugTool logInfo:@"onProxyClosed"];
-    
-       [self tearDownProxy];
-       
-       [[self init] setupProxy];
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/Sail.mp3 b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/Sail.mp3
deleted file mode 100644 (file)
index 8df3df5..0000000
Binary files a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/Sail.mp3 and /dev/null differ

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/Sample.mp3 b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/Sample.mp3
new file mode 100644 (file)
index 0000000..65fe251
Binary files /dev/null and b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/Sample.mp3 differ

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ScrollableMessageViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ScrollableMessageViewController.h
new file mode 100644 (file)
index 0000000..3c37ea0
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ScrollableMessageViewController.h
@@ -0,0 +1,21 @@
+//  ScrollableMessageViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+#import "SoftButtonListViewController.h"
+
+@interface ScrollableMessageViewController : UIViewController <UITextFieldDelegate, UITextViewDelegate> {
+ 
+    IBOutlet UITextView *messageview;
+    IBOutlet UITextField *timeouttext;
+    IBOutlet UISwitch *sbSwitch;
+    
+    SoftButtonListViewController *softButtonListViewController;
+}
+
+-(IBAction)sendRPC:(id)sender;
+-(IBAction)softButtons:(id)sender;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ScrollableMessageViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ScrollableMessageViewController.m
new file mode 100644 (file)
index 0000000..b49bd83
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ScrollableMessageViewController.m
@@ -0,0 +1,108 @@
+//  ScrollableMessageViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "ScrollableMessageViewController.h"
+#import "AppDelegate.h"
+
+@interface ScrollableMessageViewController ()
+
+@end
+
+@implementation ScrollableMessageViewController
+
+NSMutableArray *sbList;
+
+-(IBAction)sendRPC:(id)sender
+{
+    SDLScrollableMessage *req = [[[SDLScrollableMessage alloc] init] autorelease];
+    
+    if (sbSwitch.isOn) {
+        req = [SDLRPCRequestFactory buildScrollableMessage:[messageview text] timeout:[NSNumber numberWithInt:[[timeouttext text] intValue]] softButtons:sbList correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    }
+    else {
+        req = [SDLRPCRequestFactory buildScrollableMessage:[messageview text] timeout:[NSNumber numberWithInt:[[timeouttext text] intValue]] softButtons:nil correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    }
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+}
+
+
+-(IBAction)softButtons:(id)sender {
+    [softButtonListViewController updateList:sbList];
+    [self.navigationController pushViewController:softButtonListViewController animated:YES];
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return NO;
+}
+
+- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
+    
+    if([text isEqualToString:@"\n"]) {
+        [textView resignFirstResponder];
+        return NO;
+    }
+    
+    return YES;
+}
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"ScrollableMessage";
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+        softButtonListViewController = [[SoftButtonListViewController alloc] initWithNibName:@"SoftButtonListViewController" bundle:nil];
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    messageview.delegate = self;
+    timeouttext.delegate = self;
+    
+    [[messageview layer] setCornerRadius:10];
+    
+    //Example Soft Buttons
+    SDLSoftButton *sb1 = [[[SDLSoftButton alloc] init] autorelease];
+    sb1.softButtonID = [NSNumber numberWithInt:5505];
+    sb1.text = @"Reply";
+    sb1.type = [SDLSoftButtonType TEXT];
+    sb1.isHighlighted = [NSNumber numberWithBool:false];
+    sb1.systemAction = [SDLSystemAction STEAL_FOCUS];
+    
+    SDLSoftButton *sb2 = [[[SDLSoftButton alloc] init] autorelease];
+    sb2.softButtonID = [NSNumber numberWithInt:5506];
+    sb2.text = @"Close";
+    sb2.type = [SDLSoftButtonType TEXT];
+    sb2.isHighlighted = [NSNumber numberWithBool:false];
+    sb2.systemAction = [SDLSystemAction DEFAULT_ACTION];
+    
+    sbList = [[NSMutableArray alloc] initWithObjects:sb1,sb2,nil];
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ScrollableMessageViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ScrollableMessageViewController.xib
new file mode 100644 (file)
index 0000000..d417274
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ScrollableMessageViewController.xib
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       <string key="NS.object.0">3742</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUIButton</string>
+                       <string>IBUILabel</string>
+                       <string>IBUISwitch</string>
+                       <string>IBUITextField</string>
+                       <string>IBUITextView</string>
+                       <string>IBUIView</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <object class="IBProxyObject" id="372490531">
+                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBProxyObject" id="975951072">
+                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBUIView" id="191373211">
+                               <nil key="NSNextResponder"/>
+                               <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUILabel" id="132657633">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 187}, {62, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="779417607"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Timeout</string>
+                                               <object class="NSColor" key="IBUITextColor" id="83775735">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
+                                               </object>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="878946683">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">17</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="679481596">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">17</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUITextField" id="779417607">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{90, 182}, {210, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="162665082"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">10000</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <object class="NSColorSpace" key="NSCustomColorSpace">
+                                                               <int key="NSID">2</int>
+                                                       </object>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="946691039">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">14</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="938813024">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">14</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUIButton" id="496830156">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{112, 310}, {97, 37}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <object class="NSColor" key="IBUINormalTitleColor" id="1068232155">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
+                                               <object class="NSColor" key="IBUIHighlightedTitleColor" id="558694624">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MQA</bytes>
+                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleShadowColor" id="633481866">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MC41AA</bytes>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="748156101">
+                                                       <int key="type">2</int>
+                                                       <double key="pointSize">15</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="151753785">
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
+                                                       <double key="NSSize">15</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUISwitch" id="871842020">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{160, 244}, {94, 27}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="496830156"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                       </object>
+                                       <object class="IBUIButton" id="162665082">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{68, 241}, {99, 36}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="871842020"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <reference key="IBUINormalTitleColor" ref="1068232155"/>
+                                               <reference key="IBUIHighlightedTitleColor" ref="558694624"/>
+                                               <string key="IBUINormalTitle">Soft Buttons</string>
+                                               <reference key="IBUINormalTitleShadowColor" ref="633481866"/>
+                                               <reference key="IBUIFontDescription" ref="748156101"/>
+                                               <reference key="IBUIFont" ref="151753785"/>
+                                       </object>
+                                       <object class="IBUITextView" id="324252634">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 29}, {280, 139}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="132657633"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <object class="NSColor" key="IBUIBackgroundColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MSAxIDEAA</bytes>
+                                               </object>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <bool key="IBUIMultipleTouchEnabled">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">This is where long text can go for a scrollable message. Like, a really long message. As in a few sentences actually. So long, as a matter of fact, I have to keep adding words just to be able to get this to demo correctly.</string>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIAutocapitalizationType">2</int>
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="938813024"/>
+                                       </object>
+                                       <object class="IBUILabel" id="231407758">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 3}, {69, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="324252634"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Message</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="679481596"/>
+                                       </object>
+                               </array>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
+                               <reference key="NSNextKeyView" ref="231407758"/>
+                               <object class="NSColor" key="IBUIBackgroundColor">
+                                       <int key="NSColorSpace">1</int>
+                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                               </object>
+                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
+                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="191373211"/>
+                                       </object>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">messageview</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="324252634"/>
+                                       </object>
+                                       <string key="id">29</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">timeouttext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="779417607"/>
+                                       </object>
+                                       <string key="id">30</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">sbSwitch</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="871842020"/>
+                                       </object>
+                                       <string key="id">33</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="496830156"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">31</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">softButtons:</string>
+                                               <reference key="source" ref="162665082"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">34</string>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <string key="id">0</string>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="191373211"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="132657633"/>
+                                                       <reference ref="779417607"/>
+                                                       <reference ref="496830156"/>
+                                                       <reference ref="871842020"/>
+                                                       <reference ref="162665082"/>
+                                                       <reference ref="324252634"/>
+                                                       <reference ref="231407758"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="372490531"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="975951072"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">4</string>
+                                               <reference key="object" ref="132657633"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">5</string>
+                                               <reference key="object" ref="779417607"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">17</string>
+                                               <reference key="object" ref="496830156"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">25</string>
+                                               <reference key="object" ref="871842020"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">26</string>
+                                               <reference key="object" ref="162665082"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">27</string>
+                                               <reference key="object" ref="324252634"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">28</string>
+                                               <reference key="object" ref="231407758"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.CustomClassName">ScrollableMessageViewController</string>
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="-2.CustomClassName">UIResponder</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="25.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
+       </data>
+</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetAppIconViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetAppIconViewController.h
new file mode 100644 (file)
index 0000000..2817d02
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetAppIconViewController.h
@@ -0,0 +1,16 @@
+//  SetAppIconViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+
+@interface SetAppIconViewController : UIViewController <UITextFieldDelegate> {
+ 
+    IBOutlet UITextField *nametext;
+
+}
+
+-(IBAction)sendRPC:(id)sender;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetAppIconViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetAppIconViewController.m
new file mode 100644 (file)
index 0000000..72e59a3
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetAppIconViewController.m
@@ -0,0 +1,66 @@
+//  SetAppIconViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "SetAppIconViewController.h"
+#import "AppDelegate.h"
+
+@interface SetAppIconViewController ()
+
+@end
+
+@implementation SetAppIconViewController
+
+
+-(IBAction)sendRPC:(id)sender {
+    
+    SDLSetAppIcon *req = [SDLRPCRequestFactory buildSetAppIconWithFileName:[nametext text] correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return NO;
+}
+
+
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"SetAppIcon";
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    nametext.delegate = self;
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EncodedSyncPDataViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetAppIconViewController.xib
similarity index 66%
rename from SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EncodedSyncPDataViewController.xib
rename to SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetAppIconViewController.xib
index de2aa17..e94c772 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/EncodedSyncPDataViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetAppIconViewController.xib
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
-                       <string>IBUITextView</string>
+                       <string>IBProxyObject</string>
                        <string>IBUIButton</string>
-                       <string>IBUIView</string>
                        <string>IBUILabel</string>
-                       <string>IBProxyObject</string>
+                       <string>IBUITextField</string>
+                       <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -34,26 +34,26 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
-                                       <object class="IBUILabel" id="854250947">
+                                       <object class="IBUILabel" id="132657633">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{40, 27}, {42, 21}}</string>
+                                               <string key="NSFrame">{{20, 15}, {78, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="713405656"/>
+                                               <reference key="NSNextKeyView" ref="779417607"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <int key="IBUIContentMode">7</int>
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Data</string>
+                                               <string key="IBUIText">File Name</string>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">1</int>
                                                        <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
                                                </object>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
@@ -63,29 +63,34 @@
                                                        <double key="pointSize">17</double>
                                                </object>
                                                <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica</string>
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">17</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
-                                       <object class="IBUITextView" id="713405656">
+                                       <object class="IBUITextField" id="779417607">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{40, 56}, {240, 128}}</string>
+                                               <string key="NSFrame">{{20, 44}, {280, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="726750909"/>
+                                               <reference key="NSNextKeyView" ref="496830156"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <object class="NSColor" key="IBUIBackgroundColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MSAxIDEAA</bytes>
-                                               </object>
+                                               <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
-                                               <bool key="IBUIMultipleTouchEnabled">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText"/>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">hmiFileName</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <object class="NSColorSpace" key="NSCustomColorSpace">
+                                                               <int key="NSID">2</int>
+                                                       </object>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
                                                <object class="IBUITextInputTraits" key="IBUITextInputTraits">
-                                                       <int key="IBUIAutocapitalizationType">2</int>
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <object class="IBUIFontDescription" key="IBUIFontDescription">
@@ -93,32 +98,31 @@
                                                        <double key="pointSize">14</double>
                                                </object>
                                                <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica</string>
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">14</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
-                                       <object class="IBUIButton" id="726750909">
+                                       <object class="IBUIButton" id="496830156">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{112, 257}, {97, 37}}</string>
+                                               <string key="NSFrame">{{112, 310}, {97, 37}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentHorizontalAlignment">0</int>
                                                <int key="IBUIContentVerticalAlignment">0</int>
                                                <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
                                                <object class="NSColor" key="IBUIHighlightedTitleColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MQA</bytes>
                                                </object>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
                                                <object class="NSColor" key="IBUINormalTitleShadowColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MC41AA</bytes>
@@ -128,16 +132,14 @@
                                                        <double key="pointSize">15</double>
                                                </object>
                                                <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica-Bold</string>
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
                                                        <double key="NSSize">15</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
-                               <reference key="NSNextKeyView" ref="854250947"/>
+                               <reference key="NSNextKeyView" ref="132657633"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
                                        <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
@@ -151,6 +153,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -158,130 +161,101 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
-                                               <string key="label">encodedDataText</string>
+                                               <string key="label">nametext</string>
                                                <reference key="source" ref="372490531"/>
-                                               <reference key="destination" ref="713405656"/>
+                                               <reference key="destination" ref="779417607"/>
                                        </object>
-                                       <int key="connectionID">7</int>
+                                       <string key="id">27</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">sendESPData:</string>
-                                               <reference key="source" ref="726750909"/>
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="496830156"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">8</int>
+                                       <string key="id">28</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
-                                                       <reference ref="854250947"/>
-                                                       <reference ref="713405656"/>
-                                                       <reference ref="726750909"/>
+                                                       <reference ref="132657633"/>
+                                                       <reference ref="496830156"/>
+                                                       <reference ref="779417607"/>
                                                </array>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
-                                               <reference key="object" ref="854250947"/>
+                                               <string key="id">4</string>
+                                               <reference key="object" ref="132657633"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
-                                               <reference key="object" ref="713405656"/>
+                                               <string key="id">5</string>
+                                               <reference key="object" ref="779417607"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
-                                               <reference key="object" ref="726750909"/>
+                                               <string key="id">17</string>
+                                               <reference key="object" ref="496830156"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                </array>
                        </object>
                        <dictionary class="NSMutableDictionary" key="flattenedProperties">
-                               <string key="-1.CustomClassName">EncodedSyncPDataViewController</string>
+                               <string key="-1.CustomClassName">SetAppIconViewController</string>
                                <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="-2.CustomClassName">UIResponder</string>
                                <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                        </dictionary>
                        <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">8</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">EncodedSyncPDataViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <string key="NS.key.0">sendESPData:</string>
-                                               <string key="NS.object.0">id</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">sendESPData:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">sendESPData:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="outlets">
-                                               <string key="NS.key.0">encodedDataText</string>
-                                               <string key="NS.object.0">UITextView</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <string key="NS.key.0">encodedDataText</string>
-                                               <object class="IBToOneOutletInfo" key="NS.object.0">
-                                                       <string key="name">encodedDataText</string>
-                                                       <string key="candidateClassName">UITextView</string>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/EncodedSyncPDataViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetGlobalPropertiesViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetGlobalPropertiesViewController.h
index 59e2a18..ff11156 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetGlobalPropertiesViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetGlobalPropertiesViewController.h
@@ -1,17 +1,26 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SetGlobalPropertiesViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
+#import "SmartDeviceLinkTester.h"
 
-@interface SetGlobalPropertiesViewController : UIViewController <UITextViewDelegate> {
+@interface SetGlobalPropertiesViewController : UIViewController <UITextFieldDelegate, UITextViewDelegate> {
     
     IBOutlet UITextView *helpText;
     IBOutlet UITextView *timeoutText;
+    IBOutlet UITextView *vrhelpText;
+    IBOutlet UITextView *vrhelpitemText;
+    IBOutlet UITextView *vrhelpitemnumberText;
+    IBOutlet UITextView *vrhelpitemimagenumberText;
     
+    IBOutlet UISwitch *helpSwitch;
+    IBOutlet UISwitch *timeoutSwitch;
+    IBOutlet UISwitch *vrhelpSwitch;
+    IBOutlet UISwitch *vrhelpitemSwitch;
+
 }
 
--(IBAction)setGlobalPropertiesPressed:(id)sender;
+-(IBAction)sendRPC:(id)sender;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetGlobalPropertiesViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetGlobalPropertiesViewController.m
index 0269627..f0619bd 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetGlobalPropertiesViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetGlobalPropertiesViewController.m
@@ -1,8 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SetGlobalPropertiesViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "SetGlobalPropertiesViewController.h"
+#import "AppDelegate.h"
 
 @interface SetGlobalPropertiesViewController ()
 
@@ -11,8 +12,45 @@
 @implementation SetGlobalPropertiesViewController
 
 
--(IBAction)setGlobalPropertiesPressed:(id)sender {
-    [[SDLBrain getInstance] setGlobalPropertiesPressedWithHelpText:[helpText text] timeoutText:[timeoutText text]];
+-(IBAction)sendRPC:(id)sender {
+    
+    NSString* strHelpText = [NSString stringWithString:[helpText text]];
+    NSString* strTimeoutText = [NSString stringWithString:[timeoutText text]];
+    NSString* strVRHelpText = [NSString stringWithString:[vrhelpText text]];
+    
+    SDLVrHelpItem *vrHelpItem = [[[SDLVrHelpItem alloc] init] autorelease];
+    SDLImage *image = [[[SDLImage alloc] init] autorelease];
+    image.imageType = [SDLImageType STATIC];
+    image.value = [vrhelpitemimagenumberText text];
+    vrHelpItem.image = image;
+    vrHelpItem.text = [vrhelpitemText text];
+    vrHelpItem.position = [NSNumber numberWithInt:[[vrhelpitemnumberText text] intValue]];
+    
+    
+    NSArray* arrVRHelpItemText = [[NSMutableArray alloc] initWithObjects:vrHelpItem, nil];
+    
+    if(![helpSwitch isOn])
+        strHelpText = nil;
+        
+    if(![timeoutSwitch isOn])
+        strTimeoutText  = nil;
+    
+    if(![vrhelpSwitch isOn])
+        strVRHelpText = nil;
+    
+    if(![vrhelpitemSwitch isOn])
+        arrVRHelpItemText = nil;
+    
+    SDLSetGlobalProperties *req = [SDLRPCRequestFactory buildSetGlobalPropertiesWithHelpText:strHelpText timeoutText:strTimeoutText vrHelpTitle:strVRHelpText vrHelp:arrVRHelpItemText correlationID: [[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
 }
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
@@ -26,6 +64,11 @@
     return self;
 }
 
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return NO;
+}
+
 - (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
     
     if([text isEqualToString:@"\n"]) {
@@ -41,9 +84,15 @@
     [super viewDidLoad];
     helpText.delegate = self;
     timeoutText.delegate = self;
+    vrhelpText.delegate = self;
+    vrhelpitemText.delegate = self;
     
     [[helpText layer] setCornerRadius:10];
     [[timeoutText layer] setCornerRadius:10];
+    [[vrhelpText layer] setCornerRadius:10];
+    [[vrhelpitemText layer] setCornerRadius:10];
+    [[vrhelpitemnumberText layer] setCornerRadius:10];
+    [[vrhelpitemimagenumberText layer] setCornerRadius:10];    
 }
 
 - (void)viewDidUnload

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetGlobalPropertiesViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetGlobalPropertiesViewController.xib
index c03c815..92c1473 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetGlobalPropertiesViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetGlobalPropertiesViewController.xib
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
-                       <string>IBUITextView</string>
+                       <string>IBProxyObject</string>
                        <string>IBUIButton</string>
-                       <string>IBUIView</string>
                        <string>IBUILabel</string>
-                       <string>IBProxyObject</string>
+                       <string>IBUISwitch</string>
+                       <string>IBUITextView</string>
+                       <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -34,25 +35,26 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="IBUILabel" id="1008950929">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{40, 20}, {74, 21}}</string>
+                                               <string key="NSFrame">{{111, 8}, {95, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="169609077"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <int key="IBUIContentMode">7</int>
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Help Text</string>
+                                               <string key="IBUIText">Help Prompt</string>
                                                <object class="NSColor" key="IBUITextColor" id="703630489">
                                                        <int key="NSColorSpace">1</int>
                                                        <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
                                                </object>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
@@ -61,8 +63,8 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">17</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="33933104">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="1023439528">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">17</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -70,9 +72,9 @@
                                        <object class="IBUITextView" id="169609077">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{40, 49}, {239, 93}}</string>
+                                               <string key="NSFrame">{{40, 38}, {239, 29}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="653173805"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <object class="NSColor" key="IBUIBackgroundColor" id="267102744">
                                                        <int key="NSColorSpace">1</int>
@@ -81,7 +83,7 @@
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <bool key="IBUIMultipleTouchEnabled">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">This is the help prompt</string>
                                                <object class="IBUITextInputTraits" key="IBUITextInputTraits">
                                                        <int key="IBUIAutocapitalizationType">2</int>
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -90,8 +92,8 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">14</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="294066654">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="898945564">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">14</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
@@ -99,63 +101,62 @@
                                        <object class="IBUILabel" id="773301561">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{40, 150}, {100, 21}}</string>
+                                               <string key="NSFrame">{{111, 74}, {121, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="523857024"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <int key="IBUIContentMode">7</int>
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Timeout Text</string>
+                                               <string key="IBUIText">Timeout Prompt</string>
                                                <reference key="IBUITextColor" ref="703630489"/>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="703300578"/>
-                                               <reference key="IBUIFont" ref="33933104"/>
+                                               <reference key="IBUIFont" ref="1023439528"/>
                                        </object>
                                        <object class="IBUITextView" id="523857024">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{40, 179}, {239, 93}}</string>
+                                               <string key="NSFrame">{{40, 103}, {239, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="441671498"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <reference key="IBUIBackgroundColor" ref="267102744"/>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <bool key="IBUIMultipleTouchEnabled">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">This is the timeout prompt</string>
                                                <object class="IBUITextInputTraits" key="IBUITextInputTraits">
                                                        <int key="IBUIAutocapitalizationType">2</int>
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="766219784"/>
-                                               <reference key="IBUIFont" ref="294066654"/>
+                                               <reference key="IBUIFont" ref="898945564"/>
                                        </object>
                                        <object class="IBUIButton" id="336855288">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{111, 298}, {97, 37}}</string>
+                                               <string key="NSFrame">{{111, 324}, {97, 37}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentHorizontalAlignment">0</int>
                                                <int key="IBUIContentVerticalAlignment">0</int>
                                                <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
                                                <object class="NSColor" key="IBUIHighlightedTitleColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MQA</bytes>
                                                </object>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
                                                <object class="NSColor" key="IBUINormalTitleShadowColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MC41AA</bytes>
@@ -165,16 +166,199 @@
                                                        <double key="pointSize">15</double>
                                                </object>
                                                <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica-Bold</string>
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
                                                        <double key="NSSize">15</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
+                                       <object class="IBUILabel" id="337157212">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{115, 142}, {101, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="66750216"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">VR Help Title</string>
+                                               <reference key="IBUITextColor" ref="703630489"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="703300578"/>
+                                               <reference key="IBUIFont" ref="1023439528"/>
+                                       </object>
+                                       <object class="IBUITextView" id="66750216">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{40, 171}, {239, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="454878511"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <reference key="IBUIBackgroundColor" ref="267102744"/>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <bool key="IBUIMultipleTouchEnabled">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">This is the VR help title</string>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIAutocapitalizationType">2</int>
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="766219784"/>
+                                               <reference key="IBUIFont" ref="898945564"/>
+                                       </object>
+                                       <object class="IBUILabel" id="503119341">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{115, 216}, {116, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="427773545"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">VR Help Item #</string>
+                                               <reference key="IBUITextColor" ref="703630489"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="703300578"/>
+                                               <reference key="IBUIFont" ref="1023439528"/>
+                                       </object>
+                                       <object class="IBUITextView" id="427773545">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{40, 247}, {239, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="336855288"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <reference key="IBUIBackgroundColor" ref="267102744"/>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <bool key="IBUIMultipleTouchEnabled">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">VR help item text #1</string>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIAutocapitalizationType">2</int>
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="766219784"/>
+                                               <reference key="IBUIFont" ref="898945564"/>
+                                       </object>
+                                       <object class="IBUISwitch" id="513462087">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{11, 7}, {94, 27}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="1008950929"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <bool key="IBUIOn">YES</bool>
+                                       </object>
+                                       <object class="IBUISwitch" id="653173805">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{11, 72}, {94, 27}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="773301561"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <bool key="IBUIOn">YES</bool>
+                                       </object>
+                                       <object class="IBUISwitch" id="441671498">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{14, 139}, {94, 27}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="337157212"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <bool key="IBUIOn">YES</bool>
+                                       </object>
+                                       <object class="IBUISwitch" id="454878511">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{14, 213}, {94, 27}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="503119341"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <bool key="IBUIOn">YES</bool>
+                                       </object>
+                                       <object class="IBUITextView" id="55735636">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{239, 211}, {40, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <reference key="IBUIBackgroundColor" ref="267102744"/>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <bool key="IBUIMultipleTouchEnabled">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">1</string>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIAutocapitalizationType">2</int>
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="766219784"/>
+                                               <reference key="IBUIFont" ref="898945564"/>
+                                       </object>
+                                       <object class="IBUILabel" id="1070329592">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{40, 290}, {258, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Help Item Static Image #</string>
+                                               <reference key="IBUITextColor" ref="703630489"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="703300578"/>
+                                               <reference key="IBUIFont" ref="1023439528"/>
+                                       </object>
+                                       <object class="IBUITextView" id="279237991">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{239, 285}, {40, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <reference key="IBUIBackgroundColor" ref="267102744"/>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <bool key="IBUIMultipleTouchEnabled">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">9</string>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIAutocapitalizationType">2</int>
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="766219784"/>
+                                               <reference key="IBUIFont" ref="898945564"/>
+                                       </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
-                               <reference key="NSNextKeyView" ref="1008950929"/>
+                               <reference key="NSNextKeyView" ref="513462087"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
                                        <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
@@ -188,6 +372,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -195,7 +380,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -203,7 +388,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="169609077"/>
                                        </object>
-                                       <int key="connectionID">9</int>
+                                       <string key="id">9</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -211,74 +396,204 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="523857024"/>
                                        </object>
-                                       <int key="connectionID">10</int>
+                                       <string key="id">10</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">helpSwitch</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="513462087"/>
+                                       </object>
+                                       <string key="id">24</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">timeoutSwitch</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="653173805"/>
+                                       </object>
+                                       <string key="id">26</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">vrhelpText</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="66750216"/>
+                                       </object>
+                                       <string key="id">27</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">vrhelpSwitch</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="441671498"/>
+                                       </object>
+                                       <string key="id">28</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">vrhelpitemText</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="427773545"/>
+                                       </object>
+                                       <string key="id">29</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">vrhelpitemSwitch</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="454878511"/>
+                                       </object>
+                                       <string key="id">30</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">vrhelpitemimagenumberText</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="279237991"/>
+                                       </object>
+                                       <string key="id">36</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">vrhelpitemnumberText</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="55735636"/>
+                                       </object>
+                                       <string key="id">37</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">setGlobalPropertiesPressed:</string>
+                                               <string key="label">sendRPC:</string>
                                                <reference key="source" ref="336855288"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">11</int>
+                                       <string key="id">32</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
-                                                       <reference ref="1008950929"/>
+                                                       <reference ref="336855288"/>
                                                        <reference ref="169609077"/>
-                                                       <reference ref="773301561"/>
                                                        <reference ref="523857024"/>
-                                                       <reference ref="336855288"/>
+                                                       <reference ref="337157212"/>
+                                                       <reference ref="66750216"/>
+                                                       <reference ref="427773545"/>
+                                                       <reference ref="503119341"/>
+                                                       <reference ref="454878511"/>
+                                                       <reference ref="441671498"/>
+                                                       <reference ref="653173805"/>
+                                                       <reference ref="773301561"/>
+                                                       <reference ref="1008950929"/>
+                                                       <reference ref="513462087"/>
+                                                       <reference ref="55735636"/>
+                                                       <reference ref="1070329592"/>
+                                                       <reference ref="279237991"/>
                                                </array>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
+                                               <string key="id">4</string>
                                                <reference key="object" ref="1008950929"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
+                                               <string key="id">5</string>
                                                <reference key="object" ref="169609077"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
+                                               <string key="id">6</string>
                                                <reference key="object" ref="773301561"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">7</int>
+                                               <string key="id">7</string>
                                                <reference key="object" ref="523857024"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">8</int>
+                                               <string key="id">8</string>
                                                <reference key="object" ref="336855288"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">12</string>
+                                               <reference key="object" ref="337157212"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">13</string>
+                                               <reference key="object" ref="66750216"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">14</string>
+                                               <reference key="object" ref="503119341"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">15</string>
+                                               <reference key="object" ref="427773545"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">20</string>
+                                               <reference key="object" ref="513462087"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">21</string>
+                                               <reference key="object" ref="653173805"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">22</string>
+                                               <reference key="object" ref="441671498"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">23</string>
+                                               <reference key="object" ref="454878511"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">33</string>
+                                               <reference key="object" ref="55735636"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">34</string>
+                                               <reference key="object" ref="1070329592"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">35</string>
+                                               <reference key="object" ref="279237991"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
                                </array>
                        </object>
                        <dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -287,6 +602,17 @@
                                <string key="-2.CustomClassName">UIResponder</string>
                                <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="15.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="34.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="35.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -297,53 +623,21 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">11</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">SetGlobalPropertiesViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <string key="NS.key.0">setGlobalPropertiesPressed:</string>
-                                               <string key="NS.object.0">id</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">setGlobalPropertiesPressed:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">setGlobalPropertiesPressed:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
-                                       <dictionary class="NSMutableDictionary" key="outlets">
-                                               <string key="helpText">UITextView</string>
-                                               <string key="timeoutText">UITextView</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <object class="IBToOneOutletInfo" key="helpText">
-                                                       <string key="name">helpText</string>
-                                                       <string key="candidateClassName">UITextView</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="timeoutText">
-                                                       <string key="name">timeoutText</string>
-                                                       <string key="candidateClassName">UITextView</string>
-                                               </object>
-                                       </dictionary>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/SetGlobalPropertiesViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetMediaClockTimerViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetMediaClockTimerViewController.h
index 127459a..3f2df01 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetMediaClockTimerViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetMediaClockTimerViewController.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SetMediaClockTimerViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
+#import "SmartDeviceLinkTester.h"
 
 @interface SetMediaClockTimerViewController : UIViewController <UITextFieldDelegate> {
     
@@ -17,6 +17,6 @@
     
 }
 
--(IBAction)setMediaClockTimerPressed:(id)sender;
+-(IBAction)sendRPC:(id)sender;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetMediaClockTimerViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetMediaClockTimerViewController.m
index e296c60..b29cc85 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetMediaClockTimerViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetMediaClockTimerViewController.m
@@ -1,8 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SetMediaClockTimerViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "SetMediaClockTimerViewController.h"
+#import "AppDelegate.h"
 
 @interface SetMediaClockTimerViewController ()
 
@@ -10,7 +11,7 @@
 
 @implementation SetMediaClockTimerViewController
 
--(IBAction)setMediaClockTimerPressed:(id)sender {
+-(IBAction)sendRPC:(id)sender {
    
     SDLUpdateMode *ua;
     if (updateControl.selectedSegmentIndex == 0) {
@@ -22,15 +23,23 @@
     else if (updateControl.selectedSegmentIndex == 2) {
         ua = [SDLUpdateMode PAUSE];
     }
-    else {
+    else if (updateControl.selectedSegmentIndex == 3) {
         ua = [SDLUpdateMode RESUME];
     }
+    else {
+        ua = [SDLUpdateMode CLEAR];
+    }
+    
+    SDLSetMediaClockTimer *req = [SDLRPCRequestFactory buildSetMediaClockTimerWithHours:[NSNumber numberWithInt:[[hoursText text] intValue]] minutes:[NSNumber numberWithInt:[[minutesText text] intValue]] seconds:[NSNumber numberWithInt:[[secondsText text] intValue]] updateMode:ua correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
     
-    [[SDLBrain getInstance] setMediaClockTimerPressedwithHours:[NSNumber numberWithInt:[[hoursText text] intValue]] minutes:[NSNumber numberWithInt:[[minutesText text] intValue]] seconds:[NSNumber numberWithInt:[[secondsText text] intValue]] updateMode:ua];
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
     
-    hoursText.text = @"";
-    minutesText.text = @"";
-    secondsText.text = @"";
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
 }
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetMediaClockTimerViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetMediaClockTimerViewController.xib
index aebc990..342133d 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetMediaClockTimerViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SetMediaClockTimerViewController.xib
@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
                <int key="IBDocument.SystemTarget">1552</int>
-               <string key="IBDocument.SystemVersion">12C3012</string>
+               <string key="IBDocument.SystemVersion">12F45</string>
                <string key="IBDocument.InterfaceBuilderVersion">3084</string>
-               <string key="IBDocument.AppKitVersion">1187.34</string>
-               <string key="IBDocument.HIToolboxVersion">625.00</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                        <string key="NS.object.0">2083</string>
@@ -43,6 +43,7 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{36, 25}, {46, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="665230223"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -63,7 +64,7 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">17</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="354430884">
+                                               <object class="NSFont" key="IBUIFont" id="505052331">
                                                        <string key="NSName">Helvetica</string>
                                                        <double key="NSSize">17</double>
                                                        <int key="NSfFlags">16</int>
@@ -74,13 +75,14 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{123, 20}, {163, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="294770002"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">1</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -92,13 +94,14 @@
                                                <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
                                                <float key="IBUIMinimumFontSize">17</float>
                                                <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIKeyboardType">2</int>
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <object class="IBUIFontDescription" key="IBUIFontDescription" id="57862652">
                                                        <int key="type">1</int>
                                                        <double key="pointSize">14</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="355686008">
+                                               <object class="NSFont" key="IBUIFont" id="293468635">
                                                        <string key="NSName">Helvetica</string>
                                                        <double key="NSSize">14</double>
                                                        <int key="NSfFlags">16</int>
@@ -109,6 +112,7 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{36, 64}, {61, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="49816127"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -122,20 +126,21 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="61242736"/>
-                                               <reference key="IBUIFont" ref="354430884"/>
+                                               <reference key="IBUIFont" ref="505052331"/>
                                        </object>
                                        <object class="IBUITextField" id="49816127">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{123, 60}, {163, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="768856069"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">23</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -145,16 +150,18 @@
                                                <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
                                                <float key="IBUIMinimumFontSize">17</float>
                                                <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIKeyboardType">2</int>
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="57862652"/>
-                                               <reference key="IBUIFont" ref="355686008"/>
+                                               <reference key="IBUIFont" ref="293468635"/>
                                        </object>
                                        <object class="IBUILabel" id="768856069">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{36, 103}, {68, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="1009240680"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -168,20 +175,21 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="61242736"/>
-                                               <reference key="IBUIFont" ref="354430884"/>
+                                               <reference key="IBUIFont" ref="505052331"/>
                                        </object>
                                        <object class="IBUITextField" id="1009240680">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{123, 98}, {163, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="565794364"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">45</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -191,45 +199,51 @@
                                                <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
                                                <float key="IBUIMinimumFontSize">17</float>
                                                <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIKeyboardType">2</int>
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="57862652"/>
-                                               <reference key="IBUIFont" ref="355686008"/>
+                                               <reference key="IBUIFont" ref="293468635"/>
                                        </object>
                                        <object class="IBUISegmentedControl" id="1033505794">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{34, 191}, {252, 44}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="833919084"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <int key="IBNumberOfSegments">4</int>
+                                               <int key="IBNumberOfSegments">5</int>
                                                <int key="IBSelectedSegmentIndex">0</int>
                                                <array key="IBSegmentTitles">
                                                        <string/>
                                                        <string/>
                                                        <string/>
                                                        <string/>
+                                                       <string>Clear</string>
                                                </array>
                                                <array class="NSMutableArray" key="IBSegmentWidths">
                                                        <real value="0.0"/>
                                                        <real value="0.0"/>
                                                        <real value="0.0"/>
                                                        <real value="0.0"/>
+                                                       <real value="0.0"/>
                                                </array>
                                                <array class="NSMutableArray" key="IBSegmentEnabledStates">
                                                        <boolean value="YES"/>
                                                        <boolean value="YES"/>
                                                        <boolean value="YES"/>
                                                        <boolean value="YES"/>
+                                                       <boolean value="YES"/>
                                                </array>
                                                <array class="NSMutableArray" key="IBSegmentContentOffsets">
                                                        <string>{0, 0}</string>
                                                        <string>{0, 0}</string>
                                                        <string>{0, 0}</string>
                                                        <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
                                                </array>
                                                <array class="NSMutableArray" key="IBSegmentImages">
                                                        <object class="NSCustomResource">
@@ -248,6 +262,7 @@
                                                                <string key="NSClassName">NSImage</string>
                                                                <string key="NSResourceName">play.png</string>
                                                        </object>
+                                                       <object class="NSNull"/>
                                                </array>
                                        </object>
                                        <object class="IBUILabel" id="565794364">
@@ -255,6 +270,7 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{36, 162}, {105, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="1033505794"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -268,13 +284,14 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="61242736"/>
-                                               <reference key="IBUIFont" ref="354430884"/>
+                                               <reference key="IBUIFont" ref="505052331"/>
                                        </object>
                                        <object class="IBUIButton" id="833919084">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{112, 272}, {97, 37}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -288,7 +305,7 @@
                                                </object>
                                                <object class="NSColor" key="IBUINormalTitleColor">
                                                        <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
                                                </object>
                                                <object class="NSColor" key="IBUINormalTitleShadowColor">
                                                        <int key="NSColorSpace">3</int>
@@ -307,6 +324,7 @@
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
                                <reference key="NSSuperview"/>
+                               <reference key="NSWindow"/>
                                <reference key="NSNextKeyView" ref="556530509"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
@@ -321,6 +339,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -328,7 +347,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -336,7 +355,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="665230223"/>
                                        </object>
-                                       <int key="connectionID">13</int>
+                                       <string key="id">13</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -344,7 +363,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="49816127"/>
                                        </object>
-                                       <int key="connectionID">14</int>
+                                       <string key="id">14</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -352,7 +371,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="1009240680"/>
                                        </object>
-                                       <int key="connectionID">15</int>
+                                       <string key="id">15</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -360,28 +379,28 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="1033505794"/>
                                        </object>
-                                       <int key="connectionID">16</int>
+                                       <string key="id">16</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">setMediaClockTimerPressed:</string>
+                                               <string key="label">sendRPC:</string>
                                                <reference key="source" ref="833919084"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">17</int>
+                                       <string key="id">18</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="556530509"/>
@@ -397,58 +416,58 @@
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
+                                               <string key="id">4</string>
                                                <reference key="object" ref="556530509"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
+                                               <string key="id">5</string>
                                                <reference key="object" ref="665230223"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
+                                               <string key="id">6</string>
                                                <reference key="object" ref="294770002"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">7</int>
+                                               <string key="id">7</string>
                                                <reference key="object" ref="49816127"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">8</int>
+                                               <string key="id">8</string>
                                                <reference key="object" ref="768856069"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">9</int>
+                                               <string key="id">9</string>
                                                <reference key="object" ref="1009240680"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">10</int>
+                                               <string key="id">10</string>
                                                <reference key="object" ref="1033505794"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">11</int>
+                                               <string key="id">11</string>
                                                <reference key="object" ref="565794364"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">12</int>
+                                               <string key="id">12</string>
                                                <reference key="object" ref="833919084"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
@@ -461,7 +480,7 @@
                                <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <integer value="2" key="10.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/>
+                               <integer value="4" key="10.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/>
                                <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -475,15 +494,64 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">17</int>
                </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <object class="IBClassDescriber" key="IBDocument.Classes">
+                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">SetMediaClockTimerViewController</string>
+                                       <string key="superclassName">UIViewController</string>
+                                       <object class="NSMutableDictionary" key="actions">
+                                               <string key="NS.key.0">sendRPC:</string>
+                                               <string key="NS.object.0">id</string>
+                                       </object>
+                                       <object class="NSMutableDictionary" key="actionInfosByName">
+                                               <string key="NS.key.0">sendRPC:</string>
+                                               <object class="IBActionInfo" key="NS.object.0">
+                                                       <string key="name">sendRPC:</string>
+                                                       <string key="candidateClassName">id</string>
+                                               </object>
+                                       </object>
+                                       <dictionary class="NSMutableDictionary" key="outlets">
+                                               <string key="hoursText">UITextField</string>
+                                               <string key="minutesText">UITextField</string>
+                                               <string key="secondsText">UITextField</string>
+                                               <string key="updateControl">UISegmentedControl</string>
+                                       </dictionary>
+                                       <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+                                               <object class="IBToOneOutletInfo" key="hoursText">
+                                                       <string key="name">hoursText</string>
+                                                       <string key="candidateClassName">UITextField</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="minutesText">
+                                                       <string key="name">minutesText</string>
+                                                       <string key="candidateClassName">UITextField</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="secondsText">
+                                                       <string key="name">secondsText</string>
+                                                       <string key="candidateClassName">UITextField</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="updateControl">
+                                                       <string key="name">updateControl</string>
+                                                       <string key="candidateClassName">UISegmentedControl</string>
+                                               </object>
+                                       </dictionary>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBProjectSource</string>
+                                               <string key="minorKey">./Classes/SetMediaClockTimerViewController.h</string>
+                                       </object>
+                               </object>
+                       </array>
+               </object>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
                        <real value="1552" key="NS.object.0"/>
                </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
                <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/Settings.bundle/Root.plist b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/Settings.bundle/Root.plist
index 74da6a7..fb54d2b 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/Settings.bundle/Root.plist
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/Settings.bundle/Root.plist
@@ -62,7 +62,7 @@
                        <key>AutocorrectionType</key>
                        <string>No</string>
                        <key>DefaultValue</key>
-                       <string>50007</string>
+                       <string>12345</string>
                        <key>IsSecure</key>
                        <false/>
                        <key>Key</key>
@@ -81,6 +81,100 @@
                        <string>PSGroupSpecifier</string>
                </dict>
                <dict>
+                       <key>AutocapitalizationType</key>
+                       <string>None</string>
+                       <key>AutocorrectionType</key>
+                       <string>No</string>
+                       <key>DefaultValue</key>
+                       <string>SmartDeviceLinkTester</string>
+                       <key>IsSecure</key>
+                       <false/>
+                       <key>Key</key>
+                       <string>appname</string>
+                       <key>KeyboardType</key>
+                       <string>Alphabet</string>
+                       <key>Title</key>
+                       <string>App Name:</string>
+                       <key>Type</key>
+                       <string>PSTextFieldSpecifier</string>
+               </dict>
+               <dict>
+                       <key>AutocapitalizationType</key>
+                       <string>None</string>
+                       <key>AutocorrectionType</key>
+                       <string>No</string>
+                       <key>DefaultValue</key>
+                       <string>123456789</string>
+                       <key>IsSecure</key>
+                       <false/>
+                       <key>Key</key>
+                       <string>appid</string>
+                       <key>KeyboardType</key>
+                       <string>NumberPad</string>
+                       <key>Title</key>
+                       <string>App Id:</string>
+                       <key>Type</key>
+                       <string>PSTextFieldSpecifier</string>
+               </dict>
+               <dict>
+                       <key>AutocapitalizationType</key>
+                       <string>None</string>
+                       <key>AutocorrectionType</key>
+                       <string>No</string>
+                       <key>DefaultValue</key>
+                       <string>SmartDeviceLinkTester</string>
+                       <key>IsSecure</key>
+                       <false/>
+                       <key>Key</key>
+                       <string>ttsname</string>
+                       <key>KeyboardType</key>
+                       <string>Alphabet</string>
+                       <key>Title</key>
+                       <string>TTS Name:</string>
+                       <key>Type</key>
+                       <string>PSTextFieldSpecifier</string>
+               </dict>
+               <dict>
+                       <key>Type</key>
+                       <string>PSMultiValueSpecifier</string>
+                       <key>Title</key>
+                       <string>TTS Type:</string>
+                       <key>Key</key>
+                       <string>ttstype</string>
+                       <key>DefaultValue</key>
+                       <string>Text</string>
+                       <key>Values</key>
+                       <array>
+                               <string>text</string>
+                               <string>sapi</string>
+                               <string>lhp</string>
+                       </array>
+                       <key>Titles</key>
+                       <array>
+                               <string>Text</string>
+                               <string>SAPI Phonemes</string>
+                               <string>LH+ Phonemes</string>
+                       </array>
+               </dict>
+               <dict>
+                       <key>AutocapitalizationType</key>
+                       <string>None</string>
+                       <key>AutocorrectionType</key>
+                       <string>No</string>
+                       <key>DefaultValue</key>
+                       <string>SmartDeviceLinkTester, SDLT</string>
+                       <key>IsSecure</key>
+                       <false/>
+                       <key>Key</key>
+                       <string>vrsynonyms</string>
+                       <key>KeyboardType</key>
+                       <string>Alphabet</string>
+                       <key>Title</key>
+                       <string>VR Syns:</string>
+                       <key>Type</key>
+                       <string>PSTextFieldSpecifier</string>
+               </dict>
+               <dict>
                        <key>Type</key>
                        <string>PSMultiValueSpecifier</string>
                        <key>Title</key>
@@ -88,17 +182,161 @@
                        <key>Key</key>
                        <string>type</string>
                        <key>DefaultValue</key>
-                       <string>media</string>
+                       <string>Media</string>
+                       <key>Values</key>
+                       <array>
+                               <string>media</string>
+                               <string>nonmedia</string>
+                       </array>
                        <key>Titles</key>
                        <array>
                                <string>Media</string>
                                <string>Non-Media</string>
                        </array>
+               </dict>
+               <dict>
+                       <key>Type</key>
+                       <string>PSMultiValueSpecifier</string>
+                       <key>Title</key>
+                       <string>Language:</string>
+                       <key>Key</key>
+                       <string>language</string>
+                       <key>DefaultValue</key>
+                       <string>EN-US</string>
                        <key>Values</key>
                        <array>
-                               <string>media</string>
-                               <string>nonmedia</string>
+                               <string>EN-US</string>
+                               <string>ES-MX</string>
+                               <string>FR-CA</string>
+                               <string>DE-DE</string>
+                               <string>ES-ES</string>
+                               <string>EN-GB</string>
+                               <string>RU-RU</string>
+                               <string>TR-TR</string>
+                               <string>PL-PL</string>
+                               <string>FR-FR</string>
+                               <string>IT-IT</string>
+                               <string>SV-SE</string>
+                               <string>PT-PT</string>
+                               <string>NL-NL</string>
+                               <string>EN-AU</string>
+                               <string>ZH-CN</string>
+                               <string>ZH-TW</string>
+                               <string>JA-JP</string>
+                               <string>AR-SA</string>
+                               <string>KO-KR</string>
+                               <string>PT-BR</string>
+                               <string>CS-CZ</string>
+                               <string>DA-DK</string>
+                               <string>NO-NO</string>
+                       </array>
+                       <key>Titles</key>
+                       <array>
+                               <string>EN-US</string>
+                               <string>ES-MX</string>
+                               <string>FR-CA</string>
+                               <string>DE-DE</string>
+                               <string>ES-ES</string>
+                               <string>EN-GB</string>
+                               <string>RU-RU</string>
+                               <string>TR-TR</string>
+                               <string>PL-PL</string>
+                               <string>FR-FR</string>
+                               <string>IT-IT</string>
+                               <string>SV-SE</string>
+                               <string>PT-PT</string>
+                               <string>NL-NL</string>
+                               <string>EN-AU</string>
+                               <string>ZH-CN</string>
+                               <string>ZH-TW</string>
+                               <string>JA-JP</string>
+                               <string>AR-SA</string>
+                               <string>KO-KR</string>
+                               <string>PT-BR</string>
+                               <string>CS-CZ</string>
+                               <string>DA-DK</string>
+                               <string>NO-NO</string>
+                       </array>
+               </dict>
+               <dict>
+                       <key>Type</key>
+                       <string>PSMultiValueSpecifier</string>
+                       <key>Title</key>
+                       <string>HMI Language:</string>
+                       <key>Key</key>
+                       <string>hmilanguage</string>
+                       <key>DefaultValue</key>
+                       <string>EN-US</string>
+                       <key>Values</key>
+                       <array>
+                               <string>EN-US</string>
+                               <string>ES-MX</string>
+                               <string>FR-CA</string>
+                               <string>DE-DE</string>
+                               <string>ES-ES</string>
+                               <string>EN-GB</string>
+                               <string>RU-RU</string>
+                               <string>TR-TR</string>
+                               <string>PL-PL</string>
+                               <string>FR-FR</string>
+                               <string>IT-IT</string>
+                               <string>SV-SE</string>
+                               <string>PT-PT</string>
+                               <string>NL-NL</string>
+                               <string>EN-AU</string>
+                               <string>ZH-CN</string>
+                               <string>ZH-TW</string>
+                               <string>JA-JP</string>
+                               <string>AR-SA</string>
+                               <string>KO-KR</string>
+                               <string>PT-BR</string>
+                               <string>CS-CZ</string>
+                               <string>DA-DK</string>
+                               <string>NO-NO</string>
                        </array>
+                       <key>Titles</key>
+                       <array>
+                               <string>EN-US</string>
+                               <string>ES-MX</string>
+                               <string>FR-CA</string>
+                               <string>DE-DE</string>
+                               <string>ES-ES</string>
+                               <string>EN-GB</string>
+                               <string>RU-RU</string>
+                               <string>TR-TR</string>
+                               <string>PL-PL</string>
+                               <string>FR-FR</string>
+                               <string>IT-IT</string>
+                               <string>SV-SE</string>
+                               <string>PT-PT</string>
+                               <string>NL-NL</string>
+                               <string>EN-AU</string>
+                               <string>ZH-CN</string>
+                               <string>ZH-TW</string>
+                               <string>JA-JP</string>
+                               <string>AR-SA</string>
+                               <string>KO-KR</string>
+                               <string>PT-BR</string>
+                               <string>CS-CZ</string>
+                               <string>DA-DK</string>
+                               <string>NO-NO</string>
+                       </array>
+               </dict>
+               <dict>
+                       <key>Title</key>
+                       <string>Version</string>
+                       <key>FooterText</key>
+                       <string>SmartDeviceLinkTester 2.0</string>
+                       <key>Type</key>
+                       <string>PSGroupSpecifier</string>
+               </dict>
+               <dict>
+                       <key>Title</key>
+                       <string>Build Info</string>
+                       <key>FooterText</key>
+                       <string>SmartDeviceLinkTester 2.0</string>
+                       <key>Type</key>
+                       <string>PSGroupSpecifier</string>
                </dict>
        </array>
        <key>StringsTable</key>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowConstantTBTViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowConstantTBTViewController.h
new file mode 100644 (file)
index 0000000..e813711
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowConstantTBTViewController.h
@@ -0,0 +1,26 @@
+//  ShowConstantTBTViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+#import "SoftButtonListViewController.h"
+
+@interface ShowConstantTBTViewController : UIViewController <UITextFieldDelegate> {
+ 
+    IBOutlet UITextField *line1text;
+    IBOutlet UITextField *line2text;
+    IBOutlet UITextField *etatext;
+    IBOutlet UITextField *disttext;
+    IBOutlet UITextField *disttotext;
+    IBOutlet UITextField *scaletext;
+    IBOutlet UISwitch *completeSwitch;
+    
+    SoftButtonListViewController *softButtonListViewController;
+    
+}
+
+-(IBAction)sendRPC:(id)sender;
+-(IBAction)softButtons:(id)sender;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowConstantTBTViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowConstantTBTViewController.m
new file mode 100644 (file)
index 0000000..ec8ec82
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowConstantTBTViewController.m
@@ -0,0 +1,93 @@
+//  ShowConstantTBTViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "ShowConstantTBTViewController.h"
+#import "AppDelegate.h"
+
+@interface ShowConstantTBTViewController ()
+
+@end
+
+@implementation ShowConstantTBTViewController
+
+NSMutableArray *sbList;
+
+-(IBAction)sendRPC:(id)sender
+{    
+    SDLShowConstantTBT *req = [SDLRPCRequestFactory buildShowConstantTBTWithNavigationText1:[line1text text] navigationText2:[line2text text] eta:[etatext text] totalDistance:[disttext text] turnIcon:nil distanceToManeuver:[NSNumber numberWithFloat:[[disttotext text] floatValue]] distanceToManeuverScale:[NSNumber numberWithFloat:[[scaletext text] floatValue]] maneuverComplete:[NSNumber numberWithBool:[completeSwitch isOn]] softButtons:sbList correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return NO;
+}
+
+-(IBAction)softButtons:(id)sender {
+    [softButtonListViewController updateList:sbList];
+    [self.navigationController pushViewController:softButtonListViewController animated:YES];
+}
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"ShowConstantTBT";
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+        softButtonListViewController = [[SoftButtonListViewController alloc] initWithNibName:@"SoftButtonListViewController" bundle:nil];
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    line1text.delegate = self;
+    line2text.delegate = self;
+    etatext.delegate = self;
+    disttext.delegate = self;
+    disttotext.delegate = self;
+    scaletext.delegate = self;
+    
+    //Example Soft Buttons
+    SDLSoftButton *sb1 = [[[SDLSoftButton alloc] init] autorelease];
+    sb1.softButtonID = [NSNumber numberWithInt:5507];
+    sb1.text = @"Reply";
+    sb1.type = [SDLSoftButtonType TEXT];
+    sb1.isHighlighted = [NSNumber numberWithBool:false];
+    sb1.systemAction = [SDLSystemAction STEAL_FOCUS];
+    
+    SDLSoftButton *sb2 = [[[SDLSoftButton alloc] init] autorelease];
+    sb2.softButtonID = [NSNumber numberWithInt:5508];
+    sb2.text = @"Close";
+    sb2.type = [SDLSoftButtonType TEXT];
+    sb2.isHighlighted = [NSNumber numberWithBool:false];
+    sb2.systemAction = [SDLSystemAction DEFAULT_ACTION];
+    
+    sbList = [[NSMutableArray alloc] initWithObjects:sb1,sb2,nil];
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowConstantTBTViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowConstantTBTViewController.xib
new file mode 100644 (file)
index 0000000..304c8a2
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowConstantTBTViewController.xib
@@ -0,0 +1,686 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1552</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">3084</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       <string key="NS.object.0">2083</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUIButton</string>
+                       <string>IBUILabel</string>
+                       <string>IBUISwitch</string>
+                       <string>IBUITextField</string>
+                       <string>IBUIView</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <object class="IBProxyObject" id="372490531">
+                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBProxyObject" id="975951072">
+                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBUIView" id="191373211">
+                               <reference key="NSNextResponder"/>
+                               <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUILabel" id="132657633">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 15}, {52, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="779417607"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Text 1:</string>
+                                               <object class="NSColor" key="IBUITextColor" id="83775735">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
+                                               </object>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="878946683">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">17</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="870019830">
+                                                       <string key="NSName">Helvetica</string>
+                                                       <double key="NSSize">17</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUITextField" id="779417607">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{80, 10}, {220, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="866960930"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">Navigation Text 1</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <object class="NSColorSpace" key="NSCustomColorSpace" id="409597863">
+                                                               <int key="NSID">2</int>
+                                                       </object>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="946691039">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">14</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="185857434">
+                                                       <string key="NSName">Helvetica</string>
+                                                       <double key="NSSize">14</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUILabel" id="866960930">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 54}, {52, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="74819292"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Text 2:</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="870019830"/>
+                                       </object>
+                                       <object class="IBUITextField" id="74819292">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{80, 49}, {220, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="243375765"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">Navigation Text 2</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="185857434"/>
+                                       </object>
+                                       <object class="IBUITextField" id="905157747">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{134, 87}, {166, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="368983458"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">12:34</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="185857434"/>
+                                       </object>
+                                       <object class="IBUILabel" id="243375765">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 92}, {95, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="905157747"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">ETA:</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="870019830"/>
+                                       </object>
+                                       <object class="IBUITextField" id="500774048">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{134, 126}, {166, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="126855498"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">100 Miles</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="185857434"/>
+                                       </object>
+                                       <object class="IBUILabel" id="368983458">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 131}, {114, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="500774048"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Total Distance:</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="870019830"/>
+                                       </object>
+                                       <object class="IBUITextField" id="725526490">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{230, 165}, {70, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">50.3</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="185857434"/>
+                                       </object>
+                                       <object class="IBUILabel" id="126855498">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 170}, {172, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="725526490"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Distance To Maneuver</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="870019830"/>
+                                       </object>
+                                       <object class="IBUIButton" id="496830156">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{112, 316}, {97, 37}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUIHighlightedTitleColor" id="558694624">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MQA</bytes>
+                                               </object>
+                                               <object class="NSColor" key="IBUINormalTitleColor" id="781371151">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
+                                               <object class="NSColor" key="IBUINormalTitleShadowColor" id="633481866">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MC41AA</bytes>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="748156101">
+                                                       <int key="type">2</int>
+                                                       <double key="pointSize">15</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="949604638">
+                                                       <string key="NSName">Helvetica-Bold</string>
+                                                       <double key="NSSize">15</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUIButton" id="162665082">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{110, 272}, {99, 38}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <string key="IBUINormalTitle">Soft Buttons</string>
+                                               <reference key="IBUIHighlightedTitleColor" ref="558694624"/>
+                                               <reference key="IBUINormalTitleColor" ref="781371151"/>
+                                               <reference key="IBUINormalTitleShadowColor" ref="633481866"/>
+                                               <reference key="IBUIFontDescription" ref="748156101"/>
+                                               <reference key="IBUIFont" ref="949604638"/>
+                                       </object>
+                                       <object class="IBUITextField" id="53982271">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{230, 199}, {70, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">5.5</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="185857434"/>
+                                       </object>
+                                       <object class="IBUILabel" id="755611544">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 204}, {123, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="53982271"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Maneuver Scale</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="870019830"/>
+                                       </object>
+                                       <object class="IBUISwitch" id="710756240">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{25, 234}, {94, 27}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                       </object>
+                                       <object class="IBUILabel" id="478075530">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{126, 237}, {154, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Maneuver Complete</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="870019830"/>
+                                       </object>
+                               </array>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
+                               <reference key="NSSuperview"/>
+                               <reference key="NSNextKeyView" ref="132657633"/>
+                               <object class="NSColor" key="IBUIBackgroundColor">
+                                       <int key="NSColorSpace">1</int>
+                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                               </object>
+                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
+                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="191373211"/>
+                                       </object>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">line1text</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="779417607"/>
+                                       </object>
+                                       <string key="id">18</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">line2text</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="74819292"/>
+                                       </object>
+                                       <string key="id">19</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">completeSwitch</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="710756240"/>
+                                       </object>
+                                       <string key="id">33</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">disttext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="500774048"/>
+                                       </object>
+                                       <string key="id">34</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">disttotext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="725526490"/>
+                                       </object>
+                                       <string key="id">35</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">etatext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="905157747"/>
+                                       </object>
+                                       <string key="id">36</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">scaletext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="53982271"/>
+                                       </object>
+                                       <string key="id">37</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="496830156"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">31</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">softButtons:</string>
+                                               <reference key="source" ref="162665082"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">38</string>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <string key="id">0</string>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="191373211"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="132657633"/>
+                                                       <reference ref="779417607"/>
+                                                       <reference ref="866960930"/>
+                                                       <reference ref="74819292"/>
+                                                       <reference ref="725526490"/>
+                                                       <reference ref="126855498"/>
+                                                       <reference ref="905157747"/>
+                                                       <reference ref="243375765"/>
+                                                       <reference ref="500774048"/>
+                                                       <reference ref="368983458"/>
+                                                       <reference ref="496830156"/>
+                                                       <reference ref="162665082"/>
+                                                       <reference ref="53982271"/>
+                                                       <reference ref="755611544"/>
+                                                       <reference ref="710756240"/>
+                                                       <reference ref="478075530"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="372490531"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="975951072"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">4</string>
+                                               <reference key="object" ref="132657633"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">5</string>
+                                               <reference key="object" ref="779417607"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">6</string>
+                                               <reference key="object" ref="866960930"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">7</string>
+                                               <reference key="object" ref="74819292"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">8</string>
+                                               <reference key="object" ref="905157747"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">9</string>
+                                               <reference key="object" ref="243375765"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">11</string>
+                                               <reference key="object" ref="500774048"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">12</string>
+                                               <reference key="object" ref="368983458"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">13</string>
+                                               <reference key="object" ref="725526490"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">14</string>
+                                               <reference key="object" ref="126855498"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">17</string>
+                                               <reference key="object" ref="496830156"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">26</string>
+                                               <reference key="object" ref="162665082"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">27</string>
+                                               <reference key="object" ref="53982271"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">28</string>
+                                               <reference key="object" ref="755611544"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">29</string>
+                                               <reference key="object" ref="710756240"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">30</string>
+                                               <reference key="object" ref="478075530"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.CustomClassName">ShowConstantTBTViewController</string>
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="-2.CustomClassName">UIResponder</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="29.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="30.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1552" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <string key="IBCocoaTouchPluginVersion">2083</string>
+       </data>
+</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowViewController.h
index a4b898f..014d3a1 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowViewController.h
@@ -1,22 +1,33 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  ShowViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
-#import "SDLTextAlignment.h"
+#import <SmartDeviceLink/SmartDeviceLink.h>
 
-@interface ShowViewController : UIViewController <UITextFieldDelegate> {
+#import "SmartDeviceLinkTester.h"
+#import "SoftButtonListViewController.h"
+
+@interface ShowViewController : UIViewController <UITextFieldDelegate, UITextViewDelegate> {
  
     IBOutlet UITextField *line1text;
     IBOutlet UITextField *line2text;
+    IBOutlet UITextField *line3text;
+    IBOutlet UITextField *line4text;
     IBOutlet UITextField *statusbartext;
     IBOutlet UITextField *mediaclocktext;
     IBOutlet UITextField *mediatracktext;
+    IBOutlet UITextView *custompresetsview;
+    IBOutlet UISwitch *sbSwitch;
     
     IBOutlet UISegmentedControl *textalignment;
+    
+    SoftButtonListViewController *softButtonListViewController;
+    
+    NSMutableArray *sbList;
 }
 
--(IBAction)sendShowRPC:(id)sender;
+-(IBAction)sendRPC:(id)sender;
+-(IBAction)softButtons:(id)sender;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowViewController.m
index 848f479..4c8d2bd 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowViewController.m
@@ -1,17 +1,13 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  ShowViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "ShowViewController.h"
-
-@interface ShowViewController ()
-
-@end
+#import "AppDelegate.h"
 
 @implementation ShowViewController
 
-
--(IBAction)sendShowRPC:(id)sender {
+-(IBAction)sendRPC:(id)sender {
     
     SDLTextAlignment *ta;
     if (textalignment.selectedSegmentIndex == 0) {
@@ -24,8 +20,37 @@
         ta = [SDLTextAlignment RIGHT_ALIGNED];
     }
     
+    NSString *customstring = [custompresetsview text];
+    NSArray *customarray = nil;
+    
+    if (![customstring isEqualToString:@""]) {
+        customarray = [customstring componentsSeparatedByString:@", "];
+    }
+
+    
+    if (sbSwitch.isOn) {
+        SDLShow *req = [SDLRPCRequestFactory buildShowWithMainField1:[line1text text] mainField2:[line2text text] mainField3:[line3text text] mainField4:[line4text text] statusBar:[statusbartext text] mediaClock:[mediaclocktext text] mediaTrack:[mediatracktext text] alignment:ta graphic:nil softButtons:sbList customPresets:customarray correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+        
+        [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    }
+    else {
+        SDLShow *req = [SDLRPCRequestFactory buildShowWithMainField1:[line1text text] mainField2:[line2text text] mainField3:[line3text text] mainField4:[line4text text] statusBar:[statusbartext text] mediaClock:[mediaclocktext text] mediaTrack:[mediatracktext text] alignment:ta graphic:nil softButtons:nil customPresets:customarray correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+        
+        [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    }
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
     
-    [[SDLBrain getInstance] showAdvancedPressedWithLine1Text:[line1text text] line2:[line2text text] statusBar:[statusbartext text] mediaClock:[mediaclocktext text] mediaTrack:[mediatracktext text] alignment:ta];
+}
+
+-(IBAction)softButtons:(id)sender {
+    [softButtonListViewController updateList:sbList];
+    [self.navigationController pushViewController:softButtonListViewController animated:YES];
 }
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {
@@ -33,6 +58,15 @@
     return NO;
 }
 
+- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
+    
+    if([text isEqualToString:@"\n"]) {
+        [textView resignFirstResponder];
+        return NO;
+    }
+    
+    return YES;
+}
 
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
@@ -42,6 +76,7 @@
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
     if (self) {
         // Custom initialization
+        softButtonListViewController = [[SoftButtonListViewController alloc] initWithNibName:@"SoftButtonListViewController" bundle:nil];
     }
     return self;
 }
@@ -49,12 +84,46 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    
+    custompresetsview.delegate = self;
     line1text.delegate = self;
     line2text.delegate = self;
+    line3text.delegate = self;
+    line4text.delegate = self;
     statusbartext.delegate = self;
     mediaclocktext.delegate = self;
     mediatracktext.delegate = self;
+    
+    [[custompresetsview layer] setCornerRadius:10];
+    
+    //Example Soft Buttons
+    SDLSoftButton *sb1 = [[[SDLSoftButton alloc] init] autorelease];
+    sb1.softButtonID = [NSNumber numberWithInt:5502];
+    sb1.text = @"One";
+    sb1.image = [[[SDLImage alloc] init] autorelease];
+    sb1.image.imageType = [SDLImageType STATIC];
+    sb1.image.value = @"D";
+    sb1.type = [SDLSoftButtonType BOTH];
+    sb1.isHighlighted = [NSNumber numberWithBool:false];
+    sb1.systemAction = [SDLSystemAction KEEP_CONTEXT];
+    
+    SDLSoftButton *sb2 = [[[SDLSoftButton alloc] init] autorelease];
+    sb2.softButtonID = [NSNumber numberWithInt:5503];
+    sb2.text = @"Two";
+    sb2.image = [[[SDLImage alloc] init] autorelease];
+    sb2.image.imageType = [SDLImageType STATIC];
+    sb2.image.value = @"9";
+    sb2.type = [SDLSoftButtonType IMAGE];
+    sb2.isHighlighted = [NSNumber numberWithBool:false];
+    sb2.systemAction = [SDLSystemAction STEAL_FOCUS];
+    
+    SDLSoftButton *sb3 = [[[SDLSoftButton alloc] init] autorelease];
+    sb3.softButtonID = [NSNumber numberWithInt:5504];
+    sb3.text = @"Three";
+    sb3.type = [SDLSoftButtonType TEXT];
+    sb3.isHighlighted = [NSNumber numberWithBool:true];
+    sb3.systemAction = [SDLSystemAction DEFAULT_ACTION];
+    
+    sbList = [[NSMutableArray alloc] initWithObjects:sb1,sb2,sb3,nil];
 }
 
 - (void)viewDidUnload

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowViewController.xib
index bdb4907..020975b 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/ShowViewController.xib
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
-                       <string>IBUITextField</string>
+                       <string>IBProxyObject</string>
                        <string>IBUIButton</string>
+                       <string>IBUILabel</string>
                        <string>IBUISegmentedControl</string>
+                       <string>IBUISwitch</string>
+                       <string>IBUITextField</string>
+                       <string>IBUITextView</string>
                        <string>IBUIView</string>
-                       <string>IBUILabel</string>
-                       <string>IBProxyObject</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -35,53 +37,20 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
-                                       <object class="IBUILabel" id="132657633">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 25}, {52, 21}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="779417607"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <bool key="IBUIOpaque">NO</bool>
-                                               <bool key="IBUIClipsSubviews">YES</bool>
-                                               <int key="IBUIContentMode">7</int>
-                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
-                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Line 1:</string>
-                                               <object class="NSColor" key="IBUITextColor" id="83775735">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
-                                               </object>
-                                               <nil key="IBUIHighlightedColor"/>
-                                               <int key="IBUIBaselineAdjustment">0</int>
-                                               <float key="IBUIMinimumFontSize">10</float>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="878946683">
-                                                       <int key="type">1</int>
-                                                       <double key="pointSize">17</double>
-                                               </object>
-                                               <object class="NSFont" key="IBUIFont" id="982687702">
-                                                       <string key="NSName">Helvetica</string>
-                                                       <double key="NSSize">17</double>
-                                                       <int key="NSfFlags">16</int>
-                                               </object>
-                                       </object>
                                        <object class="IBUITextField" id="779417607">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{80, 20}, {220, 31}}</string>
+                                               <string key="NSFrame">{{20, 6}, {140, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="866960930"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">Show Line 1</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -99,46 +68,49 @@
                                                        <int key="type">1</int>
                                                        <double key="pointSize">14</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="498540529">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="413328503">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">14</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
-                                       <object class="IBUILabel" id="866960930">
+                                       <object class="IBUITextField" id="781061883">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 64}, {52, 21}}</string>
+                                               <string key="NSFrame">{{160, 6}, {140, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="74819292"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
-                                               <int key="IBUIContentMode">7</int>
-                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Line 2:</string>
-                                               <reference key="IBUITextColor" ref="83775735"/>
-                                               <nil key="IBUIHighlightedColor"/>
-                                               <int key="IBUIBaselineAdjustment">0</int>
-                                               <float key="IBUIMinimumFontSize">10</float>
-                                               <reference key="IBUIFontDescription" ref="878946683"/>
-                                               <reference key="IBUIFont" ref="982687702"/>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">Show Line 3</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="413328503"/>
                                        </object>
                                        <object class="IBUITextField" id="74819292">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{80, 59}, {220, 31}}</string>
+                                               <string key="NSFrame">{{20, 38}, {140, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="243375765"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">Show Line 2</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -151,21 +123,20 @@
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="946691039"/>
-                                               <reference key="IBUIFont" ref="498540529"/>
+                                               <reference key="IBUIFont" ref="413328503"/>
                                        </object>
                                        <object class="IBUITextField" id="905157747">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{134, 101}, {166, 31}}</string>
+                                               <string key="NSFrame">{{134, 72}, {166, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="368983458"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">status bar</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -178,14 +149,13 @@
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="946691039"/>
-                                               <reference key="IBUIFont" ref="498540529"/>
+                                               <reference key="IBUIFont" ref="413328503"/>
                                        </object>
                                        <object class="IBUILabel" id="243375765">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 106}, {95, 21}}</string>
+                                               <string key="NSFrame">{{20, 77}, {95, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="905157747"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -194,26 +164,36 @@
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <string key="IBUIText">Status Bar:</string>
-                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <object class="NSColor" key="IBUITextColor" id="83775735">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
+                                               </object>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
-                                               <reference key="IBUIFontDescription" ref="878946683"/>
-                                               <reference key="IBUIFont" ref="982687702"/>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="878946683">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">17</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="953647609">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">17</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
                                        </object>
                                        <object class="IBUITextField" id="500774048">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{134, 140}, {166, 31}}</string>
+                                               <string key="NSFrame">{{134, 106}, {166, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="126855498"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">12:34</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -226,14 +206,13 @@
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="946691039"/>
-                                               <reference key="IBUIFont" ref="498540529"/>
+                                               <reference key="IBUIFont" ref="413328503"/>
                                        </object>
                                        <object class="IBUILabel" id="368983458">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 145}, {101, 21}}</string>
+                                               <string key="NSFrame">{{20, 111}, {101, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="500774048"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -247,21 +226,20 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="878946683"/>
-                                               <reference key="IBUIFont" ref="982687702"/>
+                                               <reference key="IBUIFont" ref="953647609"/>
                                        </object>
                                        <object class="IBUITextField" id="725526490">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{134, 179}, {166, 31}}</string>
+                                               <string key="NSFrame">{{134, 140}, {166, 31}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="625519869"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">MTrack</string>
                                                <int key="IBUIBorderStyle">3</int>
                                                <object class="NSColor" key="IBUITextColor">
                                                        <int key="NSColorSpace">3</int>
@@ -274,14 +252,13 @@
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
                                                <reference key="IBUIFontDescription" ref="946691039"/>
-                                               <reference key="IBUIFont" ref="498540529"/>
+                                               <reference key="IBUIFont" ref="413328503"/>
                                        </object>
                                        <object class="IBUILabel" id="126855498">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 184}, {99, 21}}</string>
+                                               <string key="NSFrame">{{20, 145}, {99, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="725526490"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -295,15 +272,14 @@
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="878946683"/>
-                                               <reference key="IBUIFont" ref="982687702"/>
+                                               <reference key="IBUIFont" ref="953647609"/>
                                        </object>
                                        <object class="IBUISegmentedControl" id="158614726">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{57, 247}, {207, 30}}</string>
+                                               <string key="NSFrame">{{112, 174}, {188, 30}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="496830156"/>
+                                               <reference key="NSNextKeyView" ref="823861"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -339,9 +315,8 @@
                                        <object class="IBUILabel" id="625519869">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 218}, {135, 21}}</string>
+                                               <string key="NSFrame">{{20, 178}, {89, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="158614726"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
@@ -349,54 +324,156 @@
                                                <int key="IBUIContentMode">7</int>
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Text Alignment: </string>
+                                               <string key="IBUIText">Text Align: </string>
                                                <reference key="IBUITextColor" ref="83775735"/>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
                                                <reference key="IBUIFontDescription" ref="878946683"/>
-                                               <reference key="IBUIFont" ref="982687702"/>
+                                               <reference key="IBUIFont" ref="953647609"/>
                                        </object>
                                        <object class="IBUIButton" id="496830156">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{112, 310}, {97, 37}}</string>
+                                               <string key="NSFrame">{{112, 323}, {97, 37}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentHorizontalAlignment">0</int>
                                                <int key="IBUIContentVerticalAlignment">0</int>
                                                <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Send RPC</string>
-                                               <object class="NSColor" key="IBUIHighlightedTitleColor">
+                                               <object class="NSColor" key="IBUINormalTitleColor" id="920641822">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
+                                               <object class="NSColor" key="IBUIHighlightedTitleColor" id="86196840">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MQA</bytes>
                                                </object>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
-                                               <object class="NSColor" key="IBUINormalTitleShadowColor">
+                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleShadowColor" id="1048892385">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MC41AA</bytes>
                                                </object>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="1053146740">
                                                        <int key="type">2</int>
                                                        <double key="pointSize">15</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica-Bold</string>
+                                               <object class="NSFont" key="IBUIFont" id="634086659">
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
                                                        <double key="NSSize">15</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
+                                       <object class="IBUISwitch" id="712270042">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{160, 287}, {94, 27}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="496830156"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <bool key="IBUIOn">YES</bool>
+                                       </object>
+                                       <object class="IBUIButton" id="437749023">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{68, 284}, {99, 36}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="712270042"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <reference key="IBUINormalTitleColor" ref="920641822"/>
+                                               <reference key="IBUIHighlightedTitleColor" ref="86196840"/>
+                                               <string key="IBUINormalTitle">Soft Buttons</string>
+                                               <reference key="IBUINormalTitleShadowColor" ref="1048892385"/>
+                                               <reference key="IBUIFontDescription" ref="1053146740"/>
+                                               <reference key="IBUIFont" ref="634086659"/>
+                                       </object>
+                                       <object class="IBUITextView" id="469556899">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 229}, {280, 50}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="437749023"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <object class="NSColor" key="IBUIBackgroundColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MSAxIDEAA</bytes>
+                                               </object>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <bool key="IBUIMultipleTouchEnabled">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">PreSet1, PreSet2, PreSet3, PreSet4, PreSet5, PreSet6</string>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIAutocapitalizationType">2</int>
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="413328503"/>
+                                       </object>
+                                       <object class="IBUILabel" id="823861">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 207}, {270, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="469556899"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Custom Presets (comma separated)</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">13</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">13</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUITextField" id="984826119">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{160, 38}, {140, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">Show Line 4</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="413328503"/>
+                                       </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
-                               <reference key="NSNextKeyView" ref="132657633"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
                                        <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
@@ -410,6 +487,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -417,7 +495,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -425,7 +503,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="779417607"/>
                                        </object>
-                                       <int key="connectionID">18</int>
+                                       <string key="id">18</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -433,7 +511,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="74819292"/>
                                        </object>
-                                       <int key="connectionID">19</int>
+                                       <string key="id">19</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -441,7 +519,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="500774048"/>
                                        </object>
-                                       <int key="connectionID">20</int>
+                                       <string key="id">20</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -449,7 +527,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="725526490"/>
                                        </object>
-                                       <int key="connectionID">21</int>
+                                       <string key="id">21</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -457,7 +535,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="905157747"/>
                                        </object>
-                                       <int key="connectionID">22</int>
+                                       <string key="id">22</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -465,34 +543,71 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="158614726"/>
                                        </object>
-                                       <int key="connectionID">23</int>
+                                       <string key="id">23</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">sbSwitch</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="712270042"/>
+                                       </object>
+                                       <string key="id">33</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">custompresetsview</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="469556899"/>
+                                       </object>
+                                       <string key="id">34</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">line3text</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="781061883"/>
+                                       </object>
+                                       <string key="id">40</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">line4text</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="984826119"/>
+                                       </object>
+                                       <string key="id">41</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">sendShowRPC:</string>
+                                               <string key="label">sendRPC:</string>
                                                <reference key="source" ref="496830156"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">24</int>
+                                       <string key="id">36</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">softButtons:</string>
+                                               <reference key="source" ref="437749023"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">37</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
-                                                       <reference ref="132657633"/>
-                                                       <reference ref="779417607"/>
-                                                       <reference ref="866960930"/>
-                                                       <reference ref="74819292"/>
                                                        <reference ref="725526490"/>
                                                        <reference ref="126855498"/>
                                                        <reference ref="625519869"/>
@@ -502,85 +617,113 @@
                                                        <reference ref="500774048"/>
                                                        <reference ref="368983458"/>
                                                        <reference ref="496830156"/>
+                                                       <reference ref="712270042"/>
+                                                       <reference ref="437749023"/>
+                                                       <reference ref="469556899"/>
+                                                       <reference ref="823861"/>
+                                                       <reference ref="781061883"/>
+                                                       <reference ref="779417607"/>
+                                                       <reference ref="74819292"/>
+                                                       <reference ref="984826119"/>
                                                </array>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
-                                               <reference key="object" ref="132657633"/>
-                                               <reference key="parent" ref="191373211"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
+                                               <string key="id">5</string>
                                                <reference key="object" ref="779417607"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
-                                               <reference key="object" ref="866960930"/>
-                                               <reference key="parent" ref="191373211"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">7</int>
+                                               <string key="id">7</string>
                                                <reference key="object" ref="74819292"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">8</int>
+                                               <string key="id">8</string>
                                                <reference key="object" ref="905157747"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">9</int>
+                                               <string key="id">9</string>
                                                <reference key="object" ref="243375765"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">11</int>
+                                               <string key="id">11</string>
                                                <reference key="object" ref="500774048"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">12</int>
+                                               <string key="id">12</string>
                                                <reference key="object" ref="368983458"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">13</int>
+                                               <string key="id">13</string>
                                                <reference key="object" ref="725526490"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">14</int>
+                                               <string key="id">14</string>
                                                <reference key="object" ref="126855498"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">15</int>
+                                               <string key="id">15</string>
                                                <reference key="object" ref="158614726"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">16</int>
+                                               <string key="id">16</string>
                                                <reference key="object" ref="625519869"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">17</int>
+                                               <string key="id">17</string>
                                                <reference key="object" ref="496830156"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">25</string>
+                                               <reference key="object" ref="712270042"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">26</string>
+                                               <reference key="object" ref="437749023"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">31</string>
+                                               <reference key="object" ref="469556899"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">32</string>
+                                               <reference key="object" ref="823861"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">38</string>
+                                               <reference key="object" ref="781061883"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">39</string>
+                                               <reference key="object" ref="984826119"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
                                </array>
                        </object>
                        <dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -594,12 +737,16 @@
                                <string key="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="15.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <integer value="2" key="15.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/>
+                               <integer value="1" key="15.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/>
                                <string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="25.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="31.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="32.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="38.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="39.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -608,73 +755,21 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">24</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">ShowViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <string key="NS.key.0">sendShowRPC:</string>
-                                               <string key="NS.object.0">id</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">sendShowRPC:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">sendShowRPC:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
-                                       <dictionary class="NSMutableDictionary" key="outlets">
-                                               <string key="line1text">UITextField</string>
-                                               <string key="line2text">UITextField</string>
-                                               <string key="mediaclocktext">UITextField</string>
-                                               <string key="mediatracktext">UITextField</string>
-                                               <string key="statusbartext">UITextField</string>
-                                               <string key="textalignment">UISegmentedControl</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <object class="IBToOneOutletInfo" key="line1text">
-                                                       <string key="name">line1text</string>
-                                                       <string key="candidateClassName">UITextField</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="line2text">
-                                                       <string key="name">line2text</string>
-                                                       <string key="candidateClassName">UITextField</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="mediaclocktext">
-                                                       <string key="name">mediaclocktext</string>
-                                                       <string key="candidateClassName">UITextField</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="mediatracktext">
-                                                       <string key="name">mediatracktext</string>
-                                                       <string key="candidateClassName">UITextField</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="statusbartext">
-                                                       <string key="name">statusbartext</string>
-                                                       <string key="candidateClassName">UITextField</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="textalignment">
-                                                       <string key="name">textalignment</string>
-                                                       <string key="candidateClassName">UISegmentedControl</string>
-                                               </object>
-                                       </dictionary>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/ShowViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SliderViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SliderViewController.h
new file mode 100644 (file)
index 0000000..2dc9f05
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SliderViewController.h
@@ -0,0 +1,21 @@
+//  SliderViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+
+@interface SliderViewController : UIViewController <UITextFieldDelegate> {
+ 
+    IBOutlet UITextField *numtickstext;
+    IBOutlet UITextField *positiontext;
+    IBOutlet UITextField *headertext;
+    IBOutlet UITextField *footertext;
+    IBOutlet UISwitch *dynamicfooterswitch;
+    IBOutlet UITextField *timeouttext;
+    
+}
+
+-(IBAction)sendRPC:(id)sender;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SliderViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SliderViewController.m
new file mode 100644 (file)
index 0000000..f5bb074
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SliderViewController.m
@@ -0,0 +1,78 @@
+//  SliderViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "SliderViewController.h"
+#import "AppDelegate.h"
+
+@interface SliderViewController ()
+
+@end
+
+@implementation SliderViewController
+
+
+-(IBAction)sendRPC:(id)sender {
+    
+    SDLSlider *req = [[[SDLSlider alloc] init] autorelease];
+    
+    if ([dynamicfooterswitch isOn]){
+        req = [SDLRPCRequestFactory buildSliderStaticFooterWithNumTicks:[NSNumber numberWithInt:[[numtickstext text] intValue]] position:[NSNumber numberWithInt:[[positiontext text] intValue]] sliderHeader:[headertext text] sliderFooter:[footertext text] timeout:[NSNumber numberWithInt:[[timeouttext text] intValue]] correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    }
+    else {
+        //Use static for now
+        req = [SDLRPCRequestFactory buildSliderStaticFooterWithNumTicks:[NSNumber numberWithInt:[[numtickstext text] intValue]] position:[NSNumber numberWithInt:[[positiontext text] intValue]] sliderHeader:[headertext text] sliderFooter:[footertext text] timeout:[NSNumber numberWithInt:[[timeouttext text] intValue]] correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    }
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return NO;
+}
+
+
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"Slider";
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    numtickstext.delegate = self;
+    positiontext.delegate = self;
+    headertext.delegate = self;
+    footertext.delegate = self;
+    timeouttext.delegate = self;
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SliderViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SliderViewController.xib
new file mode 100644 (file)
index 0000000..fb0bcd5
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SliderViewController.xib
@@ -0,0 +1,592 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       <string key="NS.object.0">3742</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUIButton</string>
+                       <string>IBUILabel</string>
+                       <string>IBUISwitch</string>
+                       <string>IBUITextField</string>
+                       <string>IBUIView</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <object class="IBProxyObject" id="372490531">
+                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBProxyObject" id="975951072">
+                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBUIView" id="191373211">
+                               <nil key="NSNextResponder"/>
+                               <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUILabel" id="132657633">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 15}, {81, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="779417607"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Num Ticks</string>
+                                               <object class="NSColor" key="IBUITextColor" id="83775735">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
+                                               </object>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="878946683">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">17</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="492812617">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">17</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUITextField" id="779417607">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{112, 10}, {188, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="866960930"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">5</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <object class="NSColorSpace" key="NSCustomColorSpace" id="409597863">
+                                                               <int key="NSID">2</int>
+                                                       </object>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="946691039">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">14</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="148094173">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">14</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUILabel" id="866960930">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 56}, {61, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="74819292"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Position</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="492812617"/>
+                                       </object>
+                                       <object class="IBUITextField" id="74819292">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{112, 51}, {188, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="243375765"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">3</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="148094173"/>
+                                       </object>
+                                       <object class="IBUITextField" id="905157747">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{134, 94}, {166, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="368983458"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">Slider Header</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="148094173"/>
+                                       </object>
+                                       <object class="IBUILabel" id="243375765">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 99}, {104, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="905157747"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Slider Header</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="492812617"/>
+                                       </object>
+                                       <object class="IBUITextField" id="500774048">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{134, 139}, {166, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="333357851"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">Slider Footer</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="148094173"/>
+                                       </object>
+                                       <object class="IBUILabel" id="368983458">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 144}, {101, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="500774048"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Slider Footer</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="492812617"/>
+                                       </object>
+                                       <object class="IBUITextField" id="725526490">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{134, 237}, {166, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="496830156"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">5000</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="409597863"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="148094173"/>
+                                       </object>
+                                       <object class="IBUILabel" id="126855498">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 242}, {62, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="725526490"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Timeout</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="492812617"/>
+                                       </object>
+                                       <object class="IBUIButton" id="496830156">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{112, 310}, {97, 37}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
+                                               <object class="NSColor" key="IBUIHighlightedTitleColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MQA</bytes>
+                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleShadowColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MC41AA</bytes>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">2</int>
+                                                       <double key="pointSize">15</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
+                                                       <double key="NSSize">15</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUISwitch" id="871842020">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{142, 182}, {94, 27}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="126855498"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+                                                       <boolean value="NO" key="IBUIIsAccessibilityElement"/>
+                                               </object>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                       </object>
+                                       <object class="IBUILabel" id="333357851">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 185}, {120, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="871842020"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Dynamic Footer</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <int key="IBUITextAlignment">2</int>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="492812617"/>
+                                       </object>
+                               </array>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
+                               <reference key="NSNextKeyView" ref="132657633"/>
+                               <object class="NSColor" key="IBUIBackgroundColor">
+                                       <int key="NSColorSpace">1</int>
+                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                               </object>
+                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
+                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="191373211"/>
+                                       </object>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">timeouttext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="725526490"/>
+                                       </object>
+                                       <string key="id">29</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">positiontext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="74819292"/>
+                                       </object>
+                                       <string key="id">30</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">numtickstext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="779417607"/>
+                                       </object>
+                                       <string key="id">31</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">headertext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="905157747"/>
+                                       </object>
+                                       <string key="id">32</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">footertext</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="500774048"/>
+                                       </object>
+                                       <string key="id">33</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">dynamicfooterswitch</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="871842020"/>
+                                       </object>
+                                       <string key="id">34</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="496830156"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
+                                       </object>
+                                       <string key="id">28</string>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <string key="id">0</string>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="191373211"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="132657633"/>
+                                                       <reference ref="779417607"/>
+                                                       <reference ref="866960930"/>
+                                                       <reference ref="74819292"/>
+                                                       <reference ref="725526490"/>
+                                                       <reference ref="126855498"/>
+                                                       <reference ref="905157747"/>
+                                                       <reference ref="243375765"/>
+                                                       <reference ref="496830156"/>
+                                                       <reference ref="500774048"/>
+                                                       <reference ref="368983458"/>
+                                                       <reference ref="871842020"/>
+                                                       <reference ref="333357851"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="372490531"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="975951072"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">4</string>
+                                               <reference key="object" ref="132657633"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">5</string>
+                                               <reference key="object" ref="779417607"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">6</string>
+                                               <reference key="object" ref="866960930"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">7</string>
+                                               <reference key="object" ref="74819292"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">8</string>
+                                               <reference key="object" ref="905157747"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">9</string>
+                                               <reference key="object" ref="243375765"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">11</string>
+                                               <reference key="object" ref="500774048"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">12</string>
+                                               <reference key="object" ref="368983458"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">13</string>
+                                               <reference key="object" ref="725526490"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">14</string>
+                                               <reference key="object" ref="126855498"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">17</string>
+                                               <reference key="object" ref="496830156"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">25</string>
+                                               <reference key="object" ref="871842020"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">27</string>
+                                               <reference key="object" ref="333357851"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.CustomClassName">SliderViewController</string>
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="-2.CustomClassName">UIResponder</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="25.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
+       </data>
+</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester-Info.plist b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester-Info.plist
index 1af5062..c45affe 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester-Info.plist
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester-Info.plist
@@ -17,7 +17,7 @@
                        <string>Owner</string>
                        <key>LSItemContentTypes</key>
                        <array>
-                               <string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+                               <string>com.yourcompany.sdl.${PRODUCT_NAME:rfc1034identifier}</string>
                        </array>
                </dict>
        </array>
@@ -42,13 +42,13 @@
                </dict>
        </dict>
        <key>CFBundleIdentifier</key>
-       <string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+       <string>com.yourcompany.sdl.${PRODUCT_NAME:rfc1034identifier}</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.0</string>
+       <string>2.0</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
@@ -57,8 +57,11 @@
        <true/>
        <key>UIBackgroundModes</key>
        <array>
+               <string>audio</string>
                <string>external-accessory</string>
        </array>
+       <key>UIFileSharingEnabled</key>
+       <true/>
        <key>UIRequiredDeviceCapabilities</key>
        <array>
                <string>armv7</string>
@@ -83,7 +86,7 @@
                        <key>UTTypeIconFile</key>
                        <string></string>
                        <key>UTTypeIdentifier</key>
-                       <string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+                       <string>com.yourcompany.sdl.${PRODUCT_NAME:rfc1034identifier}</string>
                        <key>UTTypeTagSpecification</key>
                        <dict>
                                <key>public.filename-extension</key>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester-Prefix.pch b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester-Prefix.pch
index 1db2cda..bd9cac8 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester-Prefix.pch
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester-Prefix.pch
@@ -1,3 +1,7 @@
+//
+// Prefix header for all source files of the 'SmartDeviceLinkTester' target in the 'SmartDeviceLinkTester' project
+//
+
 #import <Availability.h>
 
 #ifndef __IPHONE_4_0

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester.h
new file mode 100644 (file)
index 0000000..114a89a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester.h
@@ -0,0 +1,54 @@
+//  SmartDeviceLinkTester.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <AVFoundation/AVFoundation.h>
+#import <SmartDeviceLink/SmartDeviceLink.h>
+
+@interface SmartDeviceLinkTester : NSObject <SDLProxyListener> {
+    
+    int autoIncCorrID;
+    int cmdID;
+    BOOL firstTimeStartUp;
+    NSMutableData *audioPassThruData;
+}
+
+@property(nonatomic, retain) SDLProxy* proxy;
+
++(SmartDeviceLinkTester*) getInstance;
+-(NSNumber*) getNextCorrID;
+-(void) sendAndPostRPCMessage:(SDLRPCRequest *)rpcMsg;
+-(void) postToConsoleLog:(id) object;
+
+-(int) getCmdID;
+-(void) incCmdID;
+
+-(void) setupProxy;
+-(void) cycleProxy;
+
+
+// =====================================
+//// RPC Function Calls
+// =====================================
+-(void) buildEndAudioPassThru;
+
+-(void) deleteSubMenuPressedwithID:(NSNumber *)menuID;
+
+-(void) performInteractionPressedwithInitialPrompt:(NSArray*)initialChunks initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpChunks:(NSArray*)helpChunks timeoutChunks:(NSArray*)timeoutChunks interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout;
+
+-(void) unsubscribeButtonPressed:(SDLButtonName *)buttonName;
+
+-(void) subscribeButtonPressed:(SDLButtonName *)buttonName;
+
+-(void) buildPerformAudioPassThru:(NSString*) initialPrompt audioPassThruDisplayText1:(NSString*) audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString*) audioPassThruDisplayText2 samplingRate:(SDLSamplingRate*) samplingRate maxDuration:(NSNumber*) maxDuration bitsPerSample:(SDLBitsPerSample*) bitsPerSample audioType:(SDLAudioType*) audioType muteAudio:(NSNumber*) muteAudio;
+
+-(void) addSubMenuPressedwithID:(NSNumber *)menuID menuName:(NSString *)menuName position:(NSNumber *)position;
+
+-(void) deleteCommandPressed:(NSNumber *)cmdID;
+
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester.m
new file mode 100644 (file)
index 0000000..41044ae
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SmartDeviceLinkTester.m
@@ -0,0 +1,412 @@
+//  SmartDeviceLinkTester.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "SmartDeviceLinkTester.h"
+
+
+#define PREFS_FIRST_RUN @"firstRun"
+
+#define PREFS_PROTOCOL @"protocol"
+#define PREFS_IPADDRESS @"ipaddress"
+#define PREFS_PORT @"port"
+
+#define PREFS_APPNAME @"appname"
+#define PREFS_APPID @"appid"
+#define PREFS_TTSNAME @"ttsname"
+#define PREFS_TTSTYPE @"ttstype"
+#define PREFS_VRSYNONYMS @"vrsynonyms"
+#define PREFS_TYPE @"type"
+#define PREFS_LANGUAGE @"language"
+#define PREFS_HMILANGUAGE @"hmilanguage"
+
+
+@implementation SmartDeviceLinkTester
+
+
+static SmartDeviceLinkTester* testerInstance;
+
++ (SmartDeviceLinkTester*) getInstance
+{
+       @synchronized(self)
+       {
+               if (testerInstance == nil)
+                       testerInstance = [[self alloc] init];
+       }
+       return testerInstance;
+}
+
+-(void) sendAndPostRPCMessage:(SDLRPCRequest *)rpcMsg {
+    [self.proxy sendRPCRequest:rpcMsg];
+    [self postToConsoleLog:rpcMsg];
+}
+
+-(NSNumber*) getNextCorrID {
+    autoIncCorrID++;
+    return [NSNumber numberWithInt:autoIncCorrID];
+}
+
+-(void) postToConsoleLog:(id) object {
+    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"consoleLog" object:object]];
+}
+
+-(void) incCmdID {
+    cmdID++;
+}
+
+-(int) getCmdID {
+    return cmdID;
+}
+
+
+// =====================================
+//// RPC Function Calls
+// =====================================
+
+-(void) buildEndAudioPassThru{
+    
+    SDLEndAudioPassThru *req = [SDLRPCRequestFactory buildEndAudioPassThruWithCorrelationID:[NSNumber numberWithInt:autoIncCorrID++]];
+
+    [self sendAndPostRPCMessage:req];  
+}
+
+-(void) deleteSubMenuPressedwithID:(NSNumber *)menuID {
+    SDLDeleteSubMenu *req = [SDLRPCRequestFactory buildDeleteSubMenuWithID:menuID correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
+    
+    [self sendAndPostRPCMessage:req];
+}
+
+-(void) performInteractionPressedwithInitialPrompt:(NSArray*)initialChunks initialText:(NSString*)initialText interactionChoiceSetIDList:(NSArray*) interactionChoiceSetIDList helpChunks:(NSArray*)helpChunks timeoutChunks:(NSArray*)timeoutChunks interactionMode:(SDLInteractionMode*) interactionMode timeout:(NSNumber*)timeout {
+    
+    SDLPerformInteraction *req = [SDLRPCRequestFactory buildPerformInteractionWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:interactionMode timeout:timeout vrHelp:nil correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
+    
+    [self sendAndPostRPCMessage:req];
+}
+
+-(void) unsubscribeButtonPressed:(SDLButtonName *)buttonName {
+    SDLUnsubscribeButton *req = [SDLRPCRequestFactory buildUnsubscribeButtonWithName:buttonName correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
+    
+    [self sendAndPostRPCMessage:req];
+}
+
+-(void) subscribeButtonPressed:(SDLButtonName *)buttonName {
+    SDLSubscribeButton *req = [SDLRPCRequestFactory buildSubscribeButtonWithName:buttonName correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
+    
+    [self sendAndPostRPCMessage:req];
+   
+    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"SubscribeButtonRequest" object:req]];
+    
+}
+
+-(void) buildPerformAudioPassThru:(NSString*) initialPrompt audioPassThruDisplayText1:(NSString*) audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString*) audioPassThruDisplayText2 samplingRate:(SDLSamplingRate*) samplingRate maxDuration:(NSNumber*) maxDuration bitsPerSample:(SDLBitsPerSample*) bitsPerSample audioType:(SDLAudioType*) audioType muteAudio:(NSNumber*) muteAudio{
+    
+    SDLPerformAudioPassThru *req = [SDLRPCRequestFactory buildPerformAudioPassThruWithInitialPrompt:(NSString*) initialPrompt audioPassThruDisplayText1:(NSString*) audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString*) audioPassThruDisplayText2 samplingRate:(SDLSamplingRate*) samplingRate maxDuration:(NSNumber*) maxDuration bitsPerSample:(SDLBitsPerSample*) bitsPerSample audioType:(SDLAudioType*) audioType muteAudio:(NSNumber*) muteAudio correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
+    
+    audioPassThruData = [[NSMutableData alloc] init];
+    
+    [self sendAndPostRPCMessage:req]; 
+}
+
+-(void) addSubMenuPressedwithID:(NSNumber *)menuID menuName:(NSString *)menuName position:(NSNumber *)position {
+    SDLAddSubMenu *req = [SDLRPCRequestFactory buildAddSubMenuWithID:menuID menuName:menuName position:position correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
+    
+    [self sendAndPostRPCMessage:req];
+   
+    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"AddSubMenuRequest" object:req]];
+}
+
+-(void) deleteCommandPressed:(NSNumber *)commandID {
+    SDLDeleteCommand *req = [SDLRPCRequestFactory buildDeleteCommandWithID:commandID correlationID:[NSNumber numberWithInt:autoIncCorrID++]];
+    
+    [self sendAndPostRPCMessage:req];
+}
+
+
+// =====================================
+// Proxy Life Management Functions
+// =====================================
+
+-(void) savePreferences {
+       
+       NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+    
+    //Set to match settings.bundle defaults on initial app run
+    if (![[prefs objectForKey:PREFS_FIRST_RUN] isEqualToString:@"False"]) {
+        [prefs setObject:@"False" forKey:PREFS_FIRST_RUN];
+        [prefs setObject:@"iap" forKey:PREFS_PROTOCOL];
+        [prefs setObject:@"192.168.0.1" forKey:PREFS_IPADDRESS];
+        [prefs setObject:@"12345" forKey:PREFS_PORT];
+        
+        [prefs setObject:@"SmartDeviceLinkTester" forKey:PREFS_APPNAME];
+        [prefs setObject:@"123456789" forKey:PREFS_APPID];
+        [prefs setObject:@"media" forKey:PREFS_TYPE];
+        [prefs setObject:@"SmartDeviceLinkTester" forKey:PREFS_TTSNAME];
+        [prefs setObject:@"text" forKey:PREFS_TTSTYPE];
+        [prefs setObject:@"SmartDeviceLinkTester, SDLT" forKey:PREFS_VRSYNONYMS];
+        [prefs setObject:@"EN-US" forKey:PREFS_LANGUAGE];
+        [prefs setObject:@"EN-US" forKey:PREFS_HMILANGUAGE];
+    }
+
+       [prefs synchronize];
+}
+
+//Populating Display Screen with relevant information upon creation
+-(void) initialShow {
+    SDLShow* msg = [SDLRPCRequestFactory buildShowWithMainField1:@"SmartDeviceLink" mainField2:@"Tester!" alignment:[SDLTextAlignment CENTERED] correlationID:[self getNextCorrID]];
+       msg.mediaTrack = @"SDLT";
+    [self sendAndPostRPCMessage:msg];
+    
+}
+
+-(void)  setupProxy{
+    [self savePreferences];
+    
+    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+    if ([[prefs objectForKey:PREFS_PROTOCOL] isEqualToString:@"tcpl"]) {
+        self.proxy = [SDLProxyFactory buildProxyWithListener: self
+                                                   tcpIPAddress: nil
+                                                            tcpPort: [prefs objectForKey:PREFS_PORT]];
+    } else if ([[prefs objectForKey:PREFS_PROTOCOL] isEqualToString:@"tcps"]) {
+        self.proxy = [SDLProxyFactory buildProxyWithListener: self
+                                                   tcpIPAddress: [prefs objectForKey:PREFS_IPADDRESS]
+                                                             tcpPort: [prefs objectForKey:PREFS_PORT]];
+    } else
+        self.proxy = [SDLProxyFactory buildProxyWithListener: self];
+    
+    autoIncCorrID = 101;
+    cmdID = 1;
+}
+
+-(void) cycleProxy {
+    [self postToConsoleLog:@"~Cycle Proxy~"];
+    [self onProxyClosed];
+}
+
+-(void) disposeProxy {
+    [self.proxy release];
+       self.proxy = nil;
+}
+
+
+// ========================================================
+// Implementation Of Required SDLProxyListener Callbacks
+// ========================================================
+
+-(void) onOnDriverDistraction:(SDLOnDriverDistraction*) notification {
+       [self postToConsoleLog:notification];
+}
+
+-(void) onOnHMIStatus:(SDLOnHMIStatus*) notification {
+    [self postToConsoleLog:notification];
+ 
+    if (notification.hmiLevel == SDLHMILevel.HMI_FULL) {
+        if (firstTimeStartUp == YES) {
+            [self initialShow];
+            firstTimeStartUp = NO;
+        }
+    }
+}
+
+-(void) onProxyClosed {
+    [self postToConsoleLog:@"onProxyClosed"];
+    [SDLDebugTool logInfo:@"onProxyClosed"];
+       [self disposeProxy];
+    
+    [self postToConsoleLog:@"~Restart Proxy~"];
+    [SDLDebugTool logInfo:@"~Restart Proxy~"];
+       [[self init] setupProxy];
+}
+
+-(void) onProxyOpened {
+    [self postToConsoleLog:@"onProxyOpened"];
+    [SDLDebugTool logInfo:@"onProxyOpened"];
+    
+    firstTimeStartUp = YES;
+    
+    //Get App Settings
+    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+    
+    
+    NSNumber* isMediaApp = [NSNumber numberWithBool:NO];
+    
+    if ([[prefs objectForKey:PREFS_TYPE] isEqualToString:@"media"]) {
+        isMediaApp = [NSNumber numberWithBool:YES];
+    }
+    
+    NSMutableArray *ttsName = [[NSMutableArray alloc] init];
+    
+    if ([[prefs objectForKey:PREFS_TTSTYPE] isEqualToString:@"sapi"]) {
+        [ttsName addObject:[SDLTTSChunkFactory buildTTSChunkForString:[prefs objectForKey:PREFS_TTSNAME] type:SDLSpeechCapabilities.SAPI_PHONEMES]];
+    }
+    else if ([[prefs objectForKey:PREFS_TTSTYPE] isEqualToString:@"lhp"]) {
+        [ttsName addObject:[SDLTTSChunkFactory buildTTSChunkForString:[prefs objectForKey:PREFS_TTSNAME] type:SDLSpeechCapabilities.LHPLUS_PHONEMES]];
+    }
+    else {
+        [ttsName addObject:[SDLTTSChunkFactory buildTTSChunkForString:[prefs objectForKey:PREFS_TTSNAME] type:SDLSpeechCapabilities.TEXT]];
+    }
+    
+    SDLRegisterAppInterface* regRequest = [SDLRPCRequestFactory buildRegisterAppInterfaceWithAppName:[prefs objectForKey:PREFS_APPNAME] ttsName:ttsName vrSynonyms:[[[prefs objectForKey:PREFS_VRSYNONYMS] componentsSeparatedByString:@", "] mutableCopy] isMediaApp:isMediaApp languageDesired:[prefs objectForKey:PREFS_LANGUAGE] hmiDisplayLanguageDesired:[prefs objectForKey:PREFS_HMILANGUAGE] appID:[prefs objectForKey:PREFS_APPID]];
+    
+    [self sendAndPostRPCMessage:regRequest];
+}
+
+
+
+// ========================================================
+// Implementation Of Optional SDLProxyListener Callbacks
+// ========================================================
+
+-(void) onAddCommandResponse:(SDLAddCommandResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onAddSubMenuResponse:(SDLAddSubMenuResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onAlertManeuverResponse:(SDLAlertManeuverResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onAlertResponse:(SDLAlertResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onChangeRegistrationResponse:(SDLChangeRegistrationResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onCreateInteractionChoiceSetResponse:(SDLCreateInteractionChoiceSetResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onDeleteCommandResponse:(SDLDeleteCommandResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onDeleteFileResponse:(SDLDeleteFileResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onDeleteInteractionChoiceSetResponse:(SDLDeleteInteractionChoiceSetResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onDeleteSubMenuResponse:(SDLDeleteSubMenuResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onEndAudioPassThruResponse:(SDLEndAudioPassThruResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onError:(NSException*) e {
+       [SDLDebugTool logInfo:@"proxy error occurred: %@", e];
+}
+-(void) onGenericResponse:(SDLGenericResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onGetDTCsResponse:(SDLGetDTCsResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onGetVehicleDataResponse:(SDLGetVehicleDataResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onListFilesResponse:(SDLListFilesResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onOnAppInterfaceUnregistered:(SDLOnAppInterfaceUnregistered*) notification {
+       [self postToConsoleLog:notification];
+}
+-(void) onOnAudioPassThru:(SDLOnAudioPassThru*) notification {
+    [self postToConsoleLog:notification];
+    
+    //Fill Buffer
+    NSData *test = [NSData dataWithData:notification.bulkData];
+    [audioPassThruData appendData:test];
+}
+-(void) onOnButtonEvent:(SDLOnButtonEvent*) notification {
+    [self postToConsoleLog:notification];
+}
+-(void) onOnButtonPress:(SDLOnButtonPress*) notification {
+    [self postToConsoleLog:notification];
+}
+-(void) onOnCommand:(SDLOnCommand*) notification {
+       [self postToConsoleLog:notification];
+}
+-(void) onOnLanguageChange:(SDLOnLanguageChange*) notification {
+    [self postToConsoleLog:notification];
+}
+-(void) onOnPermissionsChange:(SDLOnPermissionsChange*) notification {
+    [self postToConsoleLog:notification];
+}
+-(void) onOnTBTClientState:(SDLOnTBTClientState*) notification {
+       [self postToConsoleLog:notification];
+}
+-(void) onOnVehicleData:(SDLOnVehicleData*) notification {
+    [self postToConsoleLog:notification];
+}
+-(void) onPerformAudioPassThruResponse:(SDLPerformAudioPassThruResponse*) response {
+    [self postToConsoleLog:response];
+    
+    //Write Data To File
+    NSData *dataToWrite = [NSData dataWithData:audioPassThruData];
+    
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString *documentsDirectory = [paths objectAtIndex:0];
+    NSString *savePath = [documentsDirectory stringByAppendingPathComponent:@"apt.pcm"];
+    [dataToWrite writeToFile:savePath atomically:NO];
+    
+    [audioPassThruData release];
+}
+-(void) onPerformInteractionResponse:(SDLPerformInteractionResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onPutFileResponse:(SDLPutFileResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onReadDIDResponse:(SDLReadDIDResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onRegisterAppInterfaceResponse:(SDLRegisterAppInterfaceResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onResetGlobalPropertiesResponse:(SDLResetGlobalPropertiesResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onScrollableMessageResponse:(SDLScrollableMessageResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onSetAppIconResponse:(SDLSetAppIconResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onSetDisplayLayoutResponse:(SDLSetDisplayLayoutResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onSetGlobalPropertiesResponse:(SDLSetGlobalPropertiesResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onSetMediaClockTimerResponse:(SDLSetMediaClockTimerResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onShowConstantTBTResponse:(SDLShowConstantTBTResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onShowResponse:(SDLShowResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onSliderResponse:(SDLSliderResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onSpeakResponse:(SDLSpeakResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onSubscribeButtonResponse:(SDLSubscribeButtonResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onSubscribeVehicleDataResponse:(SDLSubscribeVehicleDataResponse*) response {
+    [self postToConsoleLog:response];
+}
+-(void) onUnregisterAppInterfaceResponse:(SDLUnregisterAppInterfaceResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onUnsubscribeButtonResponse:(SDLUnsubscribeButtonResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onUnsubscribeVehicleDataResponse:(SDLUnsubscribeVehicleDataResponse*) response {
+       [self postToConsoleLog:response];
+}
+-(void) onUpdateTurnListResponse:(SDLUpdateTurnListResponse*) response {
+    [self postToConsoleLog:response];
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonEditViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonEditViewController.h
new file mode 100644 (file)
index 0000000..9821502
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonEditViewController.h
@@ -0,0 +1,28 @@
+//  SoftButtonEditViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import <SmartDeviceLink/SmartDeviceLink.h>
+
+@interface SoftButtonEditViewController : UIViewController <UITextFieldDelegate, UITextViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate> {
+    
+    IBOutlet UITextField *sbIDText;
+    IBOutlet UITextField *textText;
+    IBOutlet UITextField *imageText;
+    IBOutlet UISwitch *isHighlightedSwitch;
+    IBOutlet UITextField *systemActionText;
+    
+    IBOutlet UISegmentedControl *buttonType;
+    IBOutlet UISegmentedControl *imageType;
+    
+    UIPickerView *textPicker;
+    NSInteger currentTag;
+    
+}
+
+
+@property(nonatomic, retain) SDLSoftButton *softButton;
+@property(nonatomic, retain) NSArray *pickerArray;
+
+@end
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonEditViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonEditViewController.m
new file mode 100644 (file)
index 0000000..6c066ef
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonEditViewController.m
@@ -0,0 +1,215 @@
+//  SoftButtonEditViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#define tagTypeText 100
+#define tagImageTypeText 101
+#define tagSystemActionText 102
+
+#import "SoftButtonEditViewController.h"
+
+@implementation SoftButtonEditViewController
+
+@synthesize softButton;
+@synthesize pickerArray;
+
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return NO;
+}
+
+- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
+    
+    if([text isEqualToString:@"\n"]) {
+        [textView resignFirstResponder];
+        return NO;
+    }
+    
+    return YES;
+}
+
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"Edit";
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    sbIDText.delegate = self;
+    textText.delegate = self;
+    imageText.delegate = self;
+    systemActionText.delegate = self;
+    
+    sbIDText.text = [softButton.softButtonID stringValue];
+    textText.text = softButton.text;
+    imageText.text = softButton.image.value;
+    isHighlightedSwitch.on = [softButton.isHighlighted boolValue];
+    systemActionText.text = [softButton.systemAction value];
+    
+    textPicker = [[UIPickerView alloc] init];
+    textPicker.dataSource = self;
+    textPicker.delegate = self;
+    textPicker.showsSelectionIndicator = YES;
+    
+    systemActionText.inputView = textPicker;
+    systemActionText.inputAccessoryView = [self doneBar];
+    
+    if ([[softButton.type value] isEqualToString:@"TEXT"]) {
+        buttonType.selectedSegmentIndex = 0;
+    }
+    else if ([[softButton.type value] isEqualToString:@"IMAGE"]) {
+        buttonType.selectedSegmentIndex = 1;
+    }
+    else {
+        buttonType.selectedSegmentIndex = 2;
+    }
+    
+    if ([[[softButton.image imageType] value] isEqualToString:@"STATIC"]) {
+        imageType.selectedSegmentIndex = 1;
+    }
+    else if ([[[softButton.image imageType] value] isEqualToString:@"DYNAMIC"]) {
+        imageType.selectedSegmentIndex = 2;
+    }
+    else {
+        imageType.selectedSegmentIndex = 0;
+    }
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+- (void)textFieldDidBeginEditing:(UITextField *)textField {
+    
+    currentTag = textField.tag;
+        
+    switch (currentTag) {        
+        case tagSystemActionText:
+        {
+            self.pickerArray = @[@"DEFAULT_ACTION", @"STEAL_FOCUS", @"KEEP_CONTEXT"];
+            [textPicker reloadAllComponents];
+            [textPicker selectRow:[self.pickerArray indexOfObject:systemActionText.text] inComponent:0 animated:YES];
+            break;
+        }
+        
+        default:
+            break;
+    }    
+}
+
+
+#pragma mark - UIPickerViewDataSource
+
+- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView {
+    
+    return 1;
+}
+
+- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component {
+
+    return [self.pickerArray count];
+}
+
+#pragma mark - UIPickerViewDelegate
+
+- (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component {
+    
+    return [pickerArray objectAtIndex:row];
+}
+
+- (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component {
+
+    switch (currentTag) {
+        case tagSystemActionText:
+        {
+            systemActionText.text = [textPicker.delegate pickerView:pickerView titleForRow:row forComponent:component];
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+#pragma mark - Miscellaneous
+
+- (UIToolbar*)doneBar {
+    UIToolbar *toolBar = [[UIToolbar alloc] init];
+    toolBar.barStyle = UIBarStyleBlackTranslucent;
+    [toolBar sizeToFit];
+    
+    UIBarButtonItem *flexibleSpaceLeft = [[UIBarButtonItem alloc]
+                                          initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
+                                          target:nil
+                                          action:nil];
+    
+    UIBarButtonItem *doneButton = [[UIBarButtonItem alloc] initWithTitle:@"Done"
+                                                                   style:UIBarButtonItemStyleBordered
+                                                                  target:self
+                                                                  action:@selector(doneButtonPressed)];
+    
+    [toolBar setItems:[NSArray arrayWithObjects:flexibleSpaceLeft, doneButton, nil]];
+    
+    return toolBar;
+}
+
+- (void) doneButtonPressed {
+    [self.view endEditing:YES];
+}
+
+-(void)viewDidDisappear:(BOOL)animated
+{
+    softButton.softButtonID = [NSNumber numberWithInt:[sbIDText.text intValue]];
+    softButton.text = textText.text;
+    softButton.isHighlighted = [NSNumber numberWithBool:isHighlightedSwitch.isOn];
+    softButton.systemAction = [SDLSystemAction valueOf:systemActionText.text];
+    
+    if (imageType.selectedSegmentIndex == 0) {
+        softButton.image = nil;
+    }
+    else if (imageType.selectedSegmentIndex == 1) {
+        softButton.image = [[[SDLImage alloc] init] autorelease];
+        softButton.image.imageType = [SDLImageType STATIC];
+        softButton.image.value = imageText.text;
+    }
+    else {
+        softButton.image = [[[SDLImage alloc] init] autorelease];
+        softButton.image.imageType = [SDLImageType DYNAMIC];
+        softButton.image.value = imageText.text;
+    }
+    
+    if (buttonType.selectedSegmentIndex == 0) {
+        softButton.type = [SDLSoftButtonType TEXT];
+    }
+    else if (buttonType.selectedSegmentIndex == 1) {
+        softButton.type = [SDLSoftButtonType IMAGE];
+    }
+    else {
+        softButton.type = [SDLSoftButtonType BOTH];
+    }
+    
+    
+        
+    
+    
+    
+}
+
+@end
+
+

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonEditViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonEditViewController.xib
new file mode 100644 (file)
index 0000000..41a8166
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonEditViewController.xib
@@ -0,0 +1,601 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       <string key="NS.object.0">3742</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUILabel</string>
+                       <string>IBUISegmentedControl</string>
+                       <string>IBUISwitch</string>
+                       <string>IBUITextField</string>
+                       <string>IBUIView</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <object class="IBProxyObject" id="372490531">
+                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBProxyObject" id="975951072">
+                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBUIView" id="191373211">
+                               <nil key="NSNextResponder"/>
+                               <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUILabel" id="237540828">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 214}, {50, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="437430860"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">SB ID:</string>
+                                               <object class="NSColor" key="IBUITextColor" id="486709734">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
+                                               </object>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="538254493">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">17</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="221522988">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">17</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUITextField" id="437430860">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{80, 209}, {220, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="572416144"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText"/>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <object class="NSColorSpace" key="NSCustomColorSpace" id="477982818">
+                                                               <int key="NSID">2</int>
+                                                       </object>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="81757635">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">14</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="446443402">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">14</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUILabel" id="572416144">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{27, 72}, {38, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="630250575"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Text:</string>
+                                               <reference key="IBUITextColor" ref="486709734"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="538254493"/>
+                                               <reference key="IBUIFont" ref="221522988"/>
+                                       </object>
+                                       <object class="IBUITextField" id="630250575">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{80, 67}, {220, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText"/>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="477982818"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="81757635"/>
+                                               <reference key="IBUIFont" ref="446443402"/>
+                                       </object>
+                                       <object class="IBUISwitch" id="869185800">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{104, 263}, {94, 27}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="631151440"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                       </object>
+                                       <object class="IBUILabel" id="837098330">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 266}, {90, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="869185800"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Highlighted:</string>
+                                               <reference key="IBUITextColor" ref="486709734"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="538254493"/>
+                                               <reference key="IBUIFont" ref="221522988"/>
+                                       </object>
+                                       <object class="IBUILabel" id="601913584">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{22, 19}, {43, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Type:</string>
+                                               <reference key="IBUITextColor" ref="486709734"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="538254493"/>
+                                               <reference key="IBUIFont" ref="221522988"/>
+                                       </object>
+                                       <object class="IBUILabel" id="631151440">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 313}, {109, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="463810135"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">SystemAction:</string>
+                                               <reference key="IBUITextColor" ref="486709734"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="538254493"/>
+                                               <reference key="IBUIFont" ref="221522988"/>
+                                       </object>
+                                       <object class="IBUITextField" id="463810135">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{137, 308}, {163, 31}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUITag">102</int>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText"/>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="477982818"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="81757635"/>
+                                               <reference key="IBUIFont" ref="446443402"/>
+                                       </object>
+                                       <object class="IBUITextField" id="506256795">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{80, 155}, {220, 30}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText"/>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                                       <reference key="NSCustomColorSpace" ref="477982818"/>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="81757635"/>
+                                               <reference key="IBUIFont" ref="446443402"/>
+                                       </object>
+                                       <object class="IBUISegmentedControl" id="363393729">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{80, 122}, {220, 30}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="506256795"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBSegmentControlStyle">2</int>
+                                               <int key="IBNumberOfSegments">3</int>
+                                               <int key="IBSelectedSegmentIndex">0</int>
+                                               <array key="IBSegmentTitles">
+                                                       <string>None</string>
+                                                       <string>Static</string>
+                                                       <string>Dynamic</string>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentWidths">
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentEnabledStates">
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentContentOffsets">
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentImages">
+                                                       <object class="NSNull" id="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                               </array>
+                                       </object>
+                                       <object class="IBUILabel" id="584016099">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{13, 142}, {59, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSNextKeyView" ref="363393729"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Image:</string>
+                                               <reference key="IBUITextColor" ref="486709734"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <reference key="IBUIFontDescription" ref="538254493"/>
+                                               <reference key="IBUIFont" ref="221522988"/>
+                                               <bool key="IBUIAdjustsFontSizeToFit">NO</bool>
+                                       </object>
+                                       <object class="IBUISegmentedControl" id="679956504">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{80, 17}, {220, 30}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBSegmentControlStyle">2</int>
+                                               <int key="IBNumberOfSegments">3</int>
+                                               <int key="IBSelectedSegmentIndex">0</int>
+                                               <array key="IBSegmentTitles">
+                                                       <string>Text</string>
+                                                       <string>Image</string>
+                                                       <string>Both</string>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentWidths">
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentEnabledStates">
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentContentOffsets">
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentImages">
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                               </array>
+                                       </object>
+                               </array>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
+                               <reference key="NSNextKeyView" ref="601913584"/>
+                               <object class="NSColor" key="IBUIBackgroundColor">
+                                       <int key="NSColorSpace">1</int>
+                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                               </object>
+                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
+                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="191373211"/>
+                                       </object>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">isHighlightedSwitch</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="869185800"/>
+                                       </object>
+                                       <string key="id">40</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">sbIDText</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="437430860"/>
+                                       </object>
+                                       <string key="id">41</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">systemActionText</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="463810135"/>
+                                       </object>
+                                       <string key="id">42</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">textText</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="630250575"/>
+                                       </object>
+                                       <string key="id">43</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">imageText</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="506256795"/>
+                                       </object>
+                                       <string key="id">72</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">imageType</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="363393729"/>
+                                       </object>
+                                       <string key="id">75</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">buttonType</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="679956504"/>
+                                       </object>
+                                       <string key="id">76</string>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <string key="id">0</string>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="191373211"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="679956504"/>
+                                                       <reference ref="506256795"/>
+                                                       <reference ref="363393729"/>
+                                                       <reference ref="630250575"/>
+                                                       <reference ref="584016099"/>
+                                                       <reference ref="572416144"/>
+                                                       <reference ref="601913584"/>
+                                                       <reference ref="631151440"/>
+                                                       <reference ref="463810135"/>
+                                                       <reference ref="869185800"/>
+                                                       <reference ref="837098330"/>
+                                                       <reference ref="237540828"/>
+                                                       <reference ref="437430860"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="372490531"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="975951072"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">7</string>
+                                               <reference key="object" ref="237540828"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">8</string>
+                                               <reference key="object" ref="437430860"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">11</string>
+                                               <reference key="object" ref="869185800"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">12</string>
+                                               <reference key="object" ref="837098330"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">29</string>
+                                               <reference key="object" ref="601913584"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">38</string>
+                                               <reference key="object" ref="631151440"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">39</string>
+                                               <reference key="object" ref="463810135"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">69</string>
+                                               <reference key="object" ref="506256795"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">70</string>
+                                               <reference key="object" ref="363393729"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">71</string>
+                                               <reference key="object" ref="584016099"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">10</string>
+                                               <reference key="object" ref="630250575"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">9</string>
+                                               <reference key="object" ref="572416144"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">73</string>
+                                               <reference key="object" ref="679956504"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.CustomClassName">SoftButtonEditViewController</string>
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="-2.CustomClassName">UIResponder</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="29.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="38.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="39.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="69.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="70.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <integer value="0" key="70.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/>
+                               <string key="71.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <integer value="0" key="73.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/>
+                               <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
+       </data>
+</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonListViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonListViewController.h
new file mode 100644 (file)
index 0000000..2645a1a
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonListViewController.h
@@ -0,0 +1,21 @@
+//  softButtonListViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+
+@interface SoftButtonListViewController : UIViewController <UITableViewDataSource, UITableViewDelegate> {
+    
+    IBOutlet UITableView *buttonTable;
+    
+    NSMutableArray *sbList;
+    
+}
+
+-(IBAction) editTable:(id)sender;
+
+-(void) updateList:(NSMutableArray *) list;
+
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonListViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonListViewController.m
new file mode 100644 (file)
index 0000000..c3d137f
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonListViewController.m
@@ -0,0 +1,172 @@
+//  softButtonListViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "SoftButtonListViewController.h"
+#import "SoftButtonEditViewController.h"
+
+
+@implementation SoftButtonListViewController
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"SoftButtons";
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+-(void)dealloc {
+    [super dealloc];
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    UIBarButtonItem *addButton = [[UIBarButtonItem alloc] initWithTitle:@"Add/Del" style:UIBarButtonItemStyleBordered target:self action:@selector(editTable:)];
+       [self.navigationItem setRightBarButtonItem:addButton];
+    
+    buttonTable.delegate = self;
+    buttonTable.dataSource = self;
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+-(void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+}
+
+-(void)viewDidAppear:(BOOL)animated
+{
+    [buttonTable reloadData];
+}
+
+#pragma mark Table view methods
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    return 1;
+}
+// Customize the number of rows in the table view.
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+       int count = [sbList count];
+       if(self.editing) count++;
+       return count;
+}
+
+// Customize the appearance of table view cells.
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+//    NSLog(@"Method called %@", [(SDLSoftButton *)[sbList objectAtIndex:indexPath.row] text]);
+    
+    static NSString *CellIdentifier = @"Cell";
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+    if (cell == nil)
+       {
+        cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
+    }
+    int count = 0;
+       if(self.editing && indexPath.row != 0)
+               count = 1;
+    
+       // Set up the cell...
+       if(indexPath.row == ([sbList count]) && self.editing)
+       {
+               cell.textLabel.text = @"Add New Soft Button";
+               return cell;
+       }
+    cell.textLabel.text = [NSString stringWithFormat:@"SBT_%@: %@",
+                           [[(SDLSoftButton *)[sbList objectAtIndex:indexPath.row] type] value],
+                           [(SDLSoftButton *)[sbList objectAtIndex:indexPath.row] text]];
+    cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+    return cell;
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+       
+    SoftButtonEditViewController *softButtonEditViewController = [[SoftButtonEditViewController alloc] initWithNibName:@"SoftButtonEditViewController" bundle:nil];
+    
+    softButtonEditViewController.softButton = [sbList objectAtIndex:indexPath.row];
+
+    [self.navigationController pushViewController:softButtonEditViewController animated:YES];
+}
+
+- (IBAction) editTable:(id)sender
+{
+       if(self.editing)
+       {
+               [super setEditing:NO animated:NO];
+               [buttonTable setEditing:NO animated:NO];
+               [buttonTable reloadData];
+               [self.navigationItem.rightBarButtonItem setTitle:@"Add/Del"];
+               [self.navigationItem.rightBarButtonItem setStyle:UIBarButtonItemStylePlain];
+       }
+       else
+       {
+               [super setEditing:YES animated:YES];
+               [buttonTable setEditing:YES animated:YES];
+               [buttonTable reloadData];
+               [self.navigationItem.rightBarButtonItem setTitle:@"Done"];
+               [self.navigationItem.rightBarButtonItem setStyle:UIBarButtonItemStyleDone];
+       }
+}
+
+// The editing style for a row is the kind of button displayed to the left of the cell when in editing mode.
+- (UITableViewCellEditingStyle)tableView:(UITableView *)aTableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    // No editing style if not editing or the index path is nil.
+    if (self.editing == NO || !indexPath) return UITableViewCellEditingStyleNone;
+    // Determine the editing style based on whether the cell is a placeholder for adding content or already
+    // existing content. Existing content can be deleted.
+    if (self.editing && indexPath.row == ([sbList count]))
+       {
+               return UITableViewCellEditingStyleInsert;
+       } else
+       {
+               return UITableViewCellEditingStyleDelete;
+       }
+    return UITableViewCellEditingStyleNone;
+}
+
+// Update the data model according to edit actions delete or insert.
+- (void)tableView:(UITableView *)aTableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle
+forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (editingStyle == UITableViewCellEditingStyleDelete)
+       {
+        [sbList removeObjectAtIndex:indexPath.row];
+               [buttonTable reloadData];
+    } else if (editingStyle == UITableViewCellEditingStyleInsert)
+       {
+        SDLSoftButton *sb = [[[SDLSoftButton alloc] init] autorelease];
+        sb.softButtonID = [NSNumber numberWithInt:5020];
+        sb.text = @"New SB";
+        sb.type = [SDLSoftButtonType TEXT];
+        sb.isHighlighted = [NSNumber numberWithBool:false];
+        sb.systemAction = [SDLSystemAction DEFAULT_ACTION];
+        [sbList insertObject:sb atIndex:[sbList count]];
+               [buttonTable reloadData];
+    }
+}
+
+-(void)updateList:(NSMutableArray *) list
+{
+    sbList = list;
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonListViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonListViewController.xib
new file mode 100644 (file)
index 0000000..c12bdc7
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SoftButtonListViewController.xib
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       <string key="NS.object.0">3742</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUITableView</string>
+                       <string>IBUIView</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <object class="IBProxyObject" id="372490531">
+                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBProxyObject" id="975951072">
+                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBUIView" id="191373211">
+                               <nil key="NSNextResponder"/>
+                               <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUITableView" id="369649950">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">274</int>
+                                               <string key="NSFrameSize">{320, 367}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <object class="NSColor" key="IBUIBackgroundColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                                               </object>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <bool key="IBUIAlwaysBounceVertical">YES</bool>
+                                               <int key="IBUIStyle">1</int>
+                                               <int key="IBUISeparatorStyle">2</int>
+                                               <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+                                               <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+                                               <float key="IBUIRowHeight">44</float>
+                                               <float key="IBUISectionHeaderHeight">10</float>
+                                               <float key="IBUISectionFooterHeight">10</float>
+                                       </object>
+                               </array>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
+                               <reference key="NSNextKeyView" ref="369649950"/>
+                               <object class="NSColor" key="IBUIBackgroundColor">
+                                       <int key="NSColorSpace">1</int>
+                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                               </object>
+                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
+                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="191373211"/>
+                                       </object>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">buttonTable</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="369649950"/>
+                                       </object>
+                                       <string key="id">6</string>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <string key="id">0</string>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="191373211"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="369649950"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="372490531"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="975951072"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">4</string>
+                                               <reference key="object" ref="369649950"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.CustomClassName">SoftButtonListViewController</string>
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="-2.CustomClassName">UIResponder</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <dictionary class="NSMutableDictionary" key="4.IBAttributePlaceholdersKey"/>
+                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
+       </data>
+</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SpeakViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SpeakViewController.h
index 764acdb..94cf479 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SpeakViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SpeakViewController.h
@@ -1,17 +1,23 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SpeakViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
+#import "SmartDeviceLinkTester.h"
 
-@interface SpeakViewController : UIViewController <UITextViewDelegate> {
+@interface SpeakViewController : UIViewController <UITextFieldDelegate> {
     
-    IBOutlet UITextView *ttstext;
+    IBOutlet UITextField *speechField1;
+    IBOutlet UITextField *speechField2;
+    IBOutlet UITextField *speechField3;
+    IBOutlet UITextField *speechField4;
+    IBOutlet UISegmentedControl *speechType1;
+    IBOutlet UISegmentedControl *speechType2;
+    IBOutlet UISegmentedControl *speechType3;
+    IBOutlet UISegmentedControl *speechType4;
     
 }
 
--(IBAction)sendSpeakRPC:(id)sender;
--(IBAction)sendTTSChunks:(id)sender;
+-(IBAction)sendRPC:(id)sender;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SpeakViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SpeakViewController.m
index 42a27f6..9e89ab1 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SpeakViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SpeakViewController.m
@@ -1,8 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SpeakViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "SpeakViewController.h"
+#import "AppDelegate.h"
 
 @interface SpeakViewController ()
 
@@ -10,25 +11,62 @@
 
 @implementation SpeakViewController
 
--(IBAction)sendSpeakRPC:(id)sender {
-    [[SDLBrain getInstance] speakPressed:[ttstext text]];
-}
+-(IBAction)sendRPC:(id)sender {
 
--(IBAction)sendTTSChunks:(id)sender {
-    [[SDLBrain getInstance] speakTTSChunksPressed];
-}
+    NSArray *segConArray = [NSArray arrayWithObjects:speechType1, speechType2, speechType3, speechType4, nil];
+    NSMutableArray *capArray = [[NSMutableArray alloc] init];
+    
+    NSUInteger counter = 0;
 
-- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
+    for (UISegmentedControl* currentSegCon in segConArray)
+    {
+        if (currentSegCon.selectedSegmentIndex == 0) {
+            capArray[counter] = [SDLSpeechCapabilities TEXT];
+        }
+        else if (currentSegCon.selectedSegmentIndex == 1) {
+            capArray[counter] = [SDLSpeechCapabilities SAPI_PHONEMES];
+        }
+        else if (currentSegCon.selectedSegmentIndex == 2) {
+            capArray[counter] = [SDLSpeechCapabilities LHPLUS_PHONEMES];
+        }
+        else if (currentSegCon.selectedSegmentIndex == 3) {
+            capArray[counter] = [SDLSpeechCapabilities PRE_RECORDED];
+        }
+        else {
+            capArray[counter] = [SDLSpeechCapabilities SILENCE];
+        }
+        counter++;
+    }
+    
+    NSMutableArray *ttsChunks = [[NSMutableArray alloc] init];
     
-    if([text isEqualToString:@"\n"]) {
-        [textView resignFirstResponder];
-        return NO;
+    if (speechField1.text && speechField1.text.length > 0) {
+        [ttsChunks addObject:[SDLTTSChunkFactory buildTTSChunkForString:speechField1.text type:capArray[0]]];
+    }
+    if (speechField2.text && speechField2.text.length > 0) {
+        [ttsChunks addObject:[SDLTTSChunkFactory buildTTSChunkForString:speechField2.text type:capArray[1]]];
     }
+    if (speechField3.text && speechField3.text.length > 0) {
+        [ttsChunks addObject:[SDLTTSChunkFactory buildTTSChunkForString:speechField3.text type:capArray[2]]];
+    }
+    if (speechField4.text && speechField4.text.length > 0) {
+        [ttsChunks addObject:[SDLTTSChunkFactory buildTTSChunkForString:speechField4.text type:capArray[3]]];
+    }
+    
+    SDLSpeak* req = [SDLRPCRequestFactory buildSpeakWithTTSChunks:ttsChunks correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    [capArray release];
+    [ttsChunks release];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
     
-    return YES;
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
 }
 
-
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
     self.title = @"Speak";
@@ -44,17 +82,45 @@
 {
     [super viewDidLoad];
     
-    ttstext.delegate = self;
-    [[ttstext layer] setCornerRadius:10];
-
-    // Do any additional setup after loading the view from its nib.
+    speechField1.delegate = self;
+    speechField2.delegate = self;
+    speechField3.delegate = self;
+    speechField4.delegate = self;
+    
+    NSArray* titlearray = [NSArray arrayWithObjects:@"Text", @"SAPI", @"LH+", @"PreRec", @"Silence", nil];
+    
+    NSUInteger segmentCounter = 0;
+    for (NSString* title in titlearray)
+    {
+        [speechType1 setTitle:title forSegmentAtIndex:segmentCounter];
+        [speechType2 setTitle:title forSegmentAtIndex:segmentCounter];
+        [speechType3 setTitle:title forSegmentAtIndex:segmentCounter];
+        [speechType4 setTitle:title forSegmentAtIndex:segmentCounter];
+        segmentCounter++;
+    }
+    
 }
 
 - (void)viewDidUnload
 {
+    [speechType1 release];
+    speechType1 = nil;
+    [speechField1 release];
+    speechField1 = nil;
+    [speechField2 release];
+    speechField2 = nil;
+    [speechType2 release];
+    speechType2 = nil;
+    [speechField3 release];
+    speechField3 = nil;
+    [speechType3 release];
+    speechType3 = nil;
+    [speechField4 release];
+    speechField4 = nil;
+    [speechType4 release];
+    speechType4 = nil;
     [super viewDidUnload];
     
-    
     // Release any retained subviews of the main view.
     // e.g. self.myOutlet = nil;
 }
@@ -64,4 +130,21 @@
     return (interfaceOrientation == UIInterfaceOrientationPortrait);
 }
 
+- (void)dealloc {
+    [speechField1 release];
+    [speechType1 release];
+    [speechField2 release];
+    [speechType2 release];
+    [speechField3 release];
+    [speechType3 release];
+    [speechField4 release];
+    [speechType4 release];
+    [super dealloc];
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return NO;
+}
+
 @end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SpeakViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SpeakViewController.xib
index 57c0f5b..bb1164d 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SpeakViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SpeakViewController.xib
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
-                       <string>IBUITextView</string>
+                       <string>IBProxyObject</string>
                        <string>IBUIButton</string>
+                       <string>IBUISegmentedControl</string>
+                       <string>IBUITextField</string>
                        <string>IBUIView</string>
-                       <string>IBUILabel</string>
-                       <string>IBProxyObject</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -24,163 +24,360 @@
                        <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
                        <integer value="1" key="NS.object.0"/>
                </object>
-               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-                       <object class="IBProxyObject" id="372490531">
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="875102873">
+                       <object class="IBProxyObject" id="437767002">
                                <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
-                       <object class="IBProxyObject" id="975951072">
+                       <object class="IBProxyObject" id="451354181">
                                <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
-                       <object class="IBUIView" id="191373211">
+                       <object class="IBUIView" id="870953701">
                                <reference key="NSNextResponder"/>
-                               <int key="NSvFlags">274</int>
+                               <int key="NSvFlags">1298</int>
                                <array class="NSMutableArray" key="NSSubviews">
-                                       <object class="IBUILabel" id="326554446">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 41}, {125, 21}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
+                                       <object class="IBUIButton" id="127216986">
+                                               <reference key="NSNextResponder" ref="870953701"/>
+                                               <int key="NSvFlags">1316</int>
+                                               <object class="NSPSMatrix" key="NSFrameMatrix"/>
+                                               <string key="NSFrame">{{112, 326}, {97, 37}}</string>
+                                               <reference key="NSSuperview" ref="870953701"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="434246447"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
-                                               <bool key="IBUIClipsSubviews">YES</bool>
-                                               <int key="IBUIContentMode">7</int>
-                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Text-to-Speech:</string>
-                                               <object class="NSColor" key="IBUITextColor" id="837634494">
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
                                                        <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
                                                </object>
-                                               <nil key="IBUIHighlightedColor"/>
-                                               <int key="IBUIBaselineAdjustment">0</int>
-                                               <float key="IBUIMinimumFontSize">10</float>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="1058811025">
-                                                       <int key="type">1</int>
-                                                       <double key="pointSize">17</double>
+                                               <object class="NSColor" key="IBUIHighlightedTitleColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MQA</bytes>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="932272439">
-                                                       <string key="NSName">Helvetica</string>
-                                                       <double key="NSSize">17</double>
+                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleShadowColor">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MC41AA</bytes>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                                       <int key="type">2</int>
+                                                       <double key="pointSize">15</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont">
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
+                                                       <double key="NSSize">15</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
-                                       <object class="IBUITextView" id="434246447">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{40, 70}, {240, 128}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
+                                       <object class="IBUISegmentedControl" id="1050561189">
+                                               <reference key="NSNextResponder" ref="870953701"/>
+                                               <int key="NSvFlags">1316</int>
+                                               <object class="NSPSMatrix" key="NSFrameMatrix"/>
+                                               <string key="NSFrame">{{20, 45}, {280, 30}}</string>
+                                               <reference key="NSSuperview" ref="870953701"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="656557579"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <object class="NSColor" key="IBUIBackgroundColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MSAxIDEAA</bytes>
-                                               </object>
+                                               <reference key="NSNextKeyView" ref="67175984"/>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBSegmentControlStyle">2</int>
+                                               <int key="IBNumberOfSegments">5</int>
+                                               <int key="IBSelectedSegmentIndex">0</int>
+                                               <array key="IBSegmentTitles">
+                                                       <string>First</string>
+                                                       <string>Second</string>
+                                                       <string/>
+                                                       <string/>
+                                                       <string/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentWidths">
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentEnabledStates">
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentContentOffsets">
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentImages">
+                                                       <object class="NSNull" id="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                               </array>
+                                       </object>
+                                       <object class="IBUITextField" id="579035614">
+                                               <reference key="NSNextResponder" ref="870953701"/>
+                                               <int key="NSvFlags">1316</int>
+                                               <object class="NSPSMatrix" key="NSFrameMatrix"/>
+                                               <string key="NSFrame">{{20, 12}, {280, 30}}</string>
+                                               <reference key="NSSuperview" ref="870953701"/>
+                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="1050561189"/>
+                                               <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
-                                               <bool key="IBUIMultipleTouchEnabled">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText"/>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">speak</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <object class="NSColor" key="IBUITextColor" id="405439117">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MAA</bytes>
+                                               </object>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
                                                <object class="IBUITextInputTraits" key="IBUITextInputTraits">
-                                                       <int key="IBUIAutocapitalizationType">2</int>
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="568699873">
                                                        <int key="type">1</int>
                                                        <double key="pointSize">14</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="449070468">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">14</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
-                                       <object class="IBUIButton" id="656557579">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{104, 293}, {112, 37}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
+                                       <object class="IBUITextField" id="67175984">
+                                               <reference key="NSNextResponder" ref="870953701"/>
+                                               <int key="NSvFlags">1316</int>
+                                               <object class="NSPSMatrix" key="NSFrameMatrix"/>
+                                               <string key="NSFrame">{{20, 89}, {280, 30}}</string>
+                                               <reference key="NSSuperview" ref="870953701"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="207428595"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <reference key="NSNextKeyView" ref="279550971"/>
                                                <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <int key="IBUIContentHorizontalAlignment">0</int>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">TTS Chunks</string>
-                                               <object class="NSColor" key="IBUIHighlightedTitleColor" id="887489307">
-                                                       <int key="NSColorSpace">3</int>
-                                                       <bytes key="NSWhite">MQA</bytes>
-                                               </object>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
-                                               <object class="NSColor" key="IBUINormalTitleShadowColor" id="185679020">
-                                                       <int key="NSColorSpace">3</int>
-                                                       <bytes key="NSWhite">MC41AA</bytes>
-                                               </object>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="780732667">
-                                                       <int key="type">2</int>
-                                                       <double key="pointSize">15</double>
-                                               </object>
-                                               <object class="NSFont" key="IBUIFont" id="378141844">
-                                                       <string key="NSName">Helvetica-Bold</string>
-                                                       <double key="NSSize">15</double>
-                                                       <int key="NSfFlags">16</int>
+                                               <string key="IBUIText">INITIAL_JINGLE</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <reference key="IBUITextColor" ref="405439117"/>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIAutocorrectionType">1</int>
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
+                                               <reference key="IBUIFontDescription" ref="568699873"/>
+                                               <reference key="IBUIFont" ref="449070468"/>
                                        </object>
-                                       <object class="IBUIButton" id="207428595">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{112, 206}, {97, 37}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
+                                       <object class="IBUISegmentedControl" id="279550971">
+                                               <reference key="NSNextResponder" ref="870953701"/>
+                                               <int key="NSvFlags">1316</int>
+                                               <object class="NSPSMatrix" key="NSFrameMatrix"/>
+                                               <string key="NSFrame">{{20, 123}, {280, 30}}</string>
+                                               <reference key="NSSuperview" ref="870953701"/>
                                                <reference key="NSWindow"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <reference key="NSNextKeyView" ref="554381175"/>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBSegmentControlStyle">2</int>
+                                               <int key="IBNumberOfSegments">5</int>
+                                               <int key="IBSelectedSegmentIndex">3</int>
+                                               <array key="IBSegmentTitles">
+                                                       <string>First</string>
+                                                       <string>Second</string>
+                                                       <string/>
+                                                       <string/>
+                                                       <string/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentWidths">
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentEnabledStates">
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentContentOffsets">
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentImages">
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                               </array>
+                                       </object>
+                                       <object class="IBUITextField" id="554381175">
+                                               <reference key="NSNextResponder" ref="870953701"/>
+                                               <int key="NSvFlags">1316</int>
+                                               <object class="NSPSMatrix" key="NSFrameMatrix"/>
+                                               <string key="NSFrame">{{20, 169}, {280, 30}}</string>
+                                               <reference key="NSSuperview" ref="870953701"/>
+                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="591840860"/>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentVerticalAlignment">0</int>
-                                               <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Send RPC</string>
-                                               <reference key="IBUIHighlightedTitleColor" ref="887489307"/>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+                                               <string key="IBUIText">that was a jingle</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <reference key="IBUITextColor" ref="405439117"/>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
-                                               <reference key="IBUINormalTitleShadowColor" ref="185679020"/>
-                                               <reference key="IBUIFontDescription" ref="780732667"/>
-                                               <reference key="IBUIFont" ref="378141844"/>
-                                       </object>
-                                       <object class="IBUILabel" id="325640873">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 261}, {163, 21}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="IBUIFontDescription" ref="568699873"/>
+                                               <reference key="IBUIFont" ref="449070468"/>
+                                       </object>
+                                       <object class="IBUISegmentedControl" id="591840860">
+                                               <reference key="NSNextResponder" ref="870953701"/>
+                                               <int key="NSvFlags">1316</int>
+                                               <object class="NSPSMatrix" key="NSFrameMatrix"/>
+                                               <string key="NSFrame">{{20, 203}, {280, 30}}</string>
+                                               <reference key="NSSuperview" ref="870953701"/>
+                                               <reference key="NSWindow"/>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <int key="IBSegmentControlStyle">2</int>
+                                               <int key="IBNumberOfSegments">5</int>
+                                               <int key="IBSelectedSegmentIndex">0</int>
+                                               <array key="IBSegmentTitles">
+                                                       <string>First</string>
+                                                       <string>Second</string>
+                                                       <string/>
+                                                       <string/>
+                                                       <string/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentWidths">
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentEnabledStates">
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentContentOffsets">
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentImages">
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                               </array>
+                                       </object>
+                                       <object class="IBUITextField" id="908381639">
+                                               <reference key="NSNextResponder" ref="870953701"/>
+                                               <int key="NSvFlags">1316</int>
+                                               <object class="NSPSMatrix" key="NSFrameMatrix"/>
+                                               <string key="NSFrame">{{20, 250}, {280, 30}}</string>
+                                               <reference key="NSSuperview" ref="870953701"/>
                                                <reference key="NSWindow"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <reference key="NSNextKeyView" ref="9588920"/>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
-                                               <int key="IBUIContentMode">7</int>
-                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Example of Phoneme</string>
-                                               <reference key="IBUITextColor" ref="837634494"/>
-                                               <nil key="IBUIHighlightedColor"/>
-                                               <int key="IBUIBaselineAdjustment">0</int>
-                                               <float key="IBUIMinimumFontSize">10</float>
-                                               <reference key="IBUIFontDescription" ref="1058811025"/>
-                                               <reference key="IBUIFont" ref="932272439"/>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <string key="IBUIText">. 1 l ih v 1 .  _ l ay v .  r iy 1 d  . r eh d .</string>
+                                               <int key="IBUIBorderStyle">3</int>
+                                               <reference key="IBUITextColor" ref="405439117"/>
+                                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+                                               <float key="IBUIMinimumFontSize">17</float>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIAutocorrectionType">1</int>
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <reference key="IBUIFontDescription" ref="568699873"/>
+                                               <reference key="IBUIFont" ref="449070468"/>
+                                       </object>
+                                       <object class="IBUISegmentedControl" id="9588920">
+                                               <reference key="NSNextResponder" ref="870953701"/>
+                                               <int key="NSvFlags">1316</int>
+                                               <object class="NSPSMatrix" key="NSFrameMatrix"/>
+                                               <string key="NSFrame">{{20, 284}, {280, 30}}</string>
+                                               <reference key="NSSuperview" ref="870953701"/>
+                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="127216986"/>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <bool key="IBUIEnabled">NO</bool>
+                                               <int key="IBSegmentControlStyle">2</int>
+                                               <int key="IBNumberOfSegments">5</int>
+                                               <int key="IBSelectedSegmentIndex">1</int>
+                                               <array key="IBSegmentTitles">
+                                                       <string>First</string>
+                                                       <string>Second</string>
+                                                       <string/>
+                                                       <string/>
+                                                       <string/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentWidths">
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                                       <real value="0.0"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentEnabledStates">
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                                       <boolean value="YES"/>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentContentOffsets">
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                                       <string>{0, 0}</string>
+                                               </array>
+                                               <array class="NSMutableArray" key="IBSegmentImages">
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                                       <reference ref="4"/>
+                                               </array>
                                        </object>
                                </array>
+                               <object class="NSPSMatrix" key="NSFrameMatrix"/>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
                                <reference key="NSSuperview"/>
                                <reference key="NSWindow"/>
-                               <reference key="NSNextKeyView" ref="326554446"/>
+                               <reference key="NSNextKeyView" ref="579035614"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
                                        <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
@@ -194,148 +391,279 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
-                                               <string key="label">view</string>
-                                               <reference key="source" ref="372490531"/>
-                                               <reference key="destination" ref="191373211"/>
+                                               <string key="label">speechField1</string>
+                                               <reference key="source" ref="437767002"/>
+                                               <reference key="destination" ref="579035614"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">KCL-Ja-2E0</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
-                                               <string key="label">ttstext</string>
-                                               <reference key="source" ref="372490531"/>
-                                               <reference key="destination" ref="434246447"/>
+                                               <string key="label">speechField2</string>
+                                               <reference key="source" ref="437767002"/>
+                                               <reference key="destination" ref="67175984"/>
                                        </object>
-                                       <int key="connectionID">12</int>
+                                       <string key="id">tg7-Wb-Vjb</string>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">sendTTSChunks:</string>
-                                               <reference key="source" ref="656557579"/>
-                                               <reference key="destination" ref="372490531"/>
-                                               <int key="IBEventType">7</int>
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">speechField3</string>
+                                               <reference key="source" ref="437767002"/>
+                                               <reference key="destination" ref="554381175"/>
+                                       </object>
+                                       <string key="id">Dai-zz-UdT</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">speechField4</string>
+                                               <reference key="source" ref="437767002"/>
+                                               <reference key="destination" ref="908381639"/>
+                                       </object>
+                                       <string key="id">T74-Fg-Ad6</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">speechType1</string>
+                                               <reference key="source" ref="437767002"/>
+                                               <reference key="destination" ref="1050561189"/>
+                                       </object>
+                                       <string key="id">QZz-Hd-zgo</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">speechType2</string>
+                                               <reference key="source" ref="437767002"/>
+                                               <reference key="destination" ref="279550971"/>
+                                       </object>
+                                       <string key="id">1ij-w5-Mx5</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">speechType3</string>
+                                               <reference key="source" ref="437767002"/>
+                                               <reference key="destination" ref="591840860"/>
                                        </object>
-                                       <int key="connectionID">11</int>
+                                       <string key="id">X0H-wp-Fix</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">speechType4</string>
+                                               <reference key="source" ref="437767002"/>
+                                               <reference key="destination" ref="9588920"/>
+                                       </object>
+                                       <string key="id">fjT-7O-LNC</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="437767002"/>
+                                               <reference key="destination" ref="870953701"/>
+                                       </object>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">sendSpeakRPC:</string>
-                                               <reference key="source" ref="207428595"/>
-                                               <reference key="destination" ref="372490531"/>
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="127216986"/>
+                                               <reference key="destination" ref="437767002"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">10</int>
+                                       <string key="id">13</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
-                                               <reference key="children" ref="1000"/>
+                                               <reference key="children" ref="875102873"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
-                                               <reference key="object" ref="191373211"/>
-                                               <array class="NSMutableArray" key="children">
-                                                       <reference ref="434246447"/>
-                                                       <reference ref="326554446"/>
-                                                       <reference ref="207428595"/>
-                                                       <reference ref="656557579"/>
-                                                       <reference ref="325640873"/>
-                                               </array>
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="437767002"/>
                                                <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
-                                               <reference key="object" ref="372490531"/>
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="451354181"/>
                                                <reference key="parent" ref="0"/>
-                                               <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
-                                               <reference key="object" ref="975951072"/>
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="870953701"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="127216986"/>
+                                                       <reference ref="554381175"/>
+                                                       <reference ref="591840860"/>
+                                                       <reference ref="908381639"/>
+                                                       <reference ref="9588920"/>
+                                                       <reference ref="579035614"/>
+                                                       <reference ref="1050561189"/>
+                                                       <reference ref="67175984"/>
+                                                       <reference ref="279550971"/>
+                                               </array>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
-                                               <reference key="object" ref="326554446"/>
-                                               <reference key="parent" ref="191373211"/>
+                                               <string key="id">7</string>
+                                               <reference key="object" ref="127216986"/>
+                                               <reference key="parent" ref="870953701"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">OjG-21-jeN</string>
+                                               <reference key="object" ref="1050561189"/>
+                                               <reference key="parent" ref="870953701"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">CTo-eH-kMC</string>
+                                               <reference key="object" ref="579035614"/>
+                                               <reference key="parent" ref="870953701"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
-                                               <reference key="object" ref="434246447"/>
-                                               <reference key="parent" ref="191373211"/>
+                                               <string key="id">TML-33-yRm</string>
+                                               <reference key="object" ref="67175984"/>
+                                               <reference key="parent" ref="870953701"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
-                                               <reference key="object" ref="656557579"/>
-                                               <reference key="parent" ref="191373211"/>
+                                               <string key="id">Cse-1r-pRJ</string>
+                                               <reference key="object" ref="279550971"/>
+                                               <reference key="parent" ref="870953701"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">7</int>
-                                               <reference key="object" ref="207428595"/>
-                                               <reference key="parent" ref="191373211"/>
+                                               <string key="id">TkN-C6-oH9</string>
+                                               <reference key="object" ref="554381175"/>
+                                               <reference key="parent" ref="870953701"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">8</int>
-                                               <reference key="object" ref="325640873"/>
-                                               <reference key="parent" ref="191373211"/>
+                                               <string key="id">oVV-5M-Goa</string>
+                                               <reference key="object" ref="591840860"/>
+                                               <reference key="parent" ref="870953701"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">Tj0-8R-SSm</string>
+                                               <reference key="object" ref="908381639"/>
+                                               <reference key="parent" ref="870953701"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">ijF-rC-J2T</string>
+                                               <reference key="object" ref="9588920"/>
+                                               <reference key="parent" ref="870953701"/>
                                        </object>
                                </array>
                        </object>
                        <dictionary class="NSMutableDictionary" key="flattenedProperties">
                                <string key="-1.CustomClassName">SpeakViewController</string>
                                <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <boolean value="NO" key="-1.showNotes"/>
                                <string key="-2.CustomClassName">UIResponder</string>
                                <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <boolean value="NO" key="-2.showNotes"/>
                                <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <reference key="1.IBUserGuides" ref="0"/>
+                               <boolean value="NO" key="1.showNotes"/>
                                <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <reference key="7.IBUserGuides" ref="0"/>
+                               <boolean value="NO" key="7.showNotes"/>
+                               <string key="CTo-eH-kMC.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <reference key="CTo-eH-kMC.IBUserGuides" ref="0"/>
+                               <boolean value="NO" key="CTo-eH-kMC.showNotes"/>
+                               <string key="Cse-1r-pRJ.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <reference key="Cse-1r-pRJ.IBUserGuides" ref="0"/>
+                               <integer value="3" key="Cse-1r-pRJ.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/>
+                               <boolean value="NO" key="Cse-1r-pRJ.showNotes"/>
+                               <string key="OjG-21-jeN.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <reference key="OjG-21-jeN.IBUserGuides" ref="0"/>
+                               <integer value="0" key="OjG-21-jeN.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/>
+                               <boolean value="NO" key="OjG-21-jeN.showNotes"/>
+                               <string key="TML-33-yRm.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <reference key="TML-33-yRm.IBUserGuides" ref="0"/>
+                               <boolean value="NO" key="TML-33-yRm.showNotes"/>
+                               <string key="Tj0-8R-SSm.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <reference key="Tj0-8R-SSm.IBUserGuides" ref="0"/>
+                               <boolean value="NO" key="Tj0-8R-SSm.showNotes"/>
+                               <string key="TkN-C6-oH9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <reference key="TkN-C6-oH9.IBUserGuides" ref="0"/>
+                               <boolean value="NO" key="TkN-C6-oH9.showNotes"/>
+                               <string key="ijF-rC-J2T.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <reference key="ijF-rC-J2T.IBUserGuides" ref="0"/>
+                               <integer value="1" key="ijF-rC-J2T.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/>
+                               <boolean value="NO" key="ijF-rC-J2T.showNotes"/>
+                               <string key="oVV-5M-Goa.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <reference key="oVV-5M-Goa.IBUserGuides" ref="0"/>
+                               <integer value="0" key="oVV-5M-Goa.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/>
+                               <boolean value="NO" key="oVV-5M-Goa.showNotes"/>
                        </dictionary>
                        <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">12</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <array class="NSMutableArray" key="referencedPartialClassDescriptions">
                                <object class="IBPartialClassDescription">
                                        <string key="className">SpeakViewController</string>
                                        <string key="superclassName">UIViewController</string>
-                                       <dictionary class="NSMutableDictionary" key="actions">
-                                               <string key="sendSpeakRPC:">id</string>
-                                               <string key="sendTTSChunks:">id</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="actionInfosByName">
-                                               <object class="IBActionInfo" key="sendSpeakRPC:">
-                                                       <string key="name">sendSpeakRPC:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                               <object class="IBActionInfo" key="sendTTSChunks:">
-                                                       <string key="name">sendTTSChunks:</string>
+                                       <object class="NSMutableDictionary" key="actions">
+                                               <string key="NS.key.0">sendRPC:</string>
+                                               <string key="NS.object.0">id</string>
+                                       </object>
+                                       <object class="NSMutableDictionary" key="actionInfosByName">
+                                               <string key="NS.key.0">sendRPC:</string>
+                                               <object class="IBActionInfo" key="NS.object.0">
+                                                       <string key="name">sendRPC:</string>
                                                        <string key="candidateClassName">id</string>
                                                </object>
+                                       </object>
+                                       <dictionary class="NSMutableDictionary" key="outlets">
+                                               <string key="speechField1">UITextField</string>
+                                               <string key="speechField2">UITextField</string>
+                                               <string key="speechField3">UITextField</string>
+                                               <string key="speechField4">UITextField</string>
+                                               <string key="speechType1">UISegmentedControl</string>
+                                               <string key="speechType2">UISegmentedControl</string>
+                                               <string key="speechType3">UISegmentedControl</string>
+                                               <string key="speechType4">UISegmentedControl</string>
                                        </dictionary>
-                                       <object class="NSMutableDictionary" key="outlets">
-                                               <string key="NS.key.0">ttstext</string>
-                                               <string key="NS.object.0">UITextView</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <string key="NS.key.0">ttstext</string>
-                                               <object class="IBToOneOutletInfo" key="NS.object.0">
-                                                       <string key="name">ttstext</string>
-                                                       <string key="candidateClassName">UITextView</string>
+                                       <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+                                               <object class="IBToOneOutletInfo" key="speechField1">
+                                                       <string key="name">speechField1</string>
+                                                       <string key="candidateClassName">UITextField</string>
                                                </object>
-                                       </object>
+                                               <object class="IBToOneOutletInfo" key="speechField2">
+                                                       <string key="name">speechField2</string>
+                                                       <string key="candidateClassName">UITextField</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="speechField3">
+                                                       <string key="name">speechField3</string>
+                                                       <string key="candidateClassName">UITextField</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="speechField4">
+                                                       <string key="name">speechField4</string>
+                                                       <string key="candidateClassName">UITextField</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="speechType1">
+                                                       <string key="name">speechType1</string>
+                                                       <string key="candidateClassName">UISegmentedControl</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="speechType2">
+                                                       <string key="name">speechType2</string>
+                                                       <string key="candidateClassName">UISegmentedControl</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="speechType3">
+                                                       <string key="name">speechType3</string>
+                                                       <string key="candidateClassName">UISegmentedControl</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="speechType4">
+                                                       <string key="name">speechType4</string>
+                                                       <string key="candidateClassName">UISegmentedControl</string>
+                                               </object>
+                                       </dictionary>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
                                                <string key="minorKey">./Classes/SpeakViewController.h</string>
@@ -345,12 +673,17 @@
                </object>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeButtonViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeButtonViewController.h
index 055548e..716eabb 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeButtonViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeButtonViewController.h
@@ -1,20 +1,19 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SubscribeButtonViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
-#import "SDLButtonName.h"
+#import <SmartDeviceLink/SmartDeviceLink.h>
+
+#import "SmartDeviceLinkTester.h"
 
 @interface SubscribeButtonViewController : UIViewController <UITableViewDataSource, UITableViewDelegate> {
     
-    
     NSMutableArray *buttonList;
     IBOutlet UITableView *buttonTable;
     
 }
 
-
 @end
 
-NSMutableArray *selectedButtons;
+NSMutableArray *selectedButtons;
\ No newline at end of file

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeButtonViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeButtonViewController.m
index fa1255e..bca05b9 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeButtonViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeButtonViewController.m
@@ -1,8 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  SubscribeButtonViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "SubscribeButtonViewController.h"
+#import "AppDelegate.h"
 
 @interface SubscribeButtonViewController ()
 
@@ -62,7 +63,14 @@
         buttonSelected = [SDLButtonName PRESET_9];
     }
     
-    [[SDLBrain getInstance] subscribeButtonPressed:buttonSelected];
+    [[SmartDeviceLinkTester getInstance] subscribeButtonPressed:buttonSelected];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
 }
 
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeButtonViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeButtonViewController.xib
index 7b77667..5b79168 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeButtonViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeButtonViewController.xib
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
                        <string>IBProxyObject</string>
-                       <string>IBUIView</string>
                        <string>IBUITableView</string>
+                       <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -32,7 +32,7 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="IBUITableView" id="369649950">
@@ -40,7 +40,6 @@
                                                <int key="NSvFlags">274</int>
                                                <string key="NSFrameSize">{320, 367}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <object class="NSColor" key="IBUIBackgroundColor">
                                                        <int key="NSColorSpace">1</int>
@@ -59,9 +58,6 @@
                                        </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
-                               <reference key="NSNextKeyView"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
                                        <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
@@ -75,6 +71,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -82,7 +79,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -90,19 +87,19 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="369649950"/>
                                        </object>
-                                       <int key="connectionID">6</int>
+                                       <string key="id">6</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="369649950"/>
@@ -110,18 +107,18 @@
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
+                                               <string key="id">4</string>
                                                <reference key="object" ref="369649950"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
@@ -140,39 +137,21 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">6</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">SubscribeButtonViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <object class="NSMutableDictionary" key="outlets">
-                                               <string key="NS.key.0">buttonTable</string>
-                                               <string key="NS.object.0">UITableView</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <string key="NS.key.0">buttonTable</string>
-                                               <object class="IBToOneOutletInfo" key="NS.object.0">
-                                                       <string key="name">buttonTable</string>
-                                                       <string key="candidateClassName">UITableView</string>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/SubscribeButtonViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeVehicleDataViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeVehicleDataViewController.h
new file mode 100644 (file)
index 0000000..ded533c
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeVehicleDataViewController.h
@@ -0,0 +1,17 @@
+//  SubscribeVehicleDataViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+
+@interface SubscribeVehicleDataViewController : UIViewController <UITableViewDataSource, UITableViewDelegate> {
+    
+    NSMutableArray *vehicleDataList;
+    IBOutlet UITableView *vehicleDataTable;
+    
+}
+
+@end
+
+NSMutableArray *selectedVehicleData;

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeVehicleDataViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeVehicleDataViewController.m
new file mode 100644 (file)
index 0000000..437d5c5
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeVehicleDataViewController.m
@@ -0,0 +1,188 @@
+//  SubscribeVehicleDataViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "SubscribeVehicleDataViewController.h"
+#import "AppDelegate.h"
+
+@interface SubscribeVehicleDataViewController ()
+
+@end
+
+@implementation SubscribeVehicleDataViewController
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+    NSString *chosenVehicleData =  cell.textLabel.text;
+    [selectedVehicleData addObject:chosenVehicleData];
+    
+    SDLSubscribeVehicleData *req = [[SDLSubscribeVehicleData alloc] init];
+    
+    if ([chosenVehicleData isEqualToString:@"GPS"]) {
+        req.gps = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"Speed"]) {
+        req.speed = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"RPM"]) {
+        req.rpm = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"FuelLevel"]) {
+        req.fuelLevel = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"FuelLevelState"]) {
+        req.fuelLevelState = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"InstantFuelConsuption"]) {
+        req.instantFuelConsumption = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"ExternalTemperature"]) {
+        req.externalTemperature = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"PRNDL"]) {
+        req.prndl = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"TirePressure"]) {
+        req.tirePressure = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"Odometer"]) {
+        req.odometer = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"BeltStatus"]) {
+        req.beltStatus = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"BodyInformation"]) {
+        req.bodyInformation = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"DeviceStatus"]) {
+        req.deviceStatus = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"DriverBraking"]) {
+        req.driverBraking = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"WiperStatus"]) {
+        req.wiperStatus = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"HeadLampStatus"]) {
+        req.headLampStatus = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"EngineTorque"]) {
+        req.engineTorque = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"AccPedalPosition"]) {
+        req.accPedalPosition = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"SteeringWheelAngle"]) {
+        req.steeringWheelAngle = [NSNumber numberWithBool:true];
+    }
+    
+    req.correlationID = [[SmartDeviceLinkTester getInstance] getNextCorrID];
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"SubscribeVehicleDataRequest" object:req]];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+    
+    [req release];
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+    return @"Select Vehicle Data";
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return [vehicleDataList count]; 
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    static NSString *CellIdentifier = @"Cell";
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+    
+    if (cell == nil) { 
+        cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; 
+    } 
+    
+    // Configure the cell. 
+    cell.textLabel.text = [vehicleDataList objectAtIndex:indexPath.row]; 
+    
+    return cell;
+}
+
+
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"SubscribeVehicleData";
+    
+    NSArray *tempArray = [NSArray arrayWithObjects: @"GPS",
+                          @"Speed",
+                          @"RPM",
+                          @"FuelLevel",
+                          @"FuelLevelState",
+                          @"InstantFuelConsuption",
+                          @"ExternalTemperature",
+                          @"PRNDL",
+                          @"TirePressure",
+                          @"Odometer",
+                          @"BeltStatus",
+                          @"BodyInformation",
+                          @"DeviceStatus",
+                          @"DriverBraking",
+                          @"WiperStatus",
+                          @"HeadLampStatus",
+                          @"EngineTorque",
+                          @"AccPedalPosition",
+                          @"SteeringWheelAngle",
+                          nil];
+    
+    vehicleDataList = [[NSMutableArray alloc] init];
+    [vehicleDataList addObjectsFromArray:tempArray];
+    
+    selectedVehicleData = [[NSMutableArray alloc] init];
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+-(void)dealloc {
+    [vehicleDataList release];
+    [selectedVehicleData release];
+    [super dealloc];
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    vehicleDataTable.delegate = self;
+    vehicleDataTable.dataSource = self;
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeVehicleDataViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeVehicleDataViewController.xib
new file mode 100644 (file)
index 0000000..1609d22
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/SubscribeVehicleDataViewController.xib
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+       <data>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       <string key="NS.object.0">3742</string>
+               </object>
+               <array key="IBDocument.IntegratedClassDependencies">
+                       <string>IBProxyObject</string>
+                       <string>IBUITableView</string>
+                       <string>IBUIView</string>
+               </array>
+               <array key="IBDocument.PluginDependencies">
+                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+               </array>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                       <integer value="1" key="NS.object.0"/>
+               </object>
+               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <object class="IBProxyObject" id="372490531">
+                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBProxyObject" id="975951072">
+                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+                       <object class="IBUIView" id="191373211">
+                               <nil key="NSNextResponder"/>
+                               <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUITableView" id="369649950">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">274</int>
+                                               <string key="NSFrameSize">{320, 367}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <object class="NSColor" key="IBUIBackgroundColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                                               </object>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <bool key="IBUIAlwaysBounceVertical">YES</bool>
+                                               <int key="IBUIStyle">1</int>
+                                               <int key="IBUISeparatorStyle">2</int>
+                                               <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+                                               <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+                                               <float key="IBUIRowHeight">44</float>
+                                               <float key="IBUISectionHeaderHeight">10</float>
+                                               <float key="IBUISectionFooterHeight">10</float>
+                                       </object>
+                               </array>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
+                               <reference key="NSNextKeyView" ref="369649950"/>
+                               <object class="NSColor" key="IBUIBackgroundColor">
+                                       <int key="NSColorSpace">1</int>
+                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                               </object>
+                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
+                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                       </object>
+               </array>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
+                       <array class="NSMutableArray" key="connectionRecords">
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">view</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="191373211"/>
+                                       </object>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">vehicleDataTable</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="369649950"/>
+                                       </object>
+                                       <string key="id">7</string>
+                               </object>
+                       </array>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <array key="orderedObjects">
+                                       <object class="IBObjectRecord">
+                                               <string key="id">0</string>
+                                               <array key="object" id="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">1</string>
+                                               <reference key="object" ref="191373211"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="369649950"/>
+                                               </array>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-1</string>
+                                               <reference key="object" ref="372490531"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">-2</string>
+                                               <reference key="object" ref="975951072"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">4</string>
+                                               <reference key="object" ref="369649950"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                               </array>
+                       </object>
+                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
+                               <string key="-1.CustomClassName">SubscribeVehicleDataViewController</string>
+                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="-2.CustomClassName">UIResponder</string>
+                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <dictionary class="NSMutableDictionary" key="4.IBAttributePlaceholdersKey"/>
+                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                       </dictionary>
+                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+                       <nil key="activeLocalization"/>
+                       <dictionary class="NSMutableDictionary" key="localizations"/>
+                       <nil key="sourceID"/>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
+       </data>
+</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnregisterAppInterfaceViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnregisterAppInterfaceViewController.h
index 325a022..5f89b79 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnregisterAppInterfaceViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnregisterAppInterfaceViewController.h
@@ -1,13 +1,13 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  UnregisterAppInterfaceViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
+#import "SmartDeviceLinkTester.h"
 
 @interface UnregisterAppInterfaceViewController : UIViewController
 
 
--(IBAction)unregisterAppInterfacePressed:(id)sender;
+-(IBAction)sendRPC:(id)sender;
 
 @end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnregisterAppInterfaceViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnregisterAppInterfaceViewController.m
index b382073..b1aeb7f 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnregisterAppInterfaceViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnregisterAppInterfaceViewController.m
@@ -1,8 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  UnregisterAppInterfaceViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "UnregisterAppInterfaceViewController.h"
+#import "AppDelegate.h"
 
 @interface UnregisterAppInterfaceViewController ()
 
@@ -10,8 +11,18 @@
 
 @implementation UnregisterAppInterfaceViewController
 
--(IBAction)unregisterAppInterfacePressed:(id)sender {
-    [[SDLBrain getInstance] unregisterAppInterfacePressed];
+-(IBAction)sendRPC:(id)sender; {
+    
+    SDLUnregisterAppInterface *req = [SDLRPCRequestFactory buildUnregisterAppInterfaceWithCorrelationID: [[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
 }
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnregisterAppInterfaceViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnregisterAppInterfaceViewController.xib
index c5dd387..ba858b7 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnregisterAppInterfaceViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnregisterAppInterfaceViewController.xib
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
                        <string>IBProxyObject</string>
-                       <string>IBUIView</string>
                        <string>IBUIButton</string>
+                       <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -32,7 +32,7 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="IBUIButton" id="208393230">
@@ -40,22 +40,21 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{60, 165}, {201, 37}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentHorizontalAlignment">0</int>
                                                <int key="IBUIContentVerticalAlignment">0</int>
                                                <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Unregister App Interface</string>
+                                               <object class="NSColor" key="IBUINormalTitleColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+                                               </object>
                                                <object class="NSColor" key="IBUIHighlightedTitleColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MQA</bytes>
                                                </object>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
+                                               <string key="IBUINormalTitle">Unregister App Interface</string>
                                                <object class="NSColor" key="IBUINormalTitleShadowColor">
                                                        <int key="NSColorSpace">3</int>
                                                        <bytes key="NSWhite">MC41AA</bytes>
@@ -65,15 +64,13 @@
                                                        <double key="pointSize">15</double>
                                                </object>
                                                <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica-Bold</string>
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
                                                        <double key="NSSize">15</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <reference key="NSNextKeyView" ref="208393230"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
@@ -88,6 +85,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -95,28 +93,28 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">unregisterAppInterfacePressed:</string>
+                                               <string key="label">sendRPC:</string>
                                                <reference key="source" ref="208393230"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">6</int>
+                                       <string key="id">7</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="208393230"/>
@@ -124,18 +122,18 @@
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
+                                               <string key="id">4</string>
                                                <reference key="object" ref="208393230"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
@@ -153,39 +151,21 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">6</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">UnregisterAppInterfaceViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <string key="NS.key.0">unregisterAppInterfacePressed:</string>
-                                               <string key="NS.object.0">id</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">unregisterAppInterfacePressed:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">unregisterAppInterfacePressed:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/UnregisterAppInterfaceViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeButtonViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeButtonViewController.h
index 5a7aec0..98ea04e 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeButtonViewController.h
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeButtonViewController.h
@@ -1,9 +1,9 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  UnsubscribeButtonViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>
-#import "SDLBrain.h"
+#import "SmartDeviceLinkTester.h"
 #import "SubscribeButtonViewController.h"
 
 @interface UnsubscribeButtonViewController : UIViewController <UITableViewDataSource, UITableViewDelegate> {

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeButtonViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeButtonViewController.m
index 1f47128..2fc55f0 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeButtonViewController.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeButtonViewController.m
@@ -1,6 +1,6 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  UnsubscribeButtonViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import "UnsubscribeButtonViewController.h"
 
@@ -68,7 +68,7 @@
         buttonSelected = [SDLButtonName PRESET_9];
     }
     
-    [[SDLBrain getInstance] unsubscribeButtonPressed:buttonSelected];
+    [[SmartDeviceLinkTester getInstance] unsubscribeButtonPressed:buttonSelected];
     [self updateTable];
 }
 

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeButtonViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeButtonViewController.xib
index e71176c..8f0997c 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeButtonViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeButtonViewController.xib
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
                        <string>IBProxyObject</string>
-                       <string>IBUIView</string>
                        <string>IBUITableView</string>
+                       <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -32,7 +32,7 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="IBUITableView" id="87901092">
@@ -40,7 +40,6 @@
                                                <int key="NSvFlags">274</int>
                                                <string key="NSFrameSize">{320, 367}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <object class="NSColor" key="IBUIBackgroundColor">
                                                        <int key="NSColorSpace">1</int>
@@ -59,8 +58,6 @@
                                        </object>
                                </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
                                        <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
@@ -74,6 +71,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -81,7 +79,7 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -89,19 +87,19 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="87901092"/>
                                        </object>
-                                       <int key="connectionID">5</int>
+                                       <string key="id">5</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="87901092"/>
@@ -109,18 +107,18 @@
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
+                                               <string key="id">4</string>
                                                <reference key="object" ref="87901092"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
@@ -138,39 +136,21 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">5</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">UnsubscribeButtonViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <object class="NSMutableDictionary" key="outlets">
-                                               <string key="NS.key.0">buttonTable</string>
-                                               <string key="NS.object.0">UITableView</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <string key="NS.key.0">buttonTable</string>
-                                               <object class="IBToOneOutletInfo" key="NS.object.0">
-                                                       <string key="name">buttonTable</string>
-                                                       <string key="candidateClassName">UITableView</string>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/UnsubscribeButtonViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
                </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeVehicleDataViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeVehicleDataViewController.h
new file mode 100644 (file)
index 0000000..9a3b125
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeVehicleDataViewController.h
@@ -0,0 +1,15 @@
+//  UnsubscribeVehicleDataViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+#import "SubscribeVehicleDataViewController.h"
+
+@interface UnsubscribeVehicleDataViewController : UIViewController <UITableViewDataSource, UITableViewDelegate> {
+    
+    IBOutlet UITableView *vehicleDataTable;
+    
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeVehicleDataViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeVehicleDataViewController.m
new file mode 100644 (file)
index 0000000..a5b054e
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeVehicleDataViewController.m
@@ -0,0 +1,155 @@
+//  UnsubscribeVehicleDataViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "UnsubscribeVehicleDataViewController.h"
+
+@interface UnsubscribeVehicleDataViewController ()
+
+-(void)updateTable;
+
+@end
+
+@implementation UnsubscribeVehicleDataViewController
+
+-(void)updateTable {
+    [vehicleDataTable reloadData];
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+    NSString *chosenVehicleData =  cell.textLabel.text;
+    [selectedVehicleData removeObject:chosenVehicleData];
+
+    SDLUnsubscribeVehicleData *req = [[SDLUnsubscribeVehicleData alloc] init];
+    
+    if ([chosenVehicleData isEqualToString:@"GPS"]) {
+        req.gps = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"Speed"]) {
+        req.speed = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"RPM"]) {
+        req.rpm = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"FuelLevel"]) {
+        req.fuelLevel = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"FuelLevelState"]) {
+        req.fuelLevelState = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"InstantFuelConsuption"]) {
+        req.instantFuelConsumption = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"ExternalTemperature"]) {
+        req.externalTemperature = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"PRNDL"]) {
+        req.prndl = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"TirePressure"]) {
+        req.tirePressure = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"Odometer"]) {
+        req.odometer = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"BeltStatus"]) {
+        req.beltStatus = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"BodyInformation"]) {
+        req.bodyInformation = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"DeviceStatus"]) {
+        req.deviceStatus = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"DriverBraking"]) {
+        req.driverBraking = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"WiperStatus"]) {
+        req.wiperStatus = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"HeadLampStatus"]) {
+        req.headLampStatus = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"EngineTorque"]) {
+        req.engineTorque = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"AccPedalPosition"]) {
+        req.accPedalPosition = [NSNumber numberWithBool:true];
+    }
+    else if ([chosenVehicleData isEqualToString:@"SteeringWheelAngle"]) {
+        req.steeringWheelAngle = [NSNumber numberWithBool:true];
+    }
+    
+    req.correlationID = [[SmartDeviceLinkTester getInstance] getNextCorrID];
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    [self updateTable];
+    
+    [req release];
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+    return @"Select Vehicle Data";
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return [selectedVehicleData count]; 
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    static NSString *CellIdentifier = @"Cell";
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+    
+    if (cell == nil) { 
+        cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; 
+    } 
+    
+    // Configure the cell. 
+    cell.textLabel.text = [selectedVehicleData objectAtIndex:indexPath.row]; 
+    
+    return cell;
+}
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"UnsubscribeVehicleData";
+    
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateTable) name:@"SubscribeVehicleDataRequest" object:nil];
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    vehicleDataTable.delegate = self;
+    vehicleDataTable.dataSource = self;
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/RPCTestViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeVehicleDataViewController.xib
similarity index 59%
rename from SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/RPCTestViewController.xib
rename to SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeVehicleDataViewController.xib
index a8d5907..363347f 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/RPCTestViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UnsubscribeVehicleDataViewController.xib
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
-               <int key="IBDocument.SystemTarget">1296</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <int key="IBDocument.SystemTarget">1280</int>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
                        <string>IBProxyObject</string>
+                       <string>IBUITableView</string>
                        <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
@@ -31,11 +32,32 @@
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
                        <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
+                               <array class="NSMutableArray" key="NSSubviews">
+                                       <object class="IBUITableView" id="87901092">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">274</int>
+                                               <string key="NSFrameSize">{320, 367}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <object class="NSColor" key="IBUIBackgroundColor">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
+                                               </object>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <bool key="IBUIAlwaysBounceVertical">YES</bool>
+                                               <int key="IBUIStyle">1</int>
+                                               <int key="IBUISeparatorStyle">2</int>
+                                               <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+                                               <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+                                               <float key="IBUIRowHeight">44</float>
+                                               <float key="IBUISectionHeaderHeight">10</float>
+                                               <float key="IBUISectionFooterHeight">10</float>
+                                       </object>
+                               </array>
                                <string key="NSFrame">{{0, 64}, {320, 367}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSNextKeyView"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
                                        <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
@@ -49,6 +71,7 @@
                        </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -56,58 +79,78 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBCocoaTouchOutletConnection" key="connection">
+                                               <string key="label">vehicleDataTable</string>
+                                               <reference key="source" ref="372490531"/>
+                                               <reference key="destination" ref="87901092"/>
+                                       </object>
+                                       <string key="id">6</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
-                                               <array class="NSMutableArray" key="children"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="87901092"/>
+                                               </array>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">4</string>
+                                               <reference key="object" ref="87901092"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
                                </array>
                        </object>
                        <dictionary class="NSMutableDictionary" key="flattenedProperties">
-                               <string key="-1.CustomClassName">RPCTestViewController</string>
+                               <string key="-1.CustomClassName">UnsubscribeVehicleDataViewController</string>
                                <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="-2.CustomClassName">UIResponder</string>
                                <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                        </dictionary>
                        <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">5</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes"/>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1296" key="NS.object.0"/>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UpdateTurnListViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UpdateTurnListViewController.h
new file mode 100644 (file)
index 0000000..64248bc
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UpdateTurnListViewController.h
@@ -0,0 +1,20 @@
+//  UpdateTurnListViewController.h
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import <UIKit/UIKit.h>
+#import "SmartDeviceLinkTester.h"
+#import "SoftButtonListViewController.h"
+
+@interface UpdateTurnListViewController : UIViewController <UITextViewDelegate> {
+ 
+    IBOutlet UITextView *turnView;
+    IBOutlet UITextView *iconView;
+    
+    SoftButtonListViewController *softButtonListViewController;
+}
+
+-(IBAction)sendRPC:(id)sender;
+-(IBAction)softButtons:(id)sender;
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UpdateTurnListViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UpdateTurnListViewController.m
new file mode 100644 (file)
index 0000000..315ede0
--- /dev/null
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UpdateTurnListViewController.m
@@ -0,0 +1,111 @@
+//  UpdateTurnListViewController.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
+
+#import "UpdateTurnListViewController.h"
+#import "AppDelegate.h"
+
+@interface UpdateTurnListViewController ()
+
+@end
+
+@implementation UpdateTurnListViewController
+
+NSMutableArray *sbList;
+
+-(IBAction)sendRPC:(id)sender {
+    
+    NSArray *tempTurns = [[turnView text] componentsSeparatedByString:@", "];
+    NSArray *tempIcons = [[iconView text] componentsSeparatedByString:@", "];
+                                    
+    NSMutableArray *tempTurnArray = [[NSMutableArray alloc] init];
+    
+    int i = 0;
+    for (NSString *string in tempTurns) {
+        SDLTurn *currentTurn = [[SDLTurn alloc] init];
+        SDLImage *currentImage = [[SDLImage alloc] init];
+        currentTurn.navigationText = string;
+        currentImage.value = [tempIcons objectAtIndex:i];
+        currentImage.imageType = [SDLImageType STATIC];
+        currentTurn.turnIcon = currentImage;
+        [tempTurnArray addObject:currentTurn];
+        i++;
+        [currentTurn release];
+        [currentImage release];
+    }
+    
+    SDLUpdateTurnList *req = [SDLRPCRequestFactory buildUpdateTurnList:tempTurnArray softButtons:sbList correlationID:[[SmartDeviceLinkTester getInstance] getNextCorrID]];
+    
+    [tempTurnArray release];
+    
+    [[SmartDeviceLinkTester getInstance] sendAndPostRPCMessage:req];
+    
+    //Go Back To RPC List View
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //Go To Console View
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    appDelegate.tabBarController.selectedViewController = [appDelegate.tabBarController.viewControllers objectAtIndex:1];
+}
+
+- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
+    
+    if([text isEqualToString:@"\n"]) {
+        [textView resignFirstResponder];
+        return NO;
+    }
+    
+    return YES;
+}
+
+-(IBAction)softButtons:(id)sender {
+    [softButtonListViewController updateList:sbList];
+    [self.navigationController pushViewController:softButtonListViewController animated:YES];
+}
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self.title = @"UpdateTurnList";
+    
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+        softButtonListViewController = [[SoftButtonListViewController alloc] initWithNibName:@"SoftButtonListViewController" bundle:nil];
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    turnView.delegate = self;
+    iconView.delegate = self;
+    
+    [[turnView layer] setCornerRadius:10];
+    [[iconView layer] setCornerRadius:10];
+    
+    //Example Soft Buttons
+    SDLSoftButton *sb1 = [[[SDLSoftButton alloc] init] autorelease];
+    sb1.softButtonID = [NSNumber numberWithInt:5511];
+    sb1.text = @"Close";
+    sb1.type = [SDLSoftButtonType TEXT];
+    sb1.isHighlighted = [NSNumber numberWithBool:false];
+    sb1.systemAction = [SDLSystemAction DEFAULT_ACTION];
+    
+    sbList = [[NSMutableArray alloc] initWithObjects:sb1,nil];
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AutoTestViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UpdateTurnListViewController.xib
similarity index 55%
rename from SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AutoTestViewController.xib
rename to SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UpdateTurnListViewController.xib
index 3de53a7..848d585 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/AutoTestViewController.xib
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UpdateTurnListViewController.xib
@@ -2,20 +2,20 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
        <data>
                <int key="IBDocument.SystemTarget">1280</int>
-               <string key="IBDocument.SystemVersion">11E53</string>
-               <string key="IBDocument.InterfaceBuilderVersion">2182</string>
-               <string key="IBDocument.AppKitVersion">1138.47</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
+               <string key="IBDocument.SystemVersion">12F45</string>
+               <string key="IBDocument.InterfaceBuilderVersion">4510</string>
+               <string key="IBDocument.AppKitVersion">1187.40</string>
+               <string key="IBDocument.HIToolboxVersion">626.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">1181</string>
+                       <string key="NS.object.0">3742</string>
                </object>
                <array key="IBDocument.IntegratedClassDependencies">
-                       <string>IBUITextView</string>
+                       <string>IBProxyObject</string>
                        <string>IBUIButton</string>
-                       <string>IBUIView</string>
                        <string>IBUILabel</string>
-                       <string>IBProxyObject</string>
+                       <string>IBUITextView</string>
+                       <string>IBUIView</string>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -37,231 +37,232 @@
                                <reference key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <array class="NSMutableArray" key="NSSubviews">
-                                       <object class="IBUILabel" id="325732204">
+                                       <object class="IBUIButton" id="496830156">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{65, 11}, {191, 43}}</string>
+                                               <string key="NSFrame">{{112, 310}, {97, 37}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="198997429"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
-                                               <bool key="IBUIClipsSubviews">YES</bool>
-                                               <int key="IBUIContentMode">7</int>
-                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Automated Testing</string>
-                                               <object class="NSColor" key="IBUITextColor" id="273970815">
+                                               <int key="IBUIContentHorizontalAlignment">0</int>
+                                               <int key="IBUIContentVerticalAlignment">0</int>
+                                               <int key="IBUIButtonType">1</int>
+                                               <object class="NSColor" key="IBUINormalTitleColor" id="704228660">
                                                        <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
                                                </object>
-                                               <nil key="IBUIHighlightedColor"/>
-                                               <int key="IBUIBaselineAdjustment">0</int>
-                                               <float key="IBUIMinimumFontSize">10</float>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
-                                                       <string key="name">MarkerFelt-Thin</string>
-                                                       <string key="family">Marker Felt</string>
-                                                       <int key="traits">0</int>
-                                                       <double key="pointSize">34</double>
+                                               <object class="NSColor" key="IBUIHighlightedTitleColor" id="558694624">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MQA</bytes>
+                                               </object>
+                                               <string key="IBUINormalTitle">Send RPC</string>
+                                               <object class="NSColor" key="IBUINormalTitleShadowColor" id="633481866">
+                                                       <int key="NSColorSpace">3</int>
+                                                       <bytes key="NSWhite">MC41AA</bytes>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="748156101">
+                                                       <int key="type">2</int>
+                                                       <double key="pointSize">15</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">MarkerFelt-Thin</string>
-                                                       <double key="NSSize">34</double>
+                                               <object class="NSFont" key="IBUIFont" id="712520485">
+                                                       <string key="NSName">HelveticaNeue-Bold</string>
+                                                       <double key="NSSize">15</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
-                                       <object class="IBUIButton" id="350471490">
+                                       <object class="IBUIButton" id="889589024">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 223}, {280, 35}}</string>
+                                               <string key="NSFrame">{{110, 256}, {99, 36}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="277629924"/>
+                                               <reference key="NSNextKeyView" ref="496830156"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                <int key="IBUIContentHorizontalAlignment">0</int>
                                                <int key="IBUIContentVerticalAlignment">0</int>
                                                <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Begin Automated Testing</string>
-                                               <object class="NSColor" key="IBUIHighlightedTitleColor">
-                                                       <int key="NSColorSpace">3</int>
-                                                       <bytes key="NSWhite">MQA</bytes>
-                                               </object>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
-                                               <object class="NSColor" key="IBUINormalTitleShadowColor">
-                                                       <int key="NSColorSpace">3</int>
-                                                       <bytes key="NSWhite">MC41AA</bytes>
-                                               </object>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
-                                                       <int key="type">2</int>
-                                                       <double key="pointSize">15</double>
-                                               </object>
-                                               <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica-Bold</string>
-                                                       <double key="NSSize">15</double>
-                                                       <int key="NSfFlags">16</int>
-                                               </object>
+                                               <reference key="IBUINormalTitleColor" ref="704228660"/>
+                                               <reference key="IBUIHighlightedTitleColor" ref="558694624"/>
+                                               <string key="IBUINormalTitle">Soft Buttons</string>
+                                               <reference key="IBUINormalTitleShadowColor" ref="633481866"/>
+                                               <reference key="IBUIFontDescription" ref="748156101"/>
+                                               <reference key="IBUIFont" ref="712520485"/>
                                        </object>
-                                       <object class="IBUILabel" id="198997429">
+                                       <object class="IBUILabel" id="445080585">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 63}, {90, 21}}</string>
+                                               <string key="NSFrame">{{20, 7}, {67, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="470608787"/>
+                                               <reference key="NSNextKeyView" ref="242446256"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <int key="IBUIContentMode">7</int>
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">XML Script:</string>
-                                               <reference key="IBUITextColor" ref="273970815"/>
+                                               <string key="IBUIText">Turn List</string>
+                                               <object class="NSColor" key="IBUITextColor" id="83775735">
+                                                       <int key="NSColorSpace">1</int>
+                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
+                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
+                                               </object>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="823999025">
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="878946683">
                                                        <int key="type">1</int>
                                                        <double key="pointSize">17</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont" id="455079651">
-                                                       <string key="NSName">Helvetica</string>
+                                               <object class="NSFont" key="IBUIFont" id="447838651">
+                                                       <string key="NSName">HelveticaNeue</string>
                                                        <double key="NSSize">17</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
-                                       <object class="IBUILabel" id="771563393">
+                                       <object class="IBUITextView" id="194356775">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{83, 287}, {154, 46}}</string>
+                                               <string key="NSFrame">{{20, 45}, {280, 82}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView"/>
+                                               <reference key="NSNextKeyView" ref="858612965"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <object class="NSColor" key="IBUIBackgroundColor">
+                                               <object class="NSColor" key="IBUIBackgroundColor" id="348799278">
                                                        <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4yMTcyMjc2MjM0IDAuODc3OTcyMTQ2NyAwLjQyNjM2MzMyMDUAA</bytes>
+                                                       <bytes key="NSRGB">MSAxIDEAA</bytes>
                                                </object>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <bool key="IBUIMultipleTouchEnabled">YES</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Turn Left, Turn Right, Go Forward</string>
+                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+                                                       <int key="IBUIAutocapitalizationType">2</int>
+                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               </object>
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="946691039">
+                                                       <int key="type">1</int>
+                                                       <double key="pointSize">14</double>
+                                               </object>
+                                               <object class="NSFont" key="IBUIFont" id="410816047">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">14</double>
+                                                       <int key="NSfFlags">16</int>
+                                               </object>
+                                       </object>
+                                       <object class="IBUILabel" id="242446256">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 23}, {270, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="194356775"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <int key="IBUIContentMode">7</int>
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText"/>
-                                               <reference key="IBUITextColor" ref="273970815"/>
+                                               <string key="IBUIText">Enter turns separated by comma</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
-                                               <int key="IBUITextAlignment">1</int>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
+                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="20348948">
                                                        <int key="type">1</int>
-                                                       <double key="pointSize">21</double>
+                                                       <double key="pointSize">13</double>
                                                </object>
-                                               <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica</string>
-                                                       <double key="NSSize">21</double>
+                                               <object class="NSFont" key="IBUIFont" id="388116631">
+                                                       <string key="NSName">HelveticaNeue</string>
+                                                       <double key="NSSize">13</double>
                                                        <int key="NSfFlags">16</int>
                                                </object>
                                        </object>
-                                       <object class="IBUILabel" id="277629924">
+                                       <object class="IBUILabel" id="858612965">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{80, 290}, {161, 43}}</string>
+                                               <string key="NSFrame">{{20, 128}, {64, 21}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="771563393"/>
+                                               <reference key="NSNextKeyView" ref="247831951"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                <bool key="IBUIOpaque">NO</bool>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <int key="IBUIContentMode">7</int>
                                                <bool key="IBUIUserInteractionEnabled">NO</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Test in Progress</string>
-                                               <object class="NSColor" key="IBUITextColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MSAwLjEyMzY5MDM1MDYgMC4xMDE5ODUwODY0AA</bytes>
-                                               </object>
+                                               <string key="IBUIText">Icon List</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
                                                <nil key="IBUIHighlightedColor"/>
                                                <int key="IBUIBaselineAdjustment">0</int>
                                                <float key="IBUIMinimumFontSize">10</float>
-                                               <int key="IBUITextAlignment">1</int>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
-                                                       <int key="type">1</int>
-                                                       <double key="pointSize">20</double>
-                                               </object>
-                                               <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica</string>
-                                                       <double key="NSSize">20</double>
-                                                       <int key="NSfFlags">16</int>
-                                               </object>
+                                               <reference key="IBUIFontDescription" ref="878946683"/>
+                                               <reference key="IBUIFont" ref="447838651"/>
                                        </object>
-                                       <object class="IBUITextView" id="470608787">
+                                       <object class="IBUITextView" id="879672028">
                                                <reference key="NSNextResponder" ref="191373211"/>
                                                <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{20, 92}, {280, 97}}</string>
+                                               <string key="NSFrame">{{20, 166}, {280, 82}}</string>
                                                <reference key="NSSuperview" ref="191373211"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="350471490"/>
+                                               <reference key="NSNextKeyView" ref="889589024"/>
                                                <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <object class="NSColor" key="IBUIBackgroundColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MSAxIDEAA</bytes>
-                                               </object>
+                                               <reference key="IBUIBackgroundColor" ref="348799278"/>
                                                <bool key="IBUIClipsSubviews">YES</bool>
                                                <bool key="IBUIMultipleTouchEnabled">YES</bool>
                                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText"/>
+                                               <string key="IBUIText">turn_left.png, turn_right.png, turn_forward.png</string>
                                                <object class="IBUITextInputTraits" key="IBUITextInputTraits">
                                                        <int key="IBUIAutocapitalizationType">2</int>
                                                        <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                                                </object>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
-                                                       <int key="type">1</int>
-                                                       <double key="pointSize">14</double>
-                                               </object>
-                                               <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica</string>
-                                                       <double key="NSSize">14</double>
-                                                       <int key="NSfFlags">16</int>
-                                               </object>
+                                               <reference key="IBUIFontDescription" ref="946691039"/>
+                                               <reference key="IBUIFont" ref="410816047"/>
+                                       </object>
+                                       <object class="IBUILabel" id="247831951">
+                                               <reference key="NSNextResponder" ref="191373211"/>
+                                               <int key="NSvFlags">292</int>
+                                               <string key="NSFrame">{{20, 144}, {270, 21}}</string>
+                                               <reference key="NSSuperview" ref="191373211"/>
+                                               <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView" ref="879672028"/>
+                                               <string key="NSReuseIdentifierKey">_NS:9</string>
+                                               <bool key="IBUIOpaque">NO</bool>
+                                               <bool key="IBUIClipsSubviews">YES</bool>
+                                               <int key="IBUIContentMode">7</int>
+                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
+                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+                                               <string key="IBUIText">Enter icons separated by comma, one per turn</string>
+                                               <reference key="IBUITextColor" ref="83775735"/>
+                                               <nil key="IBUIHighlightedColor"/>
+                                               <int key="IBUIBaselineAdjustment">0</int>
+                                               <float key="IBUIMinimumFontSize">10</float>
+                                               <reference key="IBUIFontDescription" ref="20348948"/>
+                                               <reference key="IBUIFont" ref="388116631"/>
                                        </object>
                                </array>
-                               <string key="NSFrame">{{0, 20}, {320, 411}}</string>
+                               <string key="NSFrame">{{0, 64}, {320, 367}}</string>
                                <reference key="NSSuperview"/>
                                <reference key="NSWindow"/>
-                               <reference key="NSNextKeyView" ref="325732204"/>
+                               <reference key="NSNextKeyView" ref="445080585"/>
                                <object class="NSColor" key="IBUIBackgroundColor">
                                        <int key="NSColorSpace">1</int>
                                        <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
                                </object>
                                <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+                               <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+                                       <bool key="IBUIPrompted">NO</bool>
+                               </object>
                                <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
                                <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
                        </object>
-                       <object class="IBUILabel" id="810861296">
-                               <nil key="NSNextResponder"/>
-                               <int key="NSvFlags">292</int>
-                               <string key="NSFrameSize">{42, 21}</string>
-                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                               <bool key="IBUIOpaque">NO</bool>
-                               <bool key="IBUIClipsSubviews">YES</bool>
-                               <int key="IBUIContentMode">7</int>
-                               <bool key="IBUIUserInteractionEnabled">NO</bool>
-                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                               <string key="IBUIText">Label</string>
-                               <reference key="IBUITextColor" ref="273970815"/>
-                               <nil key="IBUIHighlightedColor"/>
-                               <int key="IBUIBaselineAdjustment">0</int>
-                               <float key="IBUIMinimumFontSize">10</float>
-                               <reference key="IBUIFontDescription" ref="823999025"/>
-                               <reference key="IBUIFont" ref="455079651"/>
-                       </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <bool key="usesAutoincrementingIDs">NO</bool>
                        <array class="NSMutableArray" key="connectionRecords">
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
@@ -269,177 +270,192 @@
                                                <reference key="source" ref="372490531"/>
                                                <reference key="destination" ref="191373211"/>
                                        </object>
-                                       <int key="connectionID">3</int>
+                                       <string key="id">3</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
-                                               <string key="label">resultOfXMLTest</string>
+                                               <string key="label">iconView</string>
                                                <reference key="source" ref="372490531"/>
-                                               <reference key="destination" ref="771563393"/>
+                                               <reference key="destination" ref="879672028"/>
                                        </object>
-                                       <int key="connectionID">24</int>
+                                       <string key="id">36</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchOutletConnection" key="connection">
-                                               <string key="label">testInProgress</string>
+                                               <string key="label">turnView</string>
                                                <reference key="source" ref="372490531"/>
-                                               <reference key="destination" ref="277629924"/>
+                                               <reference key="destination" ref="194356775"/>
                                        </object>
-                                       <int key="connectionID">34</int>
+                                       <string key="id">37</string>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchOutletConnection" key="connection">
-                                               <string key="label">xmlScriptText</string>
-                                               <reference key="source" ref="372490531"/>
-                                               <reference key="destination" ref="470608787"/>
+                                       <object class="IBCocoaTouchEventConnection" key="connection">
+                                               <string key="label">sendRPC:</string>
+                                               <reference key="source" ref="496830156"/>
+                                               <reference key="destination" ref="372490531"/>
+                                               <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">39</int>
+                                       <string key="id">35</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">beginAutomatedTesting:</string>
-                                               <reference key="source" ref="350471490"/>
+                                               <string key="label">softButtons:</string>
+                                               <reference key="source" ref="889589024"/>
                                                <reference key="destination" ref="372490531"/>
                                                <int key="IBEventType">7</int>
                                        </object>
-                                       <int key="connectionID">15</int>
+                                       <string key="id">38</string>
                                </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
+                                               <string key="id">0</string>
                                                <array key="object" id="0"/>
                                                <reference key="children" ref="1000"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
+                                               <string key="id">1</string>
                                                <reference key="object" ref="191373211"/>
                                                <array class="NSMutableArray" key="children">
-                                                       <reference ref="325732204"/>
-                                                       <reference ref="771563393"/>
-                                                       <reference ref="277629924"/>
-                                                       <reference ref="350471490"/>
-                                                       <reference ref="470608787"/>
-                                                       <reference ref="198997429"/>
+                                                       <reference ref="496830156"/>
+                                                       <reference ref="445080585"/>
+                                                       <reference ref="194356775"/>
+                                                       <reference ref="242446256"/>
+                                                       <reference ref="889589024"/>
+                                                       <reference ref="858612965"/>
+                                                       <reference ref="879672028"/>
+                                                       <reference ref="247831951"/>
                                                </array>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
+                                               <string key="id">-1</string>
                                                <reference key="object" ref="372490531"/>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">File's Owner</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
+                                               <string key="id">-2</string>
                                                <reference key="object" ref="975951072"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
-                                               <reference key="object" ref="325732204"/>
+                                               <string key="id">17</string>
+                                               <reference key="object" ref="496830156"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
-                                               <reference key="object" ref="350471490"/>
+                                               <string key="id">27</string>
+                                               <reference key="object" ref="889589024"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">12</int>
-                                               <reference key="object" ref="198997429"/>
+                                               <string key="id">28</string>
+                                               <reference key="object" ref="445080585"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">23</int>
-                                               <reference key="object" ref="771563393"/>
+                                               <string key="id">29</string>
+                                               <reference key="object" ref="194356775"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">32</int>
-                                               <reference key="object" ref="810861296"/>
-                                               <reference key="parent" ref="0"/>
+                                               <string key="id">30</string>
+                                               <reference key="object" ref="242446256"/>
+                                               <reference key="parent" ref="191373211"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <string key="id">31</string>
+                                               <reference key="object" ref="858612965"/>
+                                               <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">33</int>
-                                               <reference key="object" ref="277629924"/>
+                                               <string key="id">32</string>
+                                               <reference key="object" ref="879672028"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">37</int>
-                                               <reference key="object" ref="470608787"/>
+                                               <string key="id">33</string>
+                                               <reference key="object" ref="247831951"/>
                                                <reference key="parent" ref="191373211"/>
                                        </object>
                                </array>
                        </object>
                        <dictionary class="NSMutableDictionary" key="flattenedProperties">
-                               <string key="-1.CustomClassName">AutoTestViewController</string>
+                               <string key="-1.CustomClassName">UpdateTurnListViewController</string>
                                <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="-2.CustomClassName">UIResponder</string>
                                <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="29.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="30.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+                               <string key="31.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="32.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="37.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                        </dictionary>
                        <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">40</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <array class="NSMutableArray" key="referencedPartialClassDescriptions">
                                <object class="IBPartialClassDescription">
-                                       <string key="className">AutoTestViewController</string>
+                                       <string key="className">UpdateTurnListViewController</string>
                                        <string key="superclassName">UIViewController</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <string key="NS.key.0">beginAutomatedTesting:</string>
-                                               <string key="NS.object.0">id</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">beginAutomatedTesting:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">beginAutomatedTesting:</string>
+                                       <dictionary class="NSMutableDictionary" key="actions">
+                                               <string key="sendRPC:">id</string>
+                                               <string key="softButtons:">id</string>
+                                       </dictionary>
+                                       <dictionary class="NSMutableDictionary" key="actionInfosByName">
+                                               <object class="IBActionInfo" key="sendRPC:">
+                                                       <string key="name">sendRPC:</string>
                                                        <string key="candidateClassName">id</string>
                                                </object>
-                                       </object>
+                                               <object class="IBActionInfo" key="softButtons:">
+                                                       <string key="name">softButtons:</string>
+                                                       <string key="candidateClassName">id</string>
+                                               </object>
+                                       </dictionary>
                                        <dictionary class="NSMutableDictionary" key="outlets">
-                                               <string key="resultOfXMLTest">UILabel</string>
-                                               <string key="testInProgress">UILabel</string>
-                                               <string key="xmlScriptText">UITextView</string>
+                                               <string key="iconView">UITextView</string>
+                                               <string key="turnView">UITextView</string>
                                        </dictionary>
                                        <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <object class="IBToOneOutletInfo" key="resultOfXMLTest">
-                                                       <string key="name">resultOfXMLTest</string>
-                                                       <string key="candidateClassName">UILabel</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="testInProgress">
-                                                       <string key="name">testInProgress</string>
-                                                       <string key="candidateClassName">UILabel</string>
+                                               <object class="IBToOneOutletInfo" key="iconView">
+                                                       <string key="name">iconView</string>
+                                                       <string key="candidateClassName">UITextView</string>
                                                </object>
-                                               <object class="IBToOneOutletInfo" key="xmlScriptText">
-                                                       <string key="name">xmlScriptText</string>
+                                               <object class="IBToOneOutletInfo" key="turnView">
+                                                       <string key="name">turnView</string>
                                                        <string key="candidateClassName">UITextView</string>
                                                </object>
                                        </dictionary>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/AutoTestViewController.h</string>
+                                               <string key="minorKey">./Classes/UpdateTurnListViewController.h</string>
                                        </object>
                                </object>
                        </array>
                </object>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+               <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+                       <real value="1280" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+                       <integer value="4600" key="NS.object.0"/>
+               </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <string key="IBCocoaTouchPluginVersion">1181</string>
+               <string key="IBCocoaTouchPluginVersion">3742</string>
        </data>
 </archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UserTestViewController.h b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UserTestViewController.h
deleted file mode 100644 (file)
index 87a81f1..0000000
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UserTestViewController.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import <UIKit/UIKit.h>
-#import <AVFoundation/AVFoundation.h>
-#import "SDLBrain.h"
-
-@interface UserTestViewController : UIViewController <UITextViewDelegate, AVAudioPlayerDelegate> {
-    IBOutlet UITextView *blackboardText;
-    IBOutlet UILabel *resultRPCRequest;
-    IBOutlet UIImageView *playPauseImage;
-    NSString *methodDidGetCalled;
-    
-    BOOL musicIsPlaying;
-    
-    AVAudioPlayer *audioPlayer;
-}
-
-
--(IBAction)showButtonPressed :(id)sender;
--(IBAction)speakButtonPressed :(id)sender;
--(IBAction)alertButtonPressed :(id)sender;
--(IBAction)addCommandPressed:(id)sender;
--(IBAction)playPauseMusic:(id)sender;
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UserTestViewController.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UserTestViewController.m
deleted file mode 100644 (file)
index b611c99..0000000
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UserTestViewController.m
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-
-#import "UserTestViewController.h"
-
-@interface UserTestViewController ()
-
--(void)showRPCResponse:(NSNotification *)notification;
--(void)hideRPCRequestLabel;
-
-@end
-
-@implementation UserTestViewController
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showRPCResponse:) name:@"onRPCResponse" object:nil];
-    
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        self.title = NSLocalizedString(@"User Test", @"User Test");
-        self.tabBarItem.image = [UIImage imageNamed:@"game_controller"];
-    }
-    return self;
-}
-
--(IBAction)showButtonPressed :(id)sender {
-    methodDidGetCalled = @"show";
-    [blackboardText setEditable:YES];
-    [blackboardText setHidden:NO];   
-    [blackboardText becomeFirstResponder];
-}
-
--(IBAction)speakButtonPressed :(id)sender{
-    methodDidGetCalled = @"speak";
-    [blackboardText setEditable:YES];
-    [blackboardText setHidden:NO];      
-    [blackboardText becomeFirstResponder];
-}
-
--(IBAction)alertButtonPressed :(id)sender{
-    methodDidGetCalled = @"alert";
-    [blackboardText setEditable:YES];
-    [blackboardText setHidden:NO];      
-    [blackboardText becomeFirstResponder];
-}
-
--(IBAction)addCommandPressed:(id)sender {
-    methodDidGetCalled = @"addCommand";
-    [blackboardText setEditable:YES];
-    [blackboardText setHidden:NO];      
-    [blackboardText becomeFirstResponder];
-}
-
--(IBAction)playPauseMusic:(id)sender {
-    if (musicIsPlaying) {
-        //pause music
-        musicIsPlaying = NO;
-        [playPauseImage setImage:[UIImage imageNamed:@"play.png"]];
-        [audioPlayer pause];
-        NSLog(@"audioPlayer pause");
-    }
-    else {
-        //play music
-        musicIsPlaying = YES;
-        [playPauseImage setImage:[UIImage imageNamed:@"pause.png"]];
-        [audioPlayer play];
-        NSLog(@"audioPlayer play");
-
-    }
-}
-
-- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
-{
-    if([text isEqualToString:@"\n"]) {
-        [textView resignFirstResponder];
-        return NO;
-    }
-    
-    return YES;
-}
-
-- (void) textViewDidEndEditing:(UITextView *)textView {
-    
-    NSString *msg = blackboardText.text;
-    if ([methodDidGetCalled isEqualToString: @"speak"]) {
-        [[SDLBrain getInstance] speakPressed:msg];
-    }
-    else if ([methodDidGetCalled isEqualToString: @"show"]) {
-        [[SDLBrain getInstance] showPressed:msg];
-
-    }
-    else if ([methodDidGetCalled isEqualToString: @"alert"]) {
-        [[SDLBrain getInstance] alertPressed:msg];
-        
-    } 
-    else if ([methodDidGetCalled isEqualToString: @"addCommand"]) {
-        [[SDLBrain getInstance] addCommand:msg];
-    }
-    blackboardText.text = @"";
-    [blackboardText setHidden:YES];
-    [blackboardText setEditable:NO];
-
-}
-
--(void)showRPCResponse:(NSNotification *)notification {
-    
-    
-    SDLRPCResponse* response = (SDLRPCResponse*) [notification object];
-
-    NSString *result = [NSString stringWithFormat:@"%@", [response resultCode]];
-    
-    if([result isEqualToString:@"SUCCESS"]) {
-        [resultRPCRequest setText:@"Success"];
-        [resultRPCRequest setBackgroundColor:[UIColor greenColor]];
-    }
-    else {
-        [resultRPCRequest setText:@"Failure"];
-        [resultRPCRequest setBackgroundColor:[UIColor redColor]];
-
-    }
-    [resultRPCRequest setHidden:NO];
-    [self performSelector:@selector(hideRPCRequestLabel) withObject:nil afterDelay:3.0];
-}
-
--(void)audioPlayerDidFinishPlaying:(AVAudioPlayer *)player successfully:(BOOL)flag {
-    musicIsPlaying = NO;
-    [playPauseImage setImage:[UIImage imageNamed:@"play.png"]];
-}
-
--(void)hideRPCRequestLabel {
-    [resultRPCRequest setHidden:YES];
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    
-    blackboardText.delegate = self;
-    blackboardText.textColor = [UIColor whiteColor];
-    [blackboardText setHidden:YES];    
-    [blackboardText setEditable:NO];
-    [blackboardText setFont:[UIFont fontWithName:@"Arial" size:20]];
-    [playPauseImage setImage:[UIImage imageNamed:@"play.png"]];
-    [resultRPCRequest setHidden:YES];
-    musicIsPlaying = NO;
-    
-    NSError *error;
-    NSURL *path = [[NSBundle mainBundle] URLForResource:@"Sail" withExtension:@"mp3"];
-    audioPlayer = [[AVAudioPlayer alloc] initWithContentsOfURL:path error:&error];
-    audioPlayer.delegate = self;
-    audioPlayer.volume = 0.5;
-    //[audioPlayer prepareToPlay];
-}
-
-- (void)viewDidUnload
-{
-    [[SDLBrain getInstance] onProxyClosed];
-
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-    return (interfaceOrientation == UIInterfaceOrientationPortrait);
-}
-
--(void) dealloc {
-    [audioPlayer release];
-    [super dealloc];
-}
-
-@end

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UserTestViewController.xib b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UserTestViewController.xib
deleted file mode 100644 (file)
index 398b3cf..0000000
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/UserTestViewController.xib
+++ /dev/null
@@ -1,649 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
-       <data>
-               <int key="IBDocument.SystemTarget">1552</int>
-               <string key="IBDocument.SystemVersion">12C3012</string>
-               <string key="IBDocument.InterfaceBuilderVersion">3084</string>
-               <string key="IBDocument.AppKitVersion">1187.34</string>
-               <string key="IBDocument.HIToolboxVersion">625.00</string>
-               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       <string key="NS.object.0">2083</string>
-               </object>
-               <array key="IBDocument.IntegratedClassDependencies">
-                       <string>IBProxyObject</string>
-                       <string>IBUIButton</string>
-                       <string>IBUIImageView</string>
-                       <string>IBUILabel</string>
-                       <string>IBUITextField</string>
-                       <string>IBUITextView</string>
-                       <string>IBUIView</string>
-               </array>
-               <array key="IBDocument.PluginDependencies">
-                       <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-               </array>
-               <object class="NSMutableDictionary" key="IBDocument.Metadata">
-                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-                       <integer value="1" key="NS.object.0"/>
-               </object>
-               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-                       <object class="IBProxyObject" id="372490531">
-                               <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                       </object>
-                       <object class="IBProxyObject" id="975951072">
-                               <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                       </object>
-                       <object class="IBUIView" id="191373211">
-                               <reference key="NSNextResponder"/>
-                               <int key="NSvFlags">274</int>
-                               <array class="NSMutableArray" key="NSSubviews">
-                                       <object class="IBUILabel" id="432383395">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{46, 9}, {229, 50}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="121060870"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <bool key="IBUIOpaque">NO</bool>
-                                               <bool key="IBUIClipsSubviews">YES</bool>
-                                               <int key="IBUIContentMode">7</int>
-                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
-                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText">Smart Device Link Tester</string>
-                                               <object class="NSColor" key="IBUITextColor" id="634501940">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
-                                                       <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
-                                               </object>
-                                               <nil key="IBUIHighlightedColor"/>
-                                               <int key="IBUIBaselineAdjustment">0</int>
-                                               <float key="IBUIMinimumFontSize">10</float>
-                                               <int key="IBUITextAlignment">1</int>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
-                                                       <string key="name">MarkerFelt-Thin</string>
-                                                       <string key="family">Marker Felt</string>
-                                                       <int key="traits">0</int>
-                                                       <double key="pointSize">24</double>
-                                               </object>
-                                               <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">MarkerFelt-Thin</string>
-                                                       <double key="NSSize">24</double>
-                                                       <int key="NSfFlags">16</int>
-                                               </object>
-                                       </object>
-                                       <object class="IBUIButton" id="371743861">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{24, 255}, {118, 50}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="954577203"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <bool key="IBUIOpaque">NO</bool>
-                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <int key="IBUIContentHorizontalAlignment">0</int>
-                                               <int key="IBUIContentVerticalAlignment">0</int>
-                                               <string key="IBUINormalTitle">Show</string>
-                                               <object class="NSColor" key="IBUIHighlightedTitleColor" id="671388660">
-                                                       <int key="NSColorSpace">3</int>
-                                                       <bytes key="NSWhite">MQA</bytes>
-                                               </object>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
-                                               <object class="NSColor" key="IBUINormalTitleShadowColor" id="159057428">
-                                                       <int key="NSColorSpace">3</int>
-                                                       <bytes key="NSWhite">MC41AA</bytes>
-                                               </object>
-                                               <object class="NSCustomResource" key="IBUINormalImage">
-                                                       <string key="NSClassName">NSImage</string>
-                                                       <string key="NSResourceName">delaware_show.jpg</string>
-                                               </object>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="839267079">
-                                                       <int key="type">2</int>
-                                                       <double key="pointSize">15</double>
-                                               </object>
-                                               <object class="NSFont" key="IBUIFont" id="66175769">
-                                                       <string key="NSName">Helvetica-Bold</string>
-                                                       <double key="NSSize">15</double>
-                                                       <int key="NSfFlags">16</int>
-                                               </object>
-                                       </object>
-                                       <object class="IBUIButton" id="954577203">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{178, 255}, {118, 50}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="673450242"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <bool key="IBUIOpaque">NO</bool>
-                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <int key="IBUIContentHorizontalAlignment">0</int>
-                                               <int key="IBUIContentVerticalAlignment">0</int>
-                                               <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Speak</string>
-                                               <reference key="IBUIHighlightedTitleColor" ref="671388660"/>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
-                                               <reference key="IBUINormalTitleShadowColor" ref="159057428"/>
-                                               <object class="NSCustomResource" key="IBUINormalImage">
-                                                       <string key="NSClassName">NSImage</string>
-                                                       <string key="NSResourceName">cali_speak.jpg</string>
-                                               </object>
-                                               <reference key="IBUIFontDescription" ref="839267079"/>
-                                               <reference key="IBUIFont" ref="66175769"/>
-                                       </object>
-                                       <object class="IBUIImageView" id="387434867">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{24, 91}, {272, 147}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="484289448"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <reference key="IBUIBackgroundColor" ref="634501940"/>
-                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
-                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <object class="NSCustomResource" key="IBUIImage">
-                                                       <string key="NSClassName">NSImage</string>
-                                                       <string key="NSResourceName">Blank-Blackboard-PSD.png</string>
-                                               </object>
-                                       </object>
-                                       <object class="IBUITextView" id="484289448">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{40, 101}, {240, 128}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="344460613"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <bool key="IBUIClipsSubviews">YES</bool>
-                                               <bool key="IBUIMultipleTouchEnabled">YES</bool>
-                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText"/>
-                                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
-                                                       <int key="IBUIAutocapitalizationType">2</int>
-                                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               </object>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription" id="198850646">
-                                                       <int key="type">1</int>
-                                                       <double key="pointSize">14</double>
-                                               </object>
-                                               <object class="NSFont" key="IBUIFont" id="325394597">
-                                                       <string key="NSName">Helvetica</string>
-                                                       <double key="NSSize">14</double>
-                                                       <int key="NSfFlags">16</int>
-                                               </object>
-                                       </object>
-                                       <object class="IBUILabel" id="121060870">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{107, 67}, {107, 21}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="387434867"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <object class="NSColor" key="IBUIBackgroundColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4yMTcyMjc2MjM0IDAuODc3OTcyMTQ2NyAwLjQyNjM2MzMyMDUAA</bytes>
-                                               </object>
-                                               <bool key="IBUIOpaque">NO</bool>
-                                               <bool key="IBUIClipsSubviews">YES</bool>
-                                               <int key="IBUIContentMode">7</int>
-                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
-                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <string key="IBUIText"/>
-                                               <reference key="IBUITextColor" ref="634501940"/>
-                                               <nil key="IBUIHighlightedColor"/>
-                                               <int key="IBUIBaselineAdjustment">0</int>
-                                               <float key="IBUIMinimumFontSize">10</float>
-                                               <int key="IBUITextAlignment">1</int>
-                                               <object class="IBUIFontDescription" key="IBUIFontDescription">
-                                                       <int key="type">1</int>
-                                                       <double key="pointSize">17</double>
-                                               </object>
-                                               <object class="NSFont" key="IBUIFont">
-                                                       <string key="NSName">Helvetica</string>
-                                                       <double key="NSSize">17</double>
-                                                       <int key="NSfFlags">16</int>
-                                               </object>
-                                       </object>
-                                       <object class="IBUIButton" id="673450242">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{24, 330}, {118, 48}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="579377768"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <bool key="IBUIOpaque">NO</bool>
-                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <int key="IBUIContentHorizontalAlignment">0</int>
-                                               <int key="IBUIContentVerticalAlignment">0</int>
-                                               <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Alert</string>
-                                               <reference key="IBUIHighlightedTitleColor" ref="671388660"/>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
-                                               <reference key="IBUINormalTitleShadowColor" ref="159057428"/>
-                                               <object class="NSCustomResource" key="IBUINormalImage">
-                                                       <string key="NSClassName">NSImage</string>
-                                                       <string key="NSResourceName">geogia_alert.jpg</string>
-                                               </object>
-                                               <reference key="IBUIFontDescription" ref="839267079"/>
-                                               <reference key="IBUIFont" ref="66175769"/>
-                                       </object>
-                                       <object class="IBUIButton" id="579377768">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{178, 330}, {118, 48}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <bool key="IBUIOpaque">NO</bool>
-                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <int key="IBUIContentHorizontalAlignment">0</int>
-                                               <int key="IBUIContentVerticalAlignment">0</int>
-                                               <int key="IBUIButtonType">1</int>
-                                               <string key="IBUINormalTitle">Add Command</string>
-                                               <reference key="IBUIHighlightedTitleColor" ref="671388660"/>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
-                                               <reference key="IBUINormalTitleShadowColor" ref="159057428"/>
-                                               <object class="NSCustomResource" key="IBUINormalImage">
-                                                       <string key="NSClassName">NSImage</string>
-                                                       <string key="NSResourceName">colorado_addcmd.jpg</string>
-                                               </object>
-                                               <reference key="IBUIFontDescription" ref="839267079"/>
-                                               <reference key="IBUIFont" ref="66175769"/>
-                                       </object>
-                                       <object class="IBUIButton" id="344460613">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{206, 199}, {62, 30}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="481680042"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <bool key="IBUIOpaque">NO</bool>
-                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                               <int key="IBUIContentHorizontalAlignment">0</int>
-                                               <int key="IBUIContentVerticalAlignment">0</int>
-                                               <int key="IBUIButtonType">1</int>
-                                               <reference key="IBUIHighlightedTitleColor" ref="671388660"/>
-                                               <object class="NSColor" key="IBUINormalTitleColor">
-                                                       <int key="NSColorSpace">1</int>
-                                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                                               </object>
-                                               <reference key="IBUINormalTitleShadowColor" ref="159057428"/>
-                                               <object class="NSCustomResource" key="IBUINormalImage">
-                                                       <string key="NSClassName">NSImage</string>
-                                                       <string key="NSResourceName">eraser.png</string>
-                                               </object>
-                                               <reference key="IBUIFontDescription" ref="839267079"/>
-                                               <reference key="IBUIFont" ref="66175769"/>
-                                       </object>
-                                       <object class="IBUIImageView" id="481680042">
-                                               <reference key="NSNextResponder" ref="191373211"/>
-                                               <int key="NSvFlags">292</int>
-                                               <string key="NSFrame">{{221, 202}, {32, 23}}</string>
-                                               <reference key="NSSuperview" ref="191373211"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="371743861"/>
-                                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                                               <bool key="IBUIUserInteractionEnabled">NO</bool>
-                                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                                       </object>
-                               </array>
-                               <string key="NSFrame">{{0, 20}, {320, 411}}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
-                               <reference key="NSNextKeyView" ref="432383395"/>
-                               <object class="NSColor" key="IBUIBackgroundColor">
-                                       <int key="NSColorSpace">1</int>
-                                       <bytes key="NSRGB">MSAwLjc2NDQwODY1OSAwLjUyOTg5MDU0OQA</bytes>
-                               </object>
-                               <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-                               <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
-                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                       </object>
-                       <object class="IBUITextField" id="607015031">
-                               <nil key="NSNextResponder"/>
-                               <int key="NSvFlags">292</int>
-                               <string key="NSFrameSize">{97, 31}</string>
-                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                               <bool key="IBUIOpaque">NO</bool>
-                               <bool key="IBUIClipsSubviews">YES</bool>
-                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                               <int key="IBUIContentVerticalAlignment">0</int>
-                               <string key="IBUIText"/>
-                               <int key="IBUIBorderStyle">3</int>
-                               <object class="NSColor" key="IBUITextColor">
-                                       <int key="NSColorSpace">3</int>
-                                       <bytes key="NSWhite">MAA</bytes>
-                                       <object class="NSColorSpace" key="NSCustomColorSpace">
-                                               <int key="NSID">2</int>
-                                       </object>
-                               </object>
-                               <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
-                               <float key="IBUIMinimumFontSize">17</float>
-                               <object class="IBUITextInputTraits" key="IBUITextInputTraits">
-                                       <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                               </object>
-                               <reference key="IBUIFontDescription" ref="198850646"/>
-                               <reference key="IBUIFont" ref="325394597"/>
-                       </object>
-                       <object class="IBUIButton" id="928890701">
-                               <nil key="NSNextResponder"/>
-                               <int key="NSvFlags">292</int>
-                               <string key="NSFrameSize">{95, 19}</string>
-                               <string key="NSReuseIdentifierKey">_NS:9</string>
-                               <bool key="IBUIOpaque">NO</bool>
-                               <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-                               <int key="IBUIContentHorizontalAlignment">0</int>
-                               <int key="IBUIContentVerticalAlignment">0</int>
-                               <int key="IBUIButtonType">1</int>
-                               <reference key="IBUIHighlightedTitleColor" ref="671388660"/>
-                               <object class="NSColor" key="IBUINormalTitleColor">
-                                       <int key="NSColorSpace">1</int>
-                                       <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-                               </object>
-                               <reference key="IBUINormalTitleShadowColor" ref="159057428"/>
-                               <reference key="IBUIFontDescription" ref="839267079"/>
-                               <reference key="IBUIFont" ref="66175769"/>
-                       </object>
-               </array>
-               <object class="IBObjectContainer" key="IBDocument.Objects">
-                       <array class="NSMutableArray" key="connectionRecords">
-                               <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchOutletConnection" key="connection">
-                                               <string key="label">view</string>
-                                               <reference key="source" ref="372490531"/>
-                                               <reference key="destination" ref="191373211"/>
-                                       </object>
-                                       <int key="connectionID">3</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchOutletConnection" key="connection">
-                                               <string key="label">blackboardText</string>
-                                               <reference key="source" ref="372490531"/>
-                                               <reference key="destination" ref="484289448"/>
-                                       </object>
-                                       <int key="connectionID">17</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchOutletConnection" key="connection">
-                                               <string key="label">resultRPCRequest</string>
-                                               <reference key="source" ref="372490531"/>
-                                               <reference key="destination" ref="121060870"/>
-                                       </object>
-                                       <int key="connectionID">21</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchOutletConnection" key="connection">
-                                               <string key="label">playPauseImage</string>
-                                               <reference key="source" ref="372490531"/>
-                                               <reference key="destination" ref="481680042"/>
-                                       </object>
-                                       <int key="connectionID">34</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">showButtonPressed:</string>
-                                               <reference key="source" ref="371743861"/>
-                                               <reference key="destination" ref="372490531"/>
-                                               <int key="IBEventType">7</int>
-                                       </object>
-                                       <int key="connectionID">7</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">speakButtonPressed:</string>
-                                               <reference key="source" ref="954577203"/>
-                                               <reference key="destination" ref="372490531"/>
-                                               <int key="IBEventType">7</int>
-                                       </object>
-                                       <int key="connectionID">8</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">alertButtonPressed:</string>
-                                               <reference key="source" ref="673450242"/>
-                                               <reference key="destination" ref="372490531"/>
-                                               <int key="IBEventType">7</int>
-                                       </object>
-                                       <int key="connectionID">23</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">addCommandPressed:</string>
-                                               <reference key="source" ref="579377768"/>
-                                               <reference key="destination" ref="372490531"/>
-                                               <int key="IBEventType">7</int>
-                                       </object>
-                                       <int key="connectionID">25</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBCocoaTouchEventConnection" key="connection">
-                                               <string key="label">playPauseMusic:</string>
-                                               <reference key="source" ref="344460613"/>
-                                               <reference key="destination" ref="372490531"/>
-                                               <int key="IBEventType">7</int>
-                                       </object>
-                                       <int key="connectionID">35</int>
-                               </object>
-                       </array>
-                       <object class="IBMutableOrderedSet" key="objectRecords">
-                               <array key="orderedObjects">
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
-                                               <array key="object" id="0"/>
-                                               <reference key="children" ref="1000"/>
-                                               <nil key="parent"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1</int>
-                                               <reference key="object" ref="191373211"/>
-                                               <array class="NSMutableArray" key="children">
-                                                       <reference ref="387434867"/>
-                                                       <reference ref="121060870"/>
-                                                       <reference ref="579377768"/>
-                                                       <reference ref="673450242"/>
-                                                       <reference ref="371743861"/>
-                                                       <reference ref="954577203"/>
-                                                       <reference ref="484289448"/>
-                                                       <reference ref="344460613"/>
-                                                       <reference ref="481680042"/>
-                                                       <reference ref="432383395"/>
-                                               </array>
-                                               <reference key="parent" ref="0"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
-                                               <reference key="object" ref="372490531"/>
-                                               <reference key="parent" ref="0"/>
-                                               <string key="objectName">File's Owner</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
-                                               <reference key="object" ref="975951072"/>
-                                               <reference key="parent" ref="0"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
-                                               <reference key="object" ref="432383395"/>
-                                               <reference key="parent" ref="191373211"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
-                                               <reference key="object" ref="371743861"/>
-                                               <reference key="parent" ref="191373211"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
-                                               <reference key="object" ref="954577203"/>
-                                               <reference key="parent" ref="191373211"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">11</int>
-                                               <reference key="object" ref="387434867"/>
-                                               <reference key="parent" ref="191373211"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">13</int>
-                                               <reference key="object" ref="607015031"/>
-                                               <reference key="parent" ref="0"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">16</int>
-                                               <reference key="object" ref="484289448"/>
-                                               <reference key="parent" ref="191373211"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">20</int>
-                                               <reference key="object" ref="121060870"/>
-                                               <reference key="parent" ref="191373211"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">22</int>
-                                               <reference key="object" ref="673450242"/>
-                                               <reference key="parent" ref="191373211"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">24</int>
-                                               <reference key="object" ref="579377768"/>
-                                               <reference key="parent" ref="191373211"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">27</int>
-                                               <reference key="object" ref="928890701"/>
-                                               <reference key="parent" ref="0"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">31</int>
-                                               <reference key="object" ref="344460613"/>
-                                               <reference key="parent" ref="191373211"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">33</int>
-                                               <reference key="object" ref="481680042"/>
-                                               <reference key="parent" ref="191373211"/>
-                                       </object>
-                               </array>
-                       </object>
-                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
-                               <string key="-1.CustomClassName">UserTestViewController</string>
-                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="-2.CustomClassName">UIResponder</string>
-                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="24.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="31.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                       </dictionary>
-                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-                       <nil key="activeLocalization"/>
-                       <dictionary class="NSMutableDictionary" key="localizations"/>
-                       <nil key="sourceID"/>
-                       <int key="maxID">35</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">UserTestViewController</string>
-                                       <string key="superclassName">UIViewController</string>
-                                       <dictionary class="NSMutableDictionary" key="actions">
-                                               <string key="addCommandPressed:">id</string>
-                                               <string key="alertButtonPressed:">id</string>
-                                               <string key="playPauseMusic:">id</string>
-                                               <string key="showButtonPressed:">id</string>
-                                               <string key="speakButtonPressed:">id</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="actionInfosByName">
-                                               <object class="IBActionInfo" key="addCommandPressed:">
-                                                       <string key="name">addCommandPressed:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                               <object class="IBActionInfo" key="alertButtonPressed:">
-                                                       <string key="name">alertButtonPressed:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                               <object class="IBActionInfo" key="playPauseMusic:">
-                                                       <string key="name">playPauseMusic:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                               <object class="IBActionInfo" key="showButtonPressed:">
-                                                       <string key="name">showButtonPressed:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                               <object class="IBActionInfo" key="speakButtonPressed:">
-                                                       <string key="name">speakButtonPressed:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="outlets">
-                                               <string key="blackboardText">UITextView</string>
-                                               <string key="playPauseImage">UIImageView</string>
-                                               <string key="resultRPCRequest">UILabel</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <object class="IBToOneOutletInfo" key="blackboardText">
-                                                       <string key="name">blackboardText</string>
-                                                       <string key="candidateClassName">UITextView</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="playPauseImage">
-                                                       <string key="name">playPauseImage</string>
-                                                       <string key="candidateClassName">UIImageView</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="resultRPCRequest">
-                                                       <string key="name">resultRPCRequest</string>
-                                                       <string key="candidateClassName">UILabel</string>
-                                               </object>
-                                       </dictionary>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/UserTestViewController.h</string>
-                                       </object>
-                               </object>
-                       </array>
-               </object>
-               <int key="IBDocument.localizationMode">0</int>
-               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-                       <real value="1552" key="NS.object.0"/>
-               </object>
-               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-               <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-                       <string key="Blank-Blackboard-PSD.png">{400, 301}</string>
-                       <string key="cali_speak.jpg">{200, 103}</string>
-                       <string key="colorado_addcmd.jpg">{200, 100}</string>
-                       <string key="delaware_show.jpg">{200, 99}</string>
-                       <string key="eraser.png">{88, 35}</string>
-                       <string key="geogia_alert.jpg">{200, 102}</string>
-               </dictionary>
-               <string key="IBCocoaTouchPluginVersion">2083</string>
-       </data>
-</archive>

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/cali_speak.jpg b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/cali_speak.jpg
deleted file mode 100644 (file)
index 2664c20..0000000
Binary files a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/cali_speak.jpg and /dev/null differ

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/cog_02@2x.png b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/cog_02@2x.png
deleted file mode 100644 (file)
index 6667da6..0000000
Binary files a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/cog_02@2x.png and /dev/null differ

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/colorado_addcmd.jpg b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/colorado_addcmd.jpg
deleted file mode 100644 (file)
index ff5e007..0000000
Binary files a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/colorado_addcmd.jpg and /dev/null differ

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/delaware_show.jpg b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/delaware_show.jpg
deleted file mode 100644 (file)
index ff313a3..0000000
Binary files a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/delaware_show.jpg and /dev/null differ

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/eraser.png b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/eraser.png
deleted file mode 100644 (file)
index a9e7255..0000000
Binary files a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/eraser.png and /dev/null differ

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/game_controller.png b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/game_controller.png
deleted file mode 100644 (file)
index 7f9d34a..0000000
Binary files a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/game_controller.png and /dev/null differ

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/geogia_alert.jpg b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/geogia_alert.jpg
deleted file mode 100644 (file)
index 45e81c7..0000000
Binary files a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/geogia_alert.jpg and /dev/null differ

diff --git a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/main.m b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/main.m
index 419b9db..537dad2 100644 (file)
--- a/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/main.m
+++ b/SDL_iOS/SmartDeviceLinkTester/SmartDeviceLinkTester/main.m
@@ -1,6 +1,6 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
+//  main.m
+//  SmartDeviceLinkTester
+//  Copyright (c) 2013 Ford Motor Company
 
 #import <UIKit/UIKit.h>