Skip to content

featchorefix: Ephys Link and Copilot updates #589

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 82 commits into from
Nov 28, 2023
Merged

featchorefix: Ephys Link and Copilot updates #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
d6ab067
Fix probe option highlighting
kjy5 Sep 11, 2023
d83e293
Fix default driving speed not being set to 5
kjy5 Sep 13, 2023
5188d27
Prep to split computation
kjy5 Sep 13, 2023
6c2b28e
Set driving back to target status text
kjy5 Sep 13, 2023
50776f2
bump version
kjy5 Sep 13, 2023
32eed02
WIP fixing drive system
kjy5 Sep 13, 2023
db4c5aa
Change namespaces
kjy5 Sep 14, 2023
b8a59d0
Tested out unified space, need to flip some axes
kjy5 Sep 27, 2023
f71d443
Created manipulator space, reworked 3-axis transform
kjy5 Sep 28, 2023
643e25d
Depth now working (can remove directional check)
kjy5 Sep 29, 2023
71ee6c0
3 axis is incorrectly displaying depth drive
kjy5 Oct 3, 2023
c63dc9b
Fixed left handed manipulator
kjy5 Oct 3, 2023
e2aafb7
Right hand manipulator
kjy5 Oct 3, 2023
eab79b9
Fix file rearrangement
kjy5 Oct 3, 2023
7d3cb2a
Removed redundant code, debugging 3-axis
kjy5 Oct 3, 2023
4f418a8
Merge branch 'stable' into 556-utilize-unified-manipulator-space-in-p…
kjy5 Oct 5, 2023
1d7fd49
WIP trying to fix 3-axis rotations
kjy5 Oct 6, 2023
40efc2a
WIP drew axes of transform and "fixed" rotations
kjy5 Oct 7, 2023
3faed20
Fix transform operations again
kjy5 Oct 10, 2023
97130ed
Renamed transforms
kjy5 Oct 10, 2023
5ef525f
Add dimension setter
kjy5 Oct 10, 2023
aa84c8a
Removed old spaces
kjy5 Oct 10, 2023
f6f7cac
Added NumAxes and dimensions
kjy5 Oct 10, 2023
39c0fbc
Integrated axes and dimensions everywhere
kjy5 Oct 10, 2023
303ffaf
Bump minimum ephys link version
kjy5 Oct 10, 2023
002cb77
Merge branch '556-utilize-unified-manipulator-space-in-place-of-sensa…
kjy5 Oct 10, 2023
b2c45fd
Add shared dura position dictionary
kjy5 Oct 10, 2023
34b122e
Wrote state manager
kjy5 Oct 10, 2023
44cfdbb
Update JetBrains plugin
kjy5 Oct 17, 2023
e74b260
Allow beta versions of Ephys Link
kjy5 Oct 17, 2023
a0de813
Start implementing drive states
kjy5 Oct 18, 2023
e75a50d
Compute landmark depths, begin implementing drive
kjy5 Oct 20, 2023
cc59114
WIP drive. Depth is not computed right...
kjy5 Oct 24, 2023
b6e421d
Fixed drop to depth, not computing full depth correctly
kjy5 Oct 24, 2023
1a98e05
Drive can complete
kjy5 Oct 24, 2023
e5a04cb
Exiting
kjy5 Oct 24, 2023
1150899
Extract manipulatorId
kjy5 Oct 24, 2023
5376667
Bump Ephys Link
kjy5 Oct 24, 2023
10a9b49
Bump Ephys Link to 0.9.17
kjy5 Oct 24, 2023
692af1a
Removed old code
kjy5 Oct 24, 2023
8f6201d
Increase insertion drive ceiling
kjy5 Oct 24, 2023
cb8ffd1
Return to surface button from stop
kjy5 Oct 31, 2023
2160aba
Exit with DV
kjy5 Oct 31, 2023
e2cbba2
Fixed coterminal function
kjy5 Oct 31, 2023
59bbf5a
Added UI, created demo JSON
kjy5 Oct 31, 2023
ac2cde9
Unable to read file from streaming assets, find alternative
kjy5 Nov 1, 2023
0bf869a
WIP reading from file
kjy5 Nov 1, 2023
acaebc0
Rig and brain scaling
kjy5 Nov 2, 2023
e6078cf
Set probe to line
kjy5 Nov 2, 2023
99b7b91
Got poster images, revert some steps
kjy5 Nov 2, 2023
1738976
Parsed data, creating UI
kjy5 Nov 7, 2023
8634fb2
Demo basic UI
kjy5 Nov 7, 2023
34a6f3f
Validate connection and show start
kjy5 Nov 7, 2023
4db6b74
Move to idle
kjy5 Nov 7, 2023
5343666
Runs calibration, stop button does something
kjy5 Nov 7, 2023
fedab4e
Driven to entry coordinate
kjy5 Nov 7, 2023
10fd3fc
Fixed entry coordinate in data
kjy5 Nov 7, 2023
92d3c24
Untested dura and insertion
kjy5 Nov 7, 2023
c892cd1
Incorrect drive, but others work
kjy5 Nov 7, 2023
f73800c
Fixed depth coordinate
kjy5 Nov 7, 2023
4f5a592
Full loop
kjy5 Nov 7, 2023
a3b8cd2
Fixed bregma calibration step
kjy5 Nov 8, 2023
8fefd12
Change color to show progress
kjy5 Nov 8, 2023
3fd15f2
Spin brain
kjy5 Nov 8, 2023
7775a22
Coroutine based timer
kjy5 Nov 8, 2023
01871c8
Stop demo when there are no manipulators
kjy5 Nov 9, 2023
0cdf5b0
WIP debugging depth
kjy5 Nov 9, 2023
04ce3c7
Fixed demo retraction
kjy5 Nov 10, 2023
16166eb
Upgrade rider
kjy5 Nov 21, 2023
ae3f0e2
Resolved immediate code errors
kjy5 Nov 21, 2023
9fcf69b
Merge branch 'develop' into merging-kjy5
kjy5 Nov 28, 2023
35377f3
Merge branch '580-multiprobe-demo' into merging-kjy5
kjy5 Nov 28, 2023
6766416
Fix merge errors for ManipulatorBehaviorController.cs
kjy5 Nov 28, 2023
35aea89
DrivePanelHandler.cs
kjy5 Nov 28, 2023
2ad550c
EphysCopilotHandler.cs
kjy5 Nov 28, 2023
ad41e75
InsertionSelectionPanelHandler.cs
kjy5 Nov 28, 2023
52061e7
ManipulatorSpace.cs
kjy5 Nov 28, 2023
7f2a9fc
Remove Copilot demo
kjy5 Nov 28, 2023
852c66f
Remove Copilot demo UI
kjy5 Nov 28, 2023
dd7fc83
Echoing works with ump4
kjy5 Nov 28, 2023
792e02a
Flip 3 axis pitch
kjy5 Nov 28, 2023
6b754ee
Switch to dimension constructor
kjy5 Nov 28, 2023
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
1,611 changes: 1,611 additions & 0 deletions Assets/Prefabs/UI/EphysCopilot/CopilotDemoPanel.prefab
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions Assets/Prefabs/UI/EphysCopilot/CopilotDemoPanel.prefab.meta
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions Assets/Prefabs/UI/EphysCopilot/DrivePanel.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2750,7 +2750,7 @@ GameObject:
- component: {fileID: 4132892186996900426}
- component: {fileID: 2688848427838830438}
m_Layer: 5
m_Name: ReturnButton
m_Name: ExitButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -2774,7 +2774,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 250, y: -116.292206}
m_AnchoredPosition: {x: 250, y: -205.83333}
m_SizeDelta: {x: 500, y: 55}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5092748061186658588
Expand Down Expand Up @@ -2862,7 +2862,7 @@ MonoBehaviour:
- m_Target: {fileID: 4325646625566643338}
m_TargetAssemblyTypeName: TrajectoryPlanner.UI.EphysCopilot.DrivePanelHandler,
trajectoryplanner.ui.ephyscopilot
m_MethodName: DriveBackToSurface
m_MethodName: Exit
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
Expand Down Expand Up @@ -3454,8 +3454,8 @@ MonoBehaviour:
_drivePastDistanceInputField: {fileID: 1362464887898080331}
_stopButton: {fileID: 8950310822258812797}
_skipSettlingButton: {fileID: 3200770919843244483}
_returnButton: {fileID: 6315168989377721155}
_returnButtonText: {fileID: 3744103793431505929}
_exitButton: {fileID: 6315168989377721155}
_exitButtonText: {fileID: 3744103793431505929}
_statusText: {fileID: 3023744443413706275}
_timerText: {fileID: 6333824926798648489}
--- !u!114 &2376644107146004916
Expand Down
24 changes: 12 additions & 12 deletions Assets/Prefabs/UI/EphysCopilot/EphysCopilotPanel.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 8493615845065584824}
m_HandleRect: {fileID: 8361295466311985757}
m_Direction: 2
m_Value: 0
m_Size: 1
m_Value: 1
m_Size: 0.6180117
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
Expand Down Expand Up @@ -987,8 +987,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 5041640443237617115}
m_HandleRect: {fileID: 3068108255336848725}
m_Direction: 2
m_Value: 0
m_Size: 1
m_Value: 1
m_Size: 0.6180117
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
Expand Down Expand Up @@ -1783,7 +1783,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000024523586}
m_AnchoredPosition: {x: 0, y: -58.592503}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &5868928366586953604
Expand Down Expand Up @@ -2427,8 +2427,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 2824903185860898137}
m_HandleRect: {fileID: 604587447986236897}
m_Direction: 2
m_Value: 0
m_Size: 1
m_Value: 1
m_Size: 0.6180117
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
Expand Down Expand Up @@ -2544,7 +2544,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000024523586}
m_AnchoredPosition: {x: 0, y: -58.592503}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &4506754816824710980
Expand Down Expand Up @@ -2622,7 +2622,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -58.592472}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &5987856609131885523
Expand Down Expand Up @@ -3003,8 +3003,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 5713203697382717340}
m_HandleRect: {fileID: 538386439288270413}
m_Direction: 2
m_Value: 0
m_Size: 1
m_Value: 1
m_Size: 0.6180117
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
Expand Down Expand Up @@ -3170,7 +3170,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000024523586}
m_AnchoredPosition: {x: 0, y: -58.592503}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2245757367060331119
Expand Down
Loading