Skip to content

Commit ba2d0ed

Browse files
authored
Switch to using built-in libum (#479)
Also fixed the default CLI value for ump
1 parent 55bd32b commit ba2d0ed

File tree

7 files changed

+5
-8
lines changed

7 files changed

+5
-8
lines changed

.idea/ephys-link.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ephys_link/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "2.1.0"
1+
__version__ = "2.1.1"

src/ephys_link/bindings/ump_binding.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
from vbl_aquarium.models.unity import Vector4
1111

1212
from ephys_link.utils.base_binding import BaseBinding
13-
from ephys_link.utils.constants import RESOURCES_DIRECTORY
1413
from ephys_link.utils.converters import (
1514
list_to_vector4,
1615
scalar_mm_to_um,
@@ -31,7 +30,6 @@ def __init__(self) -> None:
3130
"""Initialize uMp bindings."""
3231

3332
# Establish connection to Sensapex API (exit if connection fails).
34-
UMP.set_library_path(RESOURCES_DIRECTORY)
3533
self._ump: UMP = UMP.get_ump() # pyright: ignore [reportUnknownMemberType]
3634

3735
# Compute axis count, assumed as the first device. 0 if no devices are connected.

src/ephys_link/front_end/cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ def __init__(self) -> None:
4646
"--type",
4747
type=str,
4848
dest="type",
49-
default="ump-4",
50-
help='Manipulator type (i.e. "ump-4", "pathfinder-mpm", "fake"). Default: "ump-4".',
49+
default="ump",
50+
help='Manipulator type (i.e. "ump", "pathfinder-mpm", "fake"). Default: "ump".',
5151
)
5252
_ = self._parser.add_argument(
5353
"-d",

src/ephys_link/resources/libum.dll

-309 KB
Binary file not shown.

src/ephys_link/utils/constants.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
# Absolute path to the resource folder.
2121
PACKAGE_DIRECTORY = dirname(dirname(abspath(__file__)))
22-
RESOURCES_DIRECTORY = join(PACKAGE_DIRECTORY, "resources")
2322
BINDINGS_DIRECTORY = join(PACKAGE_DIRECTORY, "bindings")
2423

2524
# Ephys Link Port

0 commit comments

Comments
 (0)