Skip to content
This repository has been archived by the owner on Feb 28, 2020. It is now read-only.

Commit

Permalink
Command support (#22)
Browse files Browse the repository at this point in the history 
* changes in framework

* changes for "payload in diagnostic format" in enabler app

* story board changes

* changes in swift files

* changes in project file

* some changes in project files

* changes

* more
  • Loading branch information
@vkanishk
vkanishk authored May 17, 2017
1 parent 861ad26 commit 804ca38
Show file tree
Hide file tree
Showing 8 changed files with 866 additions and 344 deletions.
55 changes: 17 additions & 38 deletions openXCenabler.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@
3AE834461D5ED054003FD370 /* DiagViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE834431D5ED054003FD370 /* DiagViewController.swift */; };
3AE834471D5ED054003FD370 /* CanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE834441D5ED054003FD370 /* CanViewController.swift */; };
E75EE6931E110ED400B2AE3B /* openXCenablerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E75EE6921E110ED400B2AE3B /* openXCenablerTests.swift */; };
E7DE50291E4B00F60015E7CE /* openXCiOSFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E79901C31E3F5AFD00FB0579 /* openXCiOSFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
E78190A71ECC5B8C00DE3B18 /* openXCiOSFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E79901C31E3F5AFD00FB0579 /* openXCiOSFramework.framework */; };
E78190A81ECC5B9000DE3B18 /* ProtocolBuffers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B85B511ECC373500A3E5CB /* ProtocolBuffers.framework */; };
E79380701EB20201000EF3FF /* CommandsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E793806F1EB20201000EF3FF /* CommandsViewController.swift */; };
E79380711EB20201000EF3FF /* CommandsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E793806F1EB20201000EF3FF /* CommandsViewController.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -45,29 +48,8 @@
remoteGlobalIDString = E7C63D391DDC56BB00EE9790;
remoteInfo = openXCiOSFrameworkTests;
};
E7A0057D1E4AF6BD0082DD9A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = E79901BC1E3F5AFD00FB0579 /* openxc-ios-framework.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 3A1017051D5941C8006C5E93;
remoteInfo = "openxc-ios-framework";
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
3AE8345A1D60B830003FD370 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
E7DE50291E4B00F60015E7CE /* openXCiOSFramework.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
3A1016C11D5417AD006C5E93 /* openXCenabler.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = openXCenabler.app; sourceTree = BUILT_PRODUCTS_DIR; };
3A1016C41D5417AD006C5E93 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -87,15 +69,18 @@
E75EE6901E110ED400B2AE3B /* openXCenablerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = openXCenablerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
E75EE6921E110ED400B2AE3B /* openXCenablerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = openXCenablerTests.swift; sourceTree = "<group>"; };
E75EE6941E110ED400B2AE3B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E793806F1EB20201000EF3FF /* CommandsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommandsViewController.swift; sourceTree = "<group>"; };
E79901BC1E3F5AFD00FB0579 /* openxc-ios-framework.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "openxc-ios-framework.xcodeproj"; path = "openxc-ios-framework/openxc-ios-framework.xcodeproj"; sourceTree = "<group>"; };
E7E886671E4B038A0090B55E /* ProtocolBuffers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ProtocolBuffers.framework; path = "../../Library/Developer/Xcode/DerivedData/openXCenabler-dtbvzqnttfvvgiadwizgfuibvfzo/Build/Products/Debug-iphoneos/ProtocolBuffers.framework"; sourceTree = "<group>"; };
E7B85B511ECC373500A3E5CB /* ProtocolBuffers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ProtocolBuffers.framework; path = "../../Library/Developer/Xcode/DerivedData/openXCenabler-dtbvzqnttfvvgiadwizgfuibvfzo/Build/Products/Debug-iphonesimulator/ProtocolBuffers.framework"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
3A1016BE1D5417AD006C5E93 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E78190A81ECC5B9000DE3B18 /* ProtocolBuffers.framework in Frameworks */,
E78190A71ECC5B8C00DE3B18 /* openXCiOSFramework.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -133,6 +118,7 @@
3A1016C31D5417AD006C5E93 /* openXCenabler */ = {
isa = PBXGroup;
children = (
E793806F1EB20201000EF3FF /* CommandsViewController.swift */,
3AE834421D5ED054003FD370 /* SendCanViewController.swift */,
3AE834431D5ED054003FD370 /* DiagViewController.swift */,
3AE834441D5ED054003FD370 /* CanViewController.swift */,
Expand Down Expand Up @@ -171,7 +157,7 @@
E7E886661E4B038A0090B55E /* Frameworks */ = {
isa = PBXGroup;
children = (
E7E886671E4B038A0090B55E /* ProtocolBuffers.framework */,
E7B85B511ECC373500A3E5CB /* ProtocolBuffers.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -186,12 +172,10 @@
3A1016BD1D5417AD006C5E93 /* Sources */,
3A1016BE1D5417AD006C5E93 /* Frameworks */,
3A1016BF1D5417AD006C5E93 /* Resources */,
3AE8345A1D60B830003FD370 /* Embed Frameworks */,
);
buildRules = (
);
dependencies = (
E7A0057E1E4AF6BD0082DD9A /* PBXTargetDependency */,
);
name = openXCenabler;
productName = openXCenabler;
Expand Down Expand Up @@ -224,7 +208,7 @@
attributes = {
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0730;
ORGANIZATIONNAME = "Ford Motor Company";
ORGANIZATIONNAME = "Bug Labs";
TargetAttributes = {
3A1016C01D5417AD006C5E93 = {
CreatedOnToolsVersion = 7.3.1;
Expand Down Expand Up @@ -307,6 +291,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
E79380701EB20201000EF3FF /* CommandsViewController.swift in Sources */,
3AE834461D5ED054003FD370 /* DiagViewController.swift in Sources */,
3AE834451D5ED054003FD370 /* SendCanViewController.swift in Sources */,
3A1016C91D5417AD006C5E93 /* DashboardViewController.swift in Sources */,
Expand All @@ -321,6 +306,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
E79380711EB20201000EF3FF /* CommandsViewController.swift in Sources */,
E75EE6931E110ED400B2AE3B /* openXCenablerTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -333,11 +319,6 @@
target = 3A1016C01D5417AD006C5E93 /* openXCenabler */;
targetProxy = E75EE6951E110ED400B2AE3B /* PBXContainerItemProxy */;
};
E7A0057E1E4AF6BD0082DD9A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "openxc-ios-framework";
targetProxy = E7A0057D1E4AF6BD0082DD9A /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
Expand Down Expand Up @@ -446,7 +427,6 @@
3A1016D61D5417AD006C5E93 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand All @@ -459,7 +439,7 @@
INFOPLIST_FILE = openXCenabler/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "net.ford.openXCenabler-kanishka";
PRODUCT_BUNDLE_IDENTIFIER = "net.buglabs.openXCenabler-kanishka1";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 3.0;
Expand All @@ -469,7 +449,6 @@
3A1016D71D5417AD006C5E93 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand All @@ -482,7 +461,7 @@
INFOPLIST_FILE = openXCenabler/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "net.ford.openXCenabler-kanishka";
PRODUCT_BUNDLE_IDENTIFIER = "net.buglabs.openXCenabler-kanishka1";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 3.0;
Expand All @@ -495,7 +474,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/openxc-ios-framework/protobuf/plugin/ProtocolBuffers/build/Debug-iphoneos",
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = openXCenablerTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -512,7 +491,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/openxc-ios-framework/protobuf/plugin/ProtocolBuffers/build/Debug-iphoneos",
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = openXCenablerTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand Down
Binary file modified ...deproj/project.xcworkspace/xcuserdata/vkanishk.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
Loading

0 comments on commit 804ca38

Please sign in to comment.