Skip to content

676 increase delay and connection handling for ephys link #700

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

Merged
kjy5 merged 3 commits into from
Jun 21, 2024
Merged

676 increase delay and connection handling for ephys link #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abbd3e8
Switch to uncompressed build, ignoring files
kjy5 Jun 21, 2024
f90ded8
Increase retry limit
kjy5 Jun 21, 2024
90cd9c3
Version bump
kjy5 Jun 21, 2024
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 10 additions & 4 deletions Assets/Scripts/Pinpoint/UI/EphysLinkSettings/EphysLinkSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -279,7 +282,7 @@ void ConnectToServer()
err =>
{
attempts++;
if (attempts > 5)
if (attempts > 10)
{
_connectionErrorText.text = err;
_connectButtonText.text = "Connect";
Expand Down Expand Up @@ -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;
Expand Down
Binary file removed Assets/StreamingAssets/EphysLink-v1.3.0.exe
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion ...StreamingAssets/EphysLink-v1.3.0.exe.meta → Assets/StreamingAssets/EphysLink-v1.3.3.meta
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ProjectSettings/ProjectSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down