Skip to content

Linear Drive AEON3 integration #619

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
wants to merge 11 commits into
base: social-ephys
Choose a base branch
from
Open

Linear Drive AEON3 integration #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b79fb50
Merge remote-tracking branch 'origin/social' into social-ephys
aspaNeuro Mar 5, 2025
94c1b9f
Add TetherSlackController
aspaNeuro Mar 20, 2025
814f47d
Change Patch1Rfid ComPort
aspaNeuro Mar 20, 2025
d305ab2
Update linear drive position for offset in 2 dimensions
NeuroThom Mar 20, 2025
990988f
Update ThetherSlackController
aspaNeuro May 22, 2025
bbe5094
Change CameraTop Exposure time
aspaNeuro May 22, 2025
4c0c2f6
Add a LedTrackingTop workflow
aspaNeuro May 22, 2025
6910f09
Update TetherSlackController parameters
aspaNeuro May 22, 2025
05ad92f
Add Led tracking image
aspaNeuro May 23, 2025
db52213
Add Led Tracking Image to LedTrackingTop
aspaNeuro Jun 4, 2025
cb9108b
Add a logger for LED binary regions
aspaNeuro Jun 4, 2025
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
28 changes: 14 additions & 14 deletions bonsai/Bonsai.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageConfiguration xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Packages>
<Package id="Aeon.Acquisition" version="0.5.0-build240102" />
<Package id="Aeon.Database" version="0.1.0-build231020" />
<Package id="Aeon.Environment" version="0.1.0-build240102" />
<Package id="Aeon.Foraging" version="0.1.0-build231202" />
<Package id="Aeon.Acquisition" version="0.6.0" />
<Package id="Aeon.Database" version="0.1.0" />
<Package id="Aeon.Environment" version="0.1.0" />
<Package id="Aeon.Foraging" version="0.1.2" />
<Package id="Aeon.LinearDrive" version="0.1.0-preview230921" />
<Package id="AsyncIO" version="0.1.69" />
<Package id="Bonsai" version="2.8.3" />
Expand All @@ -22,8 +22,8 @@
<Package id="Bonsai.Pylon" version="0.3.0" />
<Package id="Bonsai.Scripting.Expressions" version="2.8.0" />
<Package id="Bonsai.Scripting.Expressions.Design" version="2.8.0" />
<Package id="Bonsai.Sleap" version="0.2.1" />
<Package id="Bonsai.Sleap.Design" version="0.2.0" />
<Package id="Bonsai.Sleap" version="0.3.0" />
<Package id="Bonsai.Sleap.Design" version="0.3.0" />
<Package id="Bonsai.Spinnaker" version="0.7.1" />
<Package id="Bonsai.System" version="2.8.1" />
<Package id="Bonsai.System.Design" version="2.8.0" />
Expand All @@ -35,7 +35,7 @@
<Package id="Harp.Behavior" version="0.1.0" />
<Package id="Harp.CameraControllerGen2" version="0.1.0" />
<Package id="Harp.ClockSynchronizer" version="0.1.0" />
<Package id="Harp.OutputExpander" version="0.2.0-build231204" />
<Package id="Harp.OutputExpander" version="0.2.0" />
<Package id="Harp.RfidReader" version="0.1.0" />
<Package id="Harp.TimestampGeneratorGen3" version="0.1.0" />
<Package id="jacobslusser.ScintillaNET" version="3.6.3" />
Expand Down Expand Up @@ -111,10 +111,10 @@
<AssemblyReference assemblyName="Harp.TimestampGeneratorGen3" />
</AssemblyReferences>
<AssemblyLocations>
<AssemblyLocation assemblyName="Aeon.Acquisition" processorArchitecture="MSIL" location="Packages\Aeon.Acquisition.0.5.0-build240102\lib\net472\Aeon.Acquisition.dll" />
<AssemblyLocation assemblyName="Aeon.Database" processorArchitecture="MSIL" location="Packages\Aeon.Database.0.1.0-build231020\lib\net472\Aeon.Database.dll" />
<AssemblyLocation assemblyName="Aeon.Environment" processorArchitecture="MSIL" location="Packages\Aeon.Environment.0.1.0-build240102\lib\net472\Aeon.Environment.dll" />
<AssemblyLocation assemblyName="Aeon.Foraging" processorArchitecture="MSIL" location="Packages\Aeon.Foraging.0.1.0-build231202\lib\net472\Aeon.Foraging.dll" />
<AssemblyLocation assemblyName="Aeon.Acquisition" processorArchitecture="MSIL" location="Packages\Aeon.Acquisition.0.6.0\lib\net472\Aeon.Acquisition.dll" />
<AssemblyLocation assemblyName="Aeon.Database" processorArchitecture="MSIL" location="Packages\Aeon.Database.0.1.0\lib\net472\Aeon.Database.dll" />
<AssemblyLocation assemblyName="Aeon.Environment" processorArchitecture="MSIL" location="Packages\Aeon.Environment.0.1.0\lib\net472\Aeon.Environment.dll" />
<AssemblyLocation assemblyName="Aeon.Foraging" processorArchitecture="MSIL" location="Packages\Aeon.Foraging.0.1.2\lib\net472\Aeon.Foraging.dll" />
<AssemblyLocation assemblyName="Aeon.LinearDrive" processorArchitecture="MSIL" location="Packages\Aeon.LinearDrive.0.1.0-preview230921\lib\net462\Aeon.LinearDrive.dll" />
<AssemblyLocation assemblyName="AsyncIO" processorArchitecture="MSIL" location="Packages\AsyncIO.0.1.69\lib\net40\AsyncIO.dll" />
<AssemblyLocation assemblyName="Basler.Pylon" processorArchitecture="X86" location="Packages\Bonsai.Pylon.0.3.0\build\net462\bin\x86\Basler.Pylon.dll" />
Expand All @@ -137,8 +137,8 @@
<AssemblyLocation assemblyName="Bonsai.Scripting.Expressions.Design" processorArchitecture="MSIL" location="Packages\Bonsai.Scripting.Expressions.Design.2.8.0\lib\net462\Bonsai.Scripting.Expressions.Design.dll" />
<AssemblyLocation assemblyName="Bonsai.Scripting.IronPython" processorArchitecture="MSIL" location="Packages\Bonsai.Scripting.IronPython.2.8.0\lib\net462\Bonsai.Scripting.IronPython.dll" />
<AssemblyLocation assemblyName="Bonsai.Scripting.IronPython.Design" processorArchitecture="MSIL" location="Packages\Bonsai.Scripting.IronPython.Design.2.8.0\lib\net462\Bonsai.Scripting.IronPython.Design.dll" />
<AssemblyLocation assemblyName="Bonsai.Sleap" processorArchitecture="MSIL" location="Packages\Bonsai.Sleap.0.2.1\lib\net472\Bonsai.Sleap.dll" />
<AssemblyLocation assemblyName="Bonsai.Sleap.Design" processorArchitecture="MSIL" location="Packages\Bonsai.Sleap.Design.0.2.0\lib\net472\Bonsai.Sleap.Design.dll" />
<AssemblyLocation assemblyName="Bonsai.Sleap" processorArchitecture="MSIL" location="Packages\Bonsai.Sleap.0.3.0\lib\net472\Bonsai.Sleap.dll" />
<AssemblyLocation assemblyName="Bonsai.Sleap.Design" processorArchitecture="MSIL" location="Packages\Bonsai.Sleap.Design.0.3.0\lib\net472\Bonsai.Sleap.Design.dll" />
<AssemblyLocation assemblyName="Bonsai.Spinnaker" processorArchitecture="MSIL" location="Packages\Bonsai.Spinnaker.0.7.1\lib\net462\Bonsai.Spinnaker.dll" />
<AssemblyLocation assemblyName="Bonsai.System" processorArchitecture="MSIL" location="Packages\Bonsai.System.2.8.1\lib\net462\Bonsai.System.dll" />
<AssemblyLocation assemblyName="Bonsai.System.Design" processorArchitecture="MSIL" location="Packages\Bonsai.System.Design.2.8.0\lib\net462\Bonsai.System.Design.dll" />
Expand All @@ -149,7 +149,7 @@
<AssemblyLocation assemblyName="Harp.Behavior" processorArchitecture="MSIL" location="Packages\Harp.Behavior.0.1.0\lib\net462\Harp.Behavior.dll" />
<AssemblyLocation assemblyName="Harp.CameraControllerGen2" processorArchitecture="MSIL" location="Packages\Harp.CameraControllerGen2.0.1.0\lib\net462\Harp.CameraControllerGen2.dll" />
<AssemblyLocation assemblyName="Harp.ClockSynchronizer" processorArchitecture="MSIL" location="Packages\Harp.ClockSynchronizer.0.1.0\lib\net462\Harp.ClockSynchronizer.dll" />
<AssemblyLocation assemblyName="Harp.OutputExpander" processorArchitecture="MSIL" location="Packages\Harp.OutputExpander.0.2.0-build231204\lib\net462\Harp.OutputExpander.dll" />
<AssemblyLocation assemblyName="Harp.OutputExpander" processorArchitecture="MSIL" location="Packages\Harp.OutputExpander.0.2.0\lib\net462\Harp.OutputExpander.dll" />
<AssemblyLocation assemblyName="Harp.RfidReader" processorArchitecture="MSIL" location="Packages\Harp.RfidReader.0.1.0\lib\net462\Harp.RfidReader.dll" />
<AssemblyLocation assemblyName="Harp.TimestampGeneratorGen3" processorArchitecture="MSIL" location="Packages\Harp.TimestampGeneratorGen3.0.1.0\lib\net462\Harp.TimestampGeneratorGen3.dll" />
<AssemblyLocation assemblyName="IronPython" processorArchitecture="MSIL" location="Packages\IronPython.2.7.5\lib\Net45\IronPython.dll" />
Expand Down
3 changes: 2 additions & 1 deletion workflows/social/EnvironmentEasy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ blocks:
patches:
patch1: { distributionRef: easy }
patch2: { distributionRef: easy }
patch3: { distributionRef: easy }
patch3: { distributionRef: easy }
patchDummy1: { distributionRef: easy }
15 changes: 13 additions & 2 deletions workflows/social/EnvironmentRandom.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ distributions:
hard:
rate: 0.002
offset: 75
dummy:
rate: .inf
offset: 375
blocks:
- &baseParameters
weight: 1
Expand All @@ -18,38 +21,46 @@ blocks:
patch1: { distributionRef: easy }
patch2: { distributionRef: easy }
patch3: { distributionRef: easy }
- <<: *baseParameters
patchDummy1: { distributionRef: dummy }
- <<: *baseParameters
patches:
patch1: { distributionRef: easy }
patch2: { distributionRef: medium }
patch3: { distributionRef: hard }
patchDummy1: { distributionRef: dummy }
- <<: *baseParameters
patches:
patch1: { distributionRef: easy }
patch2: { distributionRef: hard }
patch3: { distributionRef: medium }
patchDummy1: { distributionRef: dummy }
- <<: *baseParameters
patches:
patch1: { distributionRef: medium }
patch2: { distributionRef: easy }
patch3: { distributionRef: hard }
patchDummy1: { distributionRef: dummy }
- <<: *baseParameters
patches:
patch1: { distributionRef: medium }
patch2: { distributionRef: hard }
patch3: { distributionRef: easy }
patchDummy1: { distributionRef: dummy }
- <<: *baseParameters
patches:
patch1: { distributionRef: hard }
patch2: { distributionRef: easy }
patch3: { distributionRef: medium }
patchDummy1: { distributionRef: dummy }
- <<: *baseParameters
patches:
patch1: { distributionRef: hard }
patch2: { distributionRef: medium }
patch3: { distributionRef: easy }
patchDummy1: { distributionRef: dummy }
- <<: *baseParameters
patches:
patch1: { distributionRef: hard }
patch2: { distributionRef: hard }
patch3: { distributionRef: hard }
patch3: { distributionRef: hard }
patchDummy1: { distributionRef: dummy }
1 change: 1 addition & 0 deletions workflows/social/Environments/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.yml
5 changes: 5 additions & 0 deletions workflows/social/Environments/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## Randomly Sampled Environments

This folder contains dynamic YAML configuration files to be sampled. The workflow will randomly sample from the list of files when manually reloading the environment and at midnight each day. If the list is empty, or if the sampled file is invalid, the current environment configuration will be maintained.

The default environment configuration will be used if no configuration file is loaded. In this case, the environment configuration name will be empty in the experiment metadata text box.
5 changes: 4 additions & 1 deletion workflows/social/EnvironmentExample.yml → workflows/social/ExampleEnvironment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,16 @@ blocks:
patch1: { distributionRef: easy }
patch2: { distributionRef: easy }
patch3: { distributionRef: easy }
patchDummy1: { distributionRef: easy }
- <<: *baseParameters
patches:
patch1: { distributionRef: easy }
patch2: { distributionRef: medium }
patch3: { distributionRef: hard }
patchDummy1: { distributionRef: easy }
- <<: *baseParameters
patches:
patch1: { distributionRef: hard }
patch2: { distributionRef: hard }
patch3: { distributionRef: hard }
patch3: { distributionRef: hard }
patchDummy1: { distributionRef: easy }
32 changes: 16 additions & 16 deletions workflows/social/Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bonsai.Core" Version="2.8.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="YamlDotNet" Version="13.1.1" />
<PackageReference Include="Bonsai.Harp" Version="3.5.0" />
<PackageReference Include="Bonsai.Sleap" Version="0.2.1" />
<PackageReference Include="Bonsai.Sleap.Design" Version="0.2.0" />
<PackageReference Include="Bonsai.Design.Visualizers" Version="2.8.0" />
<PackageReference Include="Aeon.Environment" Version="0.1.0-build240101" />
<PackageReference Include="ZedGraph" Version="5.1.7" />
<PackageReference Include="Bonsai.Vision" Version="2.8.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Bonsai.Core" Version="2.8.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="YamlDotNet" Version="13.1.1" />
<PackageReference Include="Bonsai.Harp" Version="3.5.2" />
<PackageReference Include="Bonsai.Sleap" Version="0.3.0" />
<PackageReference Include="Bonsai.Sleap.Design" Version="0.3.0" />
<PackageReference Include="Bonsai.Design.Visualizers" Version="2.8.0" />
<PackageReference Include="Aeon.Environment" Version="0.1.0-build240101" />
<PackageReference Include="ZedGraph" Version="5.1.7" />
<PackageReference Include="Bonsai.Vision" Version="2.8.1" />
</ItemGroup>

</Project>
141 changes: 0 additions & 141 deletions workflows/social/Extensions/ActiveSubjectPoses.bonsai
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions workflows/social/Extensions/ActiveSubjectVisualizerBuilder.cs
View file
Open in desktop

This file was deleted.

Loading