Skip to content

Added name change features and fixed Pi,Pd bug #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BerkeleyCurtis wants to merge 8 commits into
base: ble_name
Choose a base branch
from
Open

Added name change features and fixed Pi,Pd bug #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3d25108
Experiment before Michael's changes
BerkeleyCurtis Feb 13, 2022
50ca7f9
Experimental Changes
BerkeleyCurtis Feb 13, 2022
188fed3
michael's main
BerkeleyCurtis Feb 13, 2022
fad201a
Merge branch 'ble_name' of https://github.com/wuxiaohua1011/ROAR_iOS_…
BerkeleyCurtis Feb 13, 2022
8ca9fa9
working cruis control
BerkeleyCurtis Feb 13, 2022
96712f9
added features for name change, corrected but in PID order
BerkeleyCurtis Feb 18, 2022
15356a4
fixed value
BerkeleyCurtis Feb 19, 2022
3bc8a11
adding throttle read out
BerkeleyCurtis Mar 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-ROAR.xcscheme
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions Pods/Pods.xcodeproj/xcuserdata/adamcurtis.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions ROAR.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
E83E6CE426ED6981006B1E39 /* Loaf in Frameworks */ = {isa = PBXBuildFile; productRef = E83E6CE326ED6981006B1E39 /* Loaf */; };
E83E6CE626ED6A9A006B1E39 /* SelectBluetoothViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E83E6CE526ED6A9A006B1E39 /* SelectBluetoothViewController.swift */; };
E83E6CE926ED7147006B1E39 /* JGProgressHUD in Frameworks */ = {isa = PBXBuildFile; productRef = E83E6CE826ED7147006B1E39 /* JGProgressHUD */; };
E87D8FFB2737A9F60078F31F /* ChooseBLEViewController+BLE.swift in Sources */ = {isa = PBXBuildFile; fileRef = E87D8FFA2737A9F60078F31F /* ChooseBLEViewController+BLE.swift */; };
E87D8FFB2737A9F60078F31F /* ChooseBLEViewController+BLE_original.swift in Sources */ = {isa = PBXBuildFile; fileRef = E87D8FFA2737A9F60078F31F /* ChooseBLEViewController+BLE_original.swift */; };
E88C3796270557F800289DC1 /* models.scnassets in Resources */ = {isa = PBXBuildFile; fileRef = E88C3795270557F800289DC1 /* models.scnassets */; };
E88C37A22705594800289DC1 /* ARPhoto2ViewController+Record.swift in Sources */ = {isa = PBXBuildFile; fileRef = E88C379C2705594800289DC1 /* ARPhoto2ViewController+Record.swift */; };
E88C37A32705594800289DC1 /* ARPhoto2ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E88C379D2705594800289DC1 /* ARPhoto2ViewController.swift */; };
Expand Down Expand Up @@ -71,7 +71,7 @@
A498B2D702D7CB6768B7DD47 /* Pods_ROAR.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ROAR.framework; sourceTree = BUILT_PRODUCTS_DIR; };
AA70681EA7FA776D886D4DC2 /* Pods-ROAR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ROAR.release.xcconfig"; path = "Target Support Files/Pods-ROAR/Pods-ROAR.release.xcconfig"; sourceTree = "<group>"; };
E821AECA27274AF1009F49D2 /* ScanQRCodeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanQRCodeViewController.swift; sourceTree = "<group>"; };
E83E6C9D26ED57BF006B1E39 /* ROAR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ROAR.app; sourceTree = BUILT_PRODUCTS_DIR; };
E83E6C9D26ED57BF006B1E39 /* HardwarePID-ROAR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HardwarePID-ROAR.app"; sourceTree = BUILT_PRODUCTS_DIR; };
E83E6CA026ED57BF006B1E39 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
E83E6CA226ED57BF006B1E39 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
E83E6CA426ED57BF006B1E39 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand All @@ -91,7 +91,7 @@
E83E6CDC26ED5D4F006B1E39 /* ViewController+AR.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ViewController+AR.swift"; sourceTree = "<group>"; };
E83E6CDE26ED623E006B1E39 /* ControlCenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlCenter.swift; sourceTree = "<group>"; };
E83E6CE526ED6A9A006B1E39 /* SelectBluetoothViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectBluetoothViewController.swift; sourceTree = "<group>"; };
E87D8FFA2737A9F60078F31F /* ChooseBLEViewController+BLE.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ChooseBLEViewController+BLE.swift"; sourceTree = "<group>"; };
E87D8FFA2737A9F60078F31F /* ChooseBLEViewController+BLE_original.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ChooseBLEViewController+BLE_original.swift"; sourceTree = "<group>"; };
E88C3795270557F800289DC1 /* models.scnassets */ = {isa = PBXFileReference; lastKnownFileType = wrapper.scnassets; path = models.scnassets; sourceTree = "<group>"; };
E88C379C2705594800289DC1 /* ARPhoto2ViewController+Record.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ARPhoto2ViewController+Record.swift"; sourceTree = "<group>"; };
E88C379D2705594800289DC1 /* ARPhoto2ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ARPhoto2ViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -176,7 +176,7 @@
E83E6C9E26ED57BF006B1E39 /* Products */ = {
isa = PBXGroup;
children = (
E83E6C9D26ED57BF006B1E39 /* ROAR.app */,
E83E6C9D26ED57BF006B1E39 /* HardwarePID-ROAR.app */,
E83E6CB326ED57C4006B1E39 /* ROARTests.xctest */,
E83E6CBE26ED57C4006B1E39 /* ROARUITests.xctest */,
);
Expand Down Expand Up @@ -246,7 +246,7 @@
children = (
E8C8EC912737A5F300CB2683 /* ChooseBLE.storyboard */,
E8C8EC932737A60700CB2683 /* ChooseBLEViewController.swift */,
E87D8FFA2737A9F60078F31F /* ChooseBLEViewController+BLE.swift */,
E87D8FFA2737A9F60078F31F /* ChooseBLEViewController+BLE_original.swift */,
);
path = ChooseBLE;
sourceTree = "<group>";
Expand All @@ -263,9 +263,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
E83E6C9C26ED57BF006B1E39 /* ROAR */ = {
E83E6C9C26ED57BF006B1E39 /* HardwarePID-ROAR */ = {
isa = PBXNativeTarget;
buildConfigurationList = E83E6CC726ED57C4006B1E39 /* Build configuration list for PBXNativeTarget "ROAR" */;
buildConfigurationList = E83E6CC726ED57C4006B1E39 /* Build configuration list for PBXNativeTarget "HardwarePID-ROAR" */;
buildPhases = (
E1EA542063A4D250171F60C5 /* [CP] Check Pods Manifest.lock */,
E83E6C9926ED57BF006B1E39 /* Sources */,
Expand All @@ -276,7 +276,7 @@
);
dependencies = (
);
name = ROAR;
name = "HardwarePID-ROAR";
packageProductDependencies = (
E83E6CD726ED5B9E006B1E39 /* Vapor */,
E83E6CDA26ED5C20006B1E39 /* SwiftyBeaver */,
Expand All @@ -289,7 +289,7 @@
E8EABA302737C2650009DCC1 /* CocoaAsyncSocket */,
);
productName = ROAR;
productReference = E83E6C9D26ED57BF006B1E39 /* ROAR.app */;
productReference = E83E6C9D26ED57BF006B1E39 /* HardwarePID-ROAR.app */;
productType = "com.apple.product-type.application";
};
E83E6CB226ED57C4006B1E39 /* ROARTests */ = {
Expand Down Expand Up @@ -371,7 +371,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
E83E6C9C26ED57BF006B1E39 /* ROAR */,
E83E6C9C26ED57BF006B1E39 /* HardwarePID-ROAR */,
E83E6CB226ED57C4006B1E39 /* ROARTests */,
E83E6CBD26ED57C4006B1E39 /* ROARUITests */,
);
Expand Down Expand Up @@ -456,7 +456,7 @@
E83E6CD526ED5AEF006B1E39 /* AppStruct.swift in Sources */,
E8C8EC8F273466C600CB2683 /* ViewController+UDP.swift in Sources */,
E88C37A42705594800289DC1 /* SelectContentDelegate.swift in Sources */,
E87D8FFB2737A9F60078F31F /* ChooseBLEViewController+BLE.swift in Sources */,
E87D8FFB2737A9F60078F31F /* ChooseBLEViewController+BLE_original.swift in Sources */,
E88C37A22705594800289DC1 /* ARPhoto2ViewController+Record.swift in Sources */,
E821AECB27274AF1009F49D2 /* ScanQRCodeViewController.swift in Sources */,
E83E6CA326ED57BF006B1E39 /* SceneDelegate.swift in Sources */,
Expand Down Expand Up @@ -484,12 +484,12 @@
/* Begin PBXTargetDependency section */
E83E6CB526ED57C4006B1E39 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = E83E6C9C26ED57BF006B1E39 /* ROAR */;
target = E83E6C9C26ED57BF006B1E39 /* HardwarePID-ROAR */;
targetProxy = E83E6CB426ED57C4006B1E39 /* PBXContainerItemProxy */;
};
E83E6CC026ED57C4006B1E39 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = E83E6C9C26ED57BF006B1E39 /* ROAR */;
target = E83E6C9C26ED57BF006B1E39 /* HardwarePID-ROAR */;
targetProxy = E83E6CBF26ED57C4006B1E39 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
Expand Down Expand Up @@ -638,7 +638,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 13;
CURRENT_PROJECT_VERSION = 14;
DEVELOPMENT_TEAM = D9D2HSUW4S;
INFOPLIST_FILE = ROAR/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -661,7 +661,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 13;
CURRENT_PROJECT_VERSION = 14;
DEVELOPMENT_TEAM = D9D2HSUW4S;
INFOPLIST_FILE = ROAR/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down Expand Up @@ -772,7 +772,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
E83E6CC726ED57C4006B1E39 /* Build configuration list for PBXNativeTarget "ROAR" */ = {
E83E6CC726ED57C4006B1E39 /* Build configuration list for PBXNativeTarget "HardwarePID-ROAR" */ = {
isa = XCConfigurationList;
buildConfigurations = (
E83E6CC826ED57C4006B1E39 /* Debug */,
Expand Down
98 changes: 98 additions & 0 deletions ROAR.xcodeproj/xcshareddata/xcschemes/HardwarePID-ROAR.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1320"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E83E6C9C26ED57BF006B1E39"
BuildableName = "HardwarePID-ROAR.app"
BlueprintName = "HardwarePID-ROAR"
ReferencedContainer = "container:ROAR.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E83E6CB226ED57C4006B1E39"
BuildableName = "ROARTests.xctest"
BlueprintName = "ROARTests"
ReferencedContainer = "container:ROAR.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E83E6CBD26ED57C4006B1E39"
BuildableName = "ROARUITests.xctest"
BlueprintName = "ROARUITests"
ReferencedContainer = "container:ROAR.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E83E6C9C26ED57BF006B1E39"
BuildableName = "HardwarePID-ROAR.app"
BlueprintName = "HardwarePID-ROAR"
ReferencedContainer = "container:ROAR.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E83E6C9C26ED57BF006B1E39"
BuildableName = "HardwarePID-ROAR.app"
BlueprintName = "HardwarePID-ROAR"
ReferencedContainer = "container:ROAR.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
37 changes: 37 additions & 0 deletions ROAR.xcodeproj/xcuserdata/adamcurtis.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?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>SchemeUserState</key>
<dict>
<key>HardwarePID-ROAR.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>ROAR.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>E83E6C9C26ED57BF006B1E39</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>E83E6CB226ED57C4006B1E39</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>E83E6CBD26ED57C4006B1E39</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
Binary file added ROAR.xcworkspace/xcuserdata/adamcurtis.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions ROAR.xcworkspace/xcuserdata/adamcurtis.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "BB07BCD9-B118-46D9-A3D3-6F6D813566CD"
type = "0"
version = "2.0">
</Bucket>
14 changes: 14 additions & 0 deletions ROAR/AppStruct.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
//

import Foundation
import CoreBluetooth

struct AppInfo : Codable {



static var sessionData: SessionData = SessionData()
static var curr_world_name: String = "berkeley"
static var bluetootConfigurations: BluetoothConfigurations? = nil
Expand All @@ -19,6 +24,15 @@ struct AppInfo : Codable {
return "\(name)_ar_experience_data"
}

static func forget() {
UserDefaults.standard.setValue([
"bluetooth_name": "none",
"bluetooth_uuid": "none"],
forKey: "bluetooth_data")

UserDefaults.standard.setValue(AppInfo.pc_address, forKey: "pc_address")
}

static func save() {
UserDefaults.standard.setValue([
"bluetooth_name": AppInfo.bluetootConfigurations?.name ?? "",
Expand Down
Loading