Skip to content

Commit 2c79cd4

Browse files
committed
chore: switch to explicit lock when attached to ephys link
1 parent 50e5c29 commit 2c79cd4

5 files changed

Lines changed: 26 additions & 2 deletions

File tree

Assets/Scripts/TrajectoryPlanner/Probes/Controllers/CartesianProbeController.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,23 @@ public override void ToggleControllerLock()
259259
}
260260
}
261261

262+
public override void SetControllerLock(bool locked)
263+
{
264+
_fullLock = locked;
265+
266+
if (_fullLock)
267+
{
268+
UnlockedDir = Vector4.zero;
269+
UnlockedRot = Vector3.zero;
270+
}
271+
else
272+
{
273+
UnlockedDir = Vector4.one;
274+
UnlockedRot = Vector3.one;
275+
}
276+
277+
}
278+
262279
/// <summary>
263280
/// Put this probe back at Bregma
264281
/// </summary>

Assets/Scripts/TrajectoryPlanner/Probes/Controllers/PlaceholderProbeController.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ public override void ToggleControllerLock()
130130
throw new NotImplementedException();
131131
}
132132

133+
public override void SetControllerLock(bool locked)
134+
{
135+
throw new NotImplementedException();
136+
}
137+
133138
public override void SwitchAxisMode()
134139
{
135140
throw new NotImplementedException();

Assets/Scripts/TrajectoryPlanner/Probes/ManipulatorBehaviorController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public void Initialize(string manipulatorID, bool calibrated)
236236
}
237237

238238
// Lock the manipulator from manual control
239-
_probeController.ToggleControllerLock();
239+
_probeController.SetControllerLock(true);
240240

241241
if (calibrated)
242242
// Bypass calibration and start echoing

Assets/Scripts/TrajectoryPlanner/Probes/ProbeController.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public void Register(ProbeManager probeManager)
3333

3434
public abstract void ToggleControllerLock();
3535

36+
public abstract void SetControllerLock(bool locked);
37+
3638
public abstract void SwitchAxisMode();
3739

3840
public abstract void ResetInsertion();

Assets/Scripts/TrajectoryPlanner/UI/EphysLinkSettings/ManipulatorConnectionPanel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void Initialize(EphysLinkSettings settingsMenu, string manipulatorID, str
3838
// Create new probe
3939
var trajectoryPlannerManager = FindObjectOfType<TrajectoryPlannerManager>();
4040
var newProbe = trajectoryPlannerManager.AddNewProbe(ProbeProperties.ProbeType.Neuropixels1);
41-
41+
4242
// Set type to pathfinder and register with Ephys Link
4343
newProbe.ManipulatorBehaviorController.ManipulatorType = type;
4444
newProbe.Color = Color.magenta;

0 commit comments

Comments
 (0)