Skip to content
Open
2 changes: 1 addition & 1 deletion emioapi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .emiocamera import EmioCamera, CalibrationStatusEnum
from .emiomotors import EmioMotors, motorgroup
from .emiomotors import EmioMotors
from .multiprocessemiocamera import MultiprocessEmioCamera
from .emioapi import EmioAPI
95 changes: 0 additions & 95 deletions emioapi/_emiomotorsparameters.py

This file was deleted.

9 changes: 5 additions & 4 deletions emioapi/emioapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@

from threading import Lock

from emioapi import EmioMotors, motorgroup
from dynamixelmotorsapi import listFTDIDevices, listUnusedFTDIDevices, listUsedFTDIDevices
from emioapi import EmioMotors
from emioapi import MultiprocessEmioCamera
from emioapi import EmioCamera, emiocamera
from emioapi._logging_config import logger
Expand Down Expand Up @@ -138,7 +139,7 @@ def listEmioDevices() -> list:
Returns:
A list of device names (the ports).
"""
return motorgroup.listMotors()
return listFTDIDevices()


@staticmethod
Expand All @@ -149,7 +150,7 @@ def listUnusedEmioDevices() -> list:
Returns:
A list of device names (the ports).
"""
return [device for device in EmioAPI.listEmioDevices() if device not in EmioAPI._emio_list]
return listUnusedFTDIDevices()


@staticmethod
Expand All @@ -160,7 +161,7 @@ def listUsedEmioDevices() -> list:
Returns:
A list of device names (the ports).
"""
return [device for device in EmioAPI._emio_list.keys()]
return listUsedFTDIDevices()

@staticmethod
def listCameraDevices():
Expand Down
Loading
Loading