diff --git a/.gitignore b/.gitignore index 44d4e84f..fd8d6619 100644 --- a/.gitignore +++ b/.gitignore @@ -174,3 +174,5 @@ Assets/Resources.meta Library/com.unity.addressables/AddressablesBuildTEP.json Assets/AddressableAssetsData/link.xml Assets/AddressableAssetsData/link.xml.meta + +Assets/StreamingAssets/EphysLink-v1.3.3 \ No newline at end of file diff --git a/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs b/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs index 33b1f7f1..92ecc21d 100644 --- a/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs +++ b/Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs @@ -20,9 +20,12 @@ public class EphysLinkSettings : MonoBehaviour { #region Constants - private const string EPHYS_LINK_EXE_NAME = "EphysLink-v1.3.0.exe"; + private const string EPHYS_LINK_NAME = "EphysLink-v1.3.3"; private static string EphysLinkExePath => - Path.Combine(Application.streamingAssetsPath, EPHYS_LINK_EXE_NAME); + Path.Combine( + Application.streamingAssetsPath, + Path.Combine(EPHYS_LINK_NAME, $"{EPHYS_LINK_NAME}.exe") + ); #endregion @@ -279,7 +282,7 @@ void ConnectToServer() err => { attempts++; - if (attempts > 5) + if (attempts > 10) { _connectionErrorText.text = err; _connectButtonText.text = "Connect"; @@ -468,7 +471,10 @@ private void UpdateConnectionPanel() _connectButtonText.text = CommunicationManager.Instance.IsConnected ? "Disconnect" : "Connect"; - _connectButton.SetActive(CommunicationManager.Instance.IsConnected || _manipulatorTypeDropdown.value >= _manipulatorTypeDropdown.options.Count - 2); + _connectButton.SetActive( + CommunicationManager.Instance.IsConnected + || _manipulatorTypeDropdown.value >= _manipulatorTypeDropdown.options.Count - 2 + ); _manipulatorTypeDropdown.interactable = !CommunicationManager.Instance.IsConnected; _launchEphysLinkButton.interactable = !CommunicationManager.Instance.IsConnected; diff --git a/Assets/StreamingAssets/EphysLink-v1.3.0.exe b/Assets/StreamingAssets/EphysLink-v1.3.0.exe deleted file mode 100644 index 6d3c6b2d..00000000 Binary files a/Assets/StreamingAssets/EphysLink-v1.3.0.exe and /dev/null differ diff --git a/Assets/StreamingAssets/EphysLink-v1.3.0.exe.meta b/Assets/StreamingAssets/EphysLink-v1.3.3.meta similarity index 67% rename from Assets/StreamingAssets/EphysLink-v1.3.0.exe.meta rename to Assets/StreamingAssets/EphysLink-v1.3.3.meta index 730fb488..724dae81 100644 --- a/Assets/StreamingAssets/EphysLink-v1.3.0.exe.meta +++ b/Assets/StreamingAssets/EphysLink-v1.3.3.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 44a921934fc811540801c5d910c08303 +guid: 596a098a010666444868425ef94616b0 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 88bf55f4..a5624a3b 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -139,7 +139,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 1.1.7 + bundleVersion: 1.1.8 preloadedAssets: - {fileID: 11400000, guid: 6057f25234ce83a4bbb3ae618a501907, type: 2} metroInputSource: 0