diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/project.pbxproj b/CarControlleriOS/CarController.xcodeproj/project.pbxproj similarity index 80% rename from CarControlleriOS/CarController/CarController.xcodeproj/project.pbxproj rename to CarControlleriOS/CarController.xcodeproj/project.pbxproj index 27f45a5..ab9af95 100644 --- a/CarControlleriOS/CarController/CarController.xcodeproj/project.pbxproj +++ b/CarControlleriOS/CarController.xcodeproj/project.pbxproj @@ -21,14 +21,10 @@ 5A9EB280240100970053D3CF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5A9EB27F240100970053D3CF /* Assets.xcassets */; }; 5A9EB283240100970053D3CF /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5A9EB282240100970053D3CF /* Preview Assets.xcassets */; }; 5A9EB286240100970053D3CF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5A9EB284240100970053D3CF /* LaunchScreen.storyboard */; }; - 5AE45131245CFF2800D82BAF /* GRPC in Frameworks */ = {isa = PBXBuildFile; productRef = 5AE45130245CFF2800D82BAF /* GRPC */; }; - 5BEA7A8C24AF155FC02A6C58 /* Pods_CarController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03FB25F696A1B33332234B4F /* Pods_CarController.framework */; }; + 5AE45131245CFF2800D82BAF /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 5AE45130245CFF2800D82BAF /* SwiftPackageProductDependency */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 03FB25F696A1B33332234B4F /* Pods_CarController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CarController.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 460C6595E5C32777EF7F2A4E /* Pods-CarController.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CarController.release.xcconfig"; path = "Target Support Files/Pods-CarController/Pods-CarController.release.xcconfig"; sourceTree = ""; }; - 4C5C85A33DD98E3CA9FCEF6B /* Pods-CarController.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CarController.debug.xcconfig"; path = "Target Support Files/Pods-CarController/Pods-CarController.debug.xcconfig"; sourceTree = ""; }; 5A6B344D2459AFCE0000E6FC /* SlamController.grpc.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SlamController.grpc.swift; sourceTree = ""; }; 5A6B344E2459AFCE0000E6FC /* SlamController.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SlamController.pb.swift; sourceTree = ""; }; 5A6B34502459AFCE0000E6FC /* lidar_tracker.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = lidar_tracker.pb.swift; sourceTree = ""; }; @@ -52,22 +48,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5AE45131245CFF2800D82BAF /* GRPC in Frameworks */, - 5BEA7A8C24AF155FC02A6C58 /* Pods_CarController.framework in Frameworks */, + 5AE45131245CFF2800D82BAF /* BuildFile in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 49C2CFB75CF1768D7363A9DB /* Frameworks */ = { - isa = PBXGroup; - children = ( - 03FB25F696A1B33332234B4F /* Pods_CarController.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 5A6B344B2459AFCE0000E6FC /* car */ = { isa = PBXGroup; children = ( @@ -112,8 +99,6 @@ 5A6B344B2459AFCE0000E6FC /* car */, 5A9EB278240100960053D3CF /* CarController */, 5A9EB277240100960053D3CF /* Products */, - A595BD070E838AFD9A774908 /* Pods */, - 49C2CFB75CF1768D7363A9DB /* Frameworks */, ); sourceTree = ""; }; @@ -149,15 +134,6 @@ path = "Preview Content"; sourceTree = ""; }; - A595BD070E838AFD9A774908 /* Pods */ = { - isa = PBXGroup; - children = ( - 4C5C85A33DD98E3CA9FCEF6B /* Pods-CarController.debug.xcconfig */, - 460C6595E5C32777EF7F2A4E /* Pods-CarController.release.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -165,11 +141,9 @@ isa = PBXNativeTarget; buildConfigurationList = 5A9EB28A240100970053D3CF /* Build configuration list for PBXNativeTarget "CarController" */; buildPhases = ( - DF3C92ECA29980008D9A0ED0 /* [CP] Check Pods Manifest.lock */, 5A9EB272240100960053D3CF /* Sources */, 5A9EB273240100960053D3CF /* Frameworks */, 5A9EB274240100960053D3CF /* Resources */, - E0B3D65287999242E7AD3ABB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -177,7 +151,7 @@ ); name = CarController; packageProductDependencies = ( - 5AE45130245CFF2800D82BAF /* GRPC */, + 5AE45130245CFF2800D82BAF /* SwiftPackageProductDependency */, ); productName = CarController; productReference = 5A9EB276240100960053D3CF /* CarController.app */; @@ -208,7 +182,7 @@ ); mainGroup = 5A9EB26D240100950053D3CF; packageReferences = ( - 5AE4512F245CFF2800D82BAF /* XCRemoteSwiftPackageReference "grpc-swift" */, + 5AE4512F245CFF2800D82BAF /* RemoteSwiftPackageReference */, ); productRefGroup = 5A9EB277240100960053D3CF /* Products */; projectDirPath = ""; @@ -232,48 +206,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - DF3C92ECA29980008D9A0ED0 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-CarController-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - E0B3D65287999242E7AD3ABB /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-CarController/Pods-CarController-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-CarController/Pods-CarController-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CarController/Pods-CarController-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 5A9EB272240100960053D3CF /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -423,7 +355,6 @@ }; 5A9EB28B240100970053D3CF /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4C5C85A33DD98E3CA9FCEF6B /* Pods-CarController.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; @@ -444,7 +375,6 @@ }; 5A9EB28C240100970053D3CF /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 460C6595E5C32777EF7F2A4E /* Pods-CarController.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; @@ -487,7 +417,7 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 5AE4512F245CFF2800D82BAF /* XCRemoteSwiftPackageReference "grpc-swift" */ = { + 5AE4512F245CFF2800D82BAF /* RemoteSwiftPackageReference */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/grpc/grpc-swift.git"; requirement = { @@ -498,9 +428,9 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 5AE45130245CFF2800D82BAF /* GRPC */ = { + 5AE45130245CFF2800D82BAF /* SwiftPackageProductDependency */ = { isa = XCSwiftPackageProductDependency; - package = 5AE4512F245CFF2800D82BAF /* XCRemoteSwiftPackageReference "grpc-swift" */; + package = 5AE4512F245CFF2800D82BAF /* RemoteSwiftPackageReference */; productName = GRPC; }; /* End XCSwiftPackageProductDependency section */ diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/CarControlleriOS/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 68% rename from CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to CarControlleriOS/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 4a8720b..919434a 100644 --- a/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/CarControlleriOS/CarController.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/CarControlleriOS/CarController/CarController.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved similarity index 100% rename from CarControlleriOS/CarController/CarController.xcworkspace/xcshareddata/swiftpm/Package.resolved rename to CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate b/CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..2d2e86a Binary files /dev/null and b/CarControlleriOS/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/CarControlleriOS/CarController/CarController.xcworkspace/contents.xcworkspacedata b/CarControlleriOS/CarController.xcworkspace/contents.xcworkspacedata similarity index 68% rename from CarControlleriOS/CarController/CarController.xcworkspace/contents.xcworkspacedata rename to CarControlleriOS/CarController.xcworkspace/contents.xcworkspacedata index 4ffc8d6..65a0c21 100644 --- a/CarControlleriOS/CarController/CarController.xcworkspace/contents.xcworkspacedata +++ b/CarControlleriOS/CarController.xcworkspace/contents.xcworkspacedata @@ -4,7 +4,4 @@ - - diff --git a/CarControlleriOS/CarController/CarController.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CarControlleriOS/CarController.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from CarControlleriOS/CarController/CarController.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to CarControlleriOS/CarController.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/xcuserdata/piv.xcuserdatad/xcschemes/xcschememanagement.plist b/CarControlleriOS/CarController.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 54% rename from CarControlleriOS/CarController/CarController.xcodeproj/xcuserdata/piv.xcuserdatad/xcschemes/xcschememanagement.plist rename to CarControlleriOS/CarController.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index 475fda5..f9b0d7c 100644 --- a/CarControlleriOS/CarController/CarController.xcodeproj/xcuserdata/piv.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/CarControlleriOS/CarController.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -2,13 +2,7 @@ - SchemeUserState - - CarController.xcscheme_^#shared#^_ - - orderHint - 0 - - + PreviewsEnabled + diff --git a/CarControlleriOS/CarController.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CarControlleriOS/CarController.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..c90f41d --- /dev/null +++ b/CarControlleriOS/CarController.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,70 @@ +{ + "object": { + "pins": [ + { + "package": "grpc-swift", + "repositoryURL": "https://github.com/grpc/grpc-swift.git", + "state": { + "branch": null, + "revision": "373ffd54c1c1a319d0ddac9476d13be9023584bb", + "version": "1.0.0-alpha.11" + } + }, + { + "package": "swift-log", + "repositoryURL": "https://github.com/apple/swift-log.git", + "state": { + "branch": null, + "revision": "74d7b91ceebc85daf387ebb206003f78813f71aa", + "version": "1.2.0" + } + }, + { + "package": "swift-nio", + "repositoryURL": "https://github.com/apple/swift-nio.git", + "state": { + "branch": null, + "revision": "e876fb37410e0036b98b5361bb18e6854739572b", + "version": "2.16.0" + } + }, + { + "package": "swift-nio-http2", + "repositoryURL": "https://github.com/apple/swift-nio-http2.git", + "state": { + "branch": null, + "revision": "82eb3fa0974b838358ee46bc6c5381e5ae5de6b9", + "version": "1.11.0" + } + }, + { + "package": "swift-nio-ssl", + "repositoryURL": "https://github.com/apple/swift-nio-ssl.git", + "state": { + "branch": null, + "revision": "ae213938e151964aa691f0e902462fbe06baeeb6", + "version": "2.7.1" + } + }, + { + "package": "swift-nio-transport-services", + "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git", + "state": { + "branch": null, + "revision": "85a67aea7caf5396ed599543dd23cffeb6dbbf96", + "version": "1.5.1" + } + }, + { + "package": "SwiftProtobuf", + "repositoryURL": "https://github.com/apple/swift-protobuf.git", + "state": { + "branch": null, + "revision": "7790acf0a81d08429cb20375bf42a8c7d279c5fe", + "version": "1.8.0" + } + } + ] + }, + "version": 1 +} diff --git a/CarControlleriOS/CarController/CarController/AppDelegate.swift b/CarControlleriOS/CarController/AppDelegate.swift similarity index 100% rename from CarControlleriOS/CarController/CarController/AppDelegate.swift rename to CarControlleriOS/CarController/AppDelegate.swift diff --git a/CarControlleriOS/CarController/CarController/Assets.xcassets/AppIcon.appiconset/Contents.json b/CarControlleriOS/CarController/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from CarControlleriOS/CarController/CarController/Assets.xcassets/AppIcon.appiconset/Contents.json rename to CarControlleriOS/CarController/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/CarControlleriOS/CarController/CarController/Assets.xcassets/Contents.json b/CarControlleriOS/CarController/Assets.xcassets/Contents.json similarity index 100% rename from CarControlleriOS/CarController/CarController/Assets.xcassets/Contents.json rename to CarControlleriOS/CarController/Assets.xcassets/Contents.json diff --git a/CarControlleriOS/CarController/CarController/Base.lproj/LaunchScreen.storyboard b/CarControlleriOS/CarController/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from CarControlleriOS/CarController/CarController/Base.lproj/LaunchScreen.storyboard rename to CarControlleriOS/CarController/Base.lproj/LaunchScreen.storyboard diff --git a/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate b/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 48d4abe..0000000 Binary files a/CarControlleriOS/CarController/CarController.xcodeproj/project.xcworkspace/xcuserdata/piv.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/CarControlleriOS/CarController/CarController/ContentView.swift b/CarControlleriOS/CarController/ContentView.swift similarity index 100% rename from CarControlleriOS/CarController/CarController/ContentView.swift rename to CarControlleriOS/CarController/ContentView.swift diff --git a/CarControlleriOS/CarController/CarController/Info.plist b/CarControlleriOS/CarController/Info.plist similarity index 100% rename from CarControlleriOS/CarController/CarController/Info.plist rename to CarControlleriOS/CarController/Info.plist diff --git a/CarControlleriOS/CarController/CarController/Preview Content/Preview Assets.xcassets/Contents.json b/CarControlleriOS/CarController/Preview Content/Preview Assets.xcassets/Contents.json similarity index 100% rename from CarControlleriOS/CarController/CarController/Preview Content/Preview Assets.xcassets/Contents.json rename to CarControlleriOS/CarController/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/CarControlleriOS/CarController/CarController/SceneDelegate.swift b/CarControlleriOS/CarController/SceneDelegate.swift similarity index 100% rename from CarControlleriOS/CarController/CarController/SceneDelegate.swift rename to CarControlleriOS/CarController/SceneDelegate.swift diff --git a/CarControlleriOS/CarController/CarController/ServerData.swift b/CarControlleriOS/CarController/ServerData.swift similarity index 100% rename from CarControlleriOS/CarController/CarController/ServerData.swift rename to CarControlleriOS/CarController/ServerData.swift diff --git a/CarControlleriOS/CarController/CarController/SimpleControllerView.swift b/CarControlleriOS/CarController/SimpleControllerView.swift similarity index 89% rename from CarControlleriOS/CarController/CarController/SimpleControllerView.swift rename to CarControlleriOS/CarController/SimpleControllerView.swift index ddddf3c..a394d1f 100644 --- a/CarControlleriOS/CarController/CarController/SimpleControllerView.swift +++ b/CarControlleriOS/CarController/SimpleControllerView.swift @@ -11,11 +11,13 @@ import SwiftUI struct SimpleControllerView: View { @EnvironmentObject var server: ServerData @State var throttle: Float = 0 + @State var steering: Float = 0 var body: some View { HStack{ Text("Opened Simple Controller!") Slider(value: $throttle) + Slider(value: $steering) } } }