ephys-link 1.0.5__py3-none-any.whl → 1.0.6a0__py3-none-any.whl

ephys_link/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.0.6a0"

ephys_link/__main__.py

@@ -69,12 +69,9 @@ parser.add_argument(
     type=str,
     dest="type",
     default="sensapex",
-    help='Manipulator type (i.e. "sensapex", "new_scale", or "new_scale_pathfinder").'
-    ' Default: "sensapex"',
-)
-parser.add_argument(
-    "-d", "--debug", dest="debug", action="store_true", help="Enable debug mode"
+    help='Manipulator type (i.e. "sensapex", "new_scale", or "new_scale_pathfinder").' ' Default: "sensapex"',
 )
+parser.add_argument("-d", "--debug", dest="debug", action="store_true", help="Enable debug mode")
 parser.add_argument(
     "-p",
     "--port",
@@ -113,7 +110,7 @@ def main() -> None:
 
     # Parse arguments
     args = parser.parse_args()
-    com.set_debug(args.debug)
+    com.DEBUG = args.debug
 
     # Setup serial port
     if args.serial != "no-e-stop":

ephys_link/common.py

@@ -4,23 +4,14 @@ Contains globally used helper functions and typed dictionaries (to be used as
 callback parameters)
 """
 
+from __future__ import annotations
+
 from typing import TypedDict
 
 # Debugging flag
 DEBUG = False
 
 
-def set_debug(debug: bool) -> None:
-    """Set debug flag
-
-    :param debug: True to enable debug mode, False to disable
-    :type debug: bool
-    :return: None
-    """
-    global DEBUG
-    DEBUG = debug
-
-
 def dprint(message: str) -> None:
     """Print message if debug is enabled
 
@@ -81,11 +72,9 @@ class GetManipulatorsOutputData(dict):
         :code:`{"manipulators": ["1", "2"], "error": ""}`
     """
 
-    def __init__(
-        self, manipulators: list, num_axes: int, dimensions: list, error: str
-    ) -> None:
+    def __init__(self, manipulators: list, num_axes: int, dimensions: list, error: str) -> None:
         """Constructor"""
-        super(GetManipulatorsOutputData, self).__init__(
+        super().__init__(
             manipulators=manipulators,
             num_axes=num_axes,
             dimensions=dimensions,
@@ -107,7 +96,7 @@ class PositionalOutputData(dict):
 
     def __init__(self, position: list, error: str) -> None:
         """Constructor"""
-        super(PositionalOutputData, self).__init__(position=position, error=error)
+        super().__init__(position=position, error=error)
 
 
 class AngularOutputData(dict):
@@ -121,7 +110,7 @@ class AngularOutputData(dict):
 
     def __init__(self, angles: list, error: str) -> None:
         """Constructor"""
-        super(AngularOutputData, self).__init__(angles=angles, error=error)
+        super().__init__(angles=angles, error=error)
 
 
 class ShankCountOutputData(dict):
@@ -135,7 +124,7 @@ class ShankCountOutputData(dict):
 
     def __init__(self, shank_count: int, error: str) -> None:
         """Constructor"""
-        super(ShankCountOutputData, self).__init__(shank_count=shank_count, error=error)
+        super().__init__(shank_count=shank_count, error=error)
 
 
 class DriveToDepthOutputData(dict):
@@ -151,7 +140,7 @@ class DriveToDepthOutputData(dict):
 
     def __init__(self, depth: float, error: str) -> None:
         """Create drive to depth output data dictionary"""
-        super(DriveToDepthOutputData, self).__init__(depth=depth, error=error)
+        super().__init__(depth=depth, error=error)
 
 
 class StateOutputData(dict):
@@ -167,4 +156,4 @@ class StateOutputData(dict):
 
     def __init__(self, state: bool, error: str) -> None:
         """Create state output data dictionary"""
-        super(StateOutputData, self).__init__(state=state, error=error)
+        super().__init__(state=state, error=error)

ephys_link/gui.py

@@ -2,8 +2,7 @@
 import socket
 from argparse import Namespace
 from threading import Event, Thread
-from tkinter import IntVar, StringVar, Tk, E, CENTER, RIGHT
-from tkinter import ttk
+from tkinter import CENTER, RIGHT, E, IntVar, StringVar, Tk, ttk
 
 # GUI Variables
 is_running = False
@@ -65,33 +64,25 @@ class GUI:
 
         # Server serving settings
 
-        server_serving_settings = ttk.LabelFrame(
-            mainframe, text="Serving settings", padding=3
-        )
+        server_serving_settings = ttk.LabelFrame(mainframe, text="Serving settings", padding=3)
         server_serving_settings.grid(column=0, row=0, sticky="news")
 
         # IP
-        ttk.Label(server_serving_settings, text="IP:", anchor=E, justify=RIGHT).grid(
-            column=0, row=0, sticky="we"
+        ttk.Label(server_serving_settings, text="IP:", anchor=E, justify=RIGHT).grid(column=0, row=0, sticky="we")
+        ttk.Label(server_serving_settings, text=socket.gethostbyname(socket.gethostname())).grid(
+            column=1, row=0, sticky="we"
         )
-        ttk.Label(
-            server_serving_settings, text=socket.gethostbyname(socket.gethostname())
-        ).grid(column=1, row=0, sticky="we")
 
         # Port
-        ttk.Label(server_serving_settings, text="Port:", anchor=E, justify=RIGHT).grid(
-            column=0, row=1, sticky="we"
+        ttk.Label(server_serving_settings, text="Port:", anchor=E, justify=RIGHT).grid(column=0, row=1, sticky="we")
+        ttk.Entry(server_serving_settings, textvariable=server_port, width=5, justify=CENTER).grid(
+            column=1, row=1, sticky="we"
         )
-        ttk.Entry(
-            server_serving_settings, textvariable=server_port, width=5, justify=CENTER
-        ).grid(column=1, row=1, sticky="we")
 
         # ---
 
         # Platform type
-        platform_type_settings = ttk.LabelFrame(
-            mainframe, text="Platform Type", padding=3
-        )
+        platform_type_settings = ttk.LabelFrame(mainframe, text="Platform Type", padding=3)
         platform_type_settings.grid(column=0, row=1, sticky="news")
 
         ttk.Radiobutton(
@@ -110,34 +101,26 @@ class GUI:
         # ---
 
         # New Scale Settings
-        new_scale_settings = ttk.LabelFrame(
-            mainframe, text="New Scale settings", padding=3
-        )
+        new_scale_settings = ttk.LabelFrame(mainframe, text="New Scale settings", padding=3)
         new_scale_settings.grid(column=0, row=2, sticky="news")
 
         # Port
-        ttk.Label(
-            new_scale_settings, text="HTTP Server Port:", anchor=E, justify=RIGHT
-        ).grid(column=0, row=1, sticky="we")
-        ttk.Entry(
-            new_scale_settings, textvariable=new_scale_port, width=5, justify=CENTER
-        ).grid(column=1, row=1, sticky="we")
+        ttk.Label(new_scale_settings, text="HTTP Server Port:", anchor=E, justify=RIGHT).grid(
+            column=0, row=1, sticky="we"
+        )
+        ttk.Entry(new_scale_settings, textvariable=new_scale_port, width=5, justify=CENTER).grid(
+            column=1, row=1, sticky="we"
+        )
 
         # ---
 
         # Emergency Stop serial port
-        e_stop_settings = ttk.LabelFrame(
-            mainframe, text="Emergency Stop Settings", padding=3
-        )
+        e_stop_settings = ttk.LabelFrame(mainframe, text="Emergency Stop Settings", padding=3)
         e_stop_settings.grid(column=0, row=3, sticky="news")
 
         # Serial Port
-        ttk.Label(e_stop_settings, text="Serial Port:", anchor=E, justify=RIGHT).grid(
-            column=0, row=1, sticky="we"
-        )
-        ttk.Entry(
-            e_stop_settings, textvariable=e_stop_serial_port, justify=CENTER
-        ).grid(column=1, row=1, sticky="we")
+        ttk.Label(e_stop_settings, text="Serial Port:", anchor=E, justify=RIGHT).grid(column=0, row=1, sticky="we")
+        ttk.Entry(e_stop_settings, textvariable=e_stop_serial_port, justify=CENTER).grid(column=1, row=1, sticky="we")
 
         # Server start/stop button
         ttk.Button(
@@ -153,7 +136,7 @@ class GUI:
         :type start: bool
         :return None
         """
-        global server_port, server_launch_button_text, is_running
+        global is_running
         is_running = not is_running
         if start:
             # Launch serial

ephys_link/platform_handler.py

@@ -12,13 +12,16 @@ server receives an event from a client. In general, each function does the follo
 4. Return the callback parameters to :mod:`ephys_link.server`
 """
 
-from abc import ABC, abstractmethod
+from __future__ import annotations
 
-# noinspection PyPackageRequirements
-import socketio
+from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING
 
 from ephys_link import common as com
 
+if TYPE_CHECKING:
+    import socketio
+
 
 class PlatformHandler(ABC):
     """An abstract class that defines the interface for a manipulator handler."""
@@ -56,10 +59,11 @@ class PlatformHandler(ABC):
             for manipulator in self.manipulators.values():
                 if hasattr(manipulator, "stop"):
                     manipulator.stop()
-            return True
         except Exception as e:
             print(f"[ERROR]\t\t Could not stop manipulators: {e}\n")
             return False
+        else:
+            return True
 
     def get_manipulators(self) -> com.GetManipulatorsOutputData:
         """Get all registered manipulators
@@ -75,10 +79,8 @@ class PlatformHandler(ABC):
             error = ""
         except Exception as e:
             print(f"[ERROR]\t\t Getting manipulators: {type(e)}: {e}\n")
-        finally:
-            return com.GetManipulatorsOutputData(
-                devices, self.num_axes, self.dimensions, error
-            )
+        else:
+            return com.GetManipulatorsOutputData(devices, self.num_axes, self.dimensions, error)
 
     def register_manipulator(self, manipulator_id: str) -> str:
         """Register a manipulator
@@ -97,18 +99,17 @@ class PlatformHandler(ABC):
             # Register manipulator
             self._register_manipulator(manipulator_id)
             com.dprint(f"[SUCCESS]\t Registered manipulator: {manipulator_id}\n")
-            return ""
-
         except ValueError as ve:
             # Manipulator not found in UMP
             print(f"[ERROR]\t\t Manipulator not found: {manipulator_id}: {ve}\n")
             return "Manipulator not found"
-
         except Exception as e:
             # Other error
             print(f"[ERROR]\t\t Registering manipulator: {manipulator_id}")
             print(f"{type(e)}: {e}\n")
             return "Error registering manipulator"
+        else:
+            return ""
 
     def unregister_manipulator(self, manipulator_id: str) -> str:
         """Unregister a manipulator
@@ -127,12 +128,13 @@ class PlatformHandler(ABC):
             self._unregister_manipulator(manipulator_id)
 
             com.dprint(f"[SUCCESS]\t Unregistered manipulator: {manipulator_id}\n")
-            return ""
         except Exception as e:
             # Other error
             print(f"[ERROR]\t\t Unregistering manipulator: {manipulator_id}")
             print(f"{e}\n")
             return "Error unregistering manipulator"
+        else:
+            return ""
 
     def get_pos(self, manipulator_id: str) -> com.PositionalOutputData:
         """Get the current position of a manipulator
@@ -162,9 +164,7 @@ class PlatformHandler(ABC):
             # Error check and convert position to unified space
             if manipulator_pos["error"] != "":
                 return manipulator_pos
-            return com.PositionalOutputData(
-                self._platform_space_to_unified_space(manipulator_pos["position"]), ""
-            )
+            return com.PositionalOutputData(self._platform_space_to_unified_space(manipulator_pos["position"]), "")
 
         except KeyError:
             # Manipulator not found in registered manipulators
@@ -206,9 +206,7 @@ class PlatformHandler(ABC):
         """
         return self._get_shank_count(manipulator_id)
 
-    async def goto_pos(
-        self, manipulator_id: str, position: list[float], speed: int
-    ) -> com.PositionalOutputData:
+    async def goto_pos(self, manipulator_id: str, position: list[float], speed: int) -> com.PositionalOutputData:
         """Move manipulator to position
 
         :param manipulator_id: The ID of the manipulator to move
@@ -234,23 +232,17 @@ class PlatformHandler(ABC):
 
             # Convert position to platform space, move, and convert final position back to
             # unified space
-            end_position = await self._goto_pos(
-                manipulator_id, self._unified_space_to_platform_space(position), speed
-            )
+            end_position = await self._goto_pos(manipulator_id, self._unified_space_to_platform_space(position), speed)
             if end_position["error"] != "":
                 return end_position
-            return com.PositionalOutputData(
-                self._platform_space_to_unified_space(end_position["position"]), ""
-            )
+            return com.PositionalOutputData(self._platform_space_to_unified_space(end_position["position"]), "")
 
         except KeyError:
             # Manipulator not found in registered manipulators
             print(f"[ERROR]\t\t Manipulator not registered: {manipulator_id}\n")
             return com.PositionalOutputData([], "Manipulator not registered")
 
-    async def drive_to_depth(
-        self, manipulator_id: str, depth: float, speed: int
-    ) -> com.DriveToDepthOutputData:
+    async def drive_to_depth(self, manipulator_id: str, depth: float, speed: int) -> com.DriveToDepthOutputData:
         """Drive manipulator to depth
 
         :param manipulator_id: The ID of the manipulator to drive
@@ -291,9 +283,7 @@ class PlatformHandler(ABC):
             print(f"[ERROR]\t\t Manipulator not registered: {manipulator_id}\n")
             return com.DriveToDepthOutputData(0, "Manipulator " "not registered")
 
-    def set_inside_brain(
-        self, manipulator_id: str, inside: bool
-    ) -> com.StateOutputData:
+    def set_inside_brain(self, manipulator_id: str, inside: bool) -> com.StateOutputData:
         """Set manipulator inside brain state (restricts motion)
 
         :param manipulator_id: The ID of the manipulator to set the state of
@@ -321,9 +311,7 @@ class PlatformHandler(ABC):
 
         except Exception as e:
             # Other error
-            print(
-                f"[ERROR]\t\t Set manipulator {manipulator_id} inside brain " f"state"
-            )
+            print(f"[ERROR]\t\t Set manipulator {manipulator_id} inside brain " f"state")
             print(f"{e}\n")
             return com.StateOutputData(False, "Error setting " "inside brain")
 
@@ -472,9 +460,7 @@ class PlatformHandler(ABC):
         """
 
     @abstractmethod
-    async def _goto_pos(
-        self, manipulator_id: str, position: list[float], speed: int
-    ) -> com.PositionalOutputData:
+    async def _goto_pos(self, manipulator_id: str, position: list[float], speed: int) -> com.PositionalOutputData:
         """Move manipulator to position
 
         :param manipulator_id: The ID of the manipulator to move
@@ -489,9 +475,7 @@ class PlatformHandler(ABC):
         """
 
     @abstractmethod
-    async def _drive_to_depth(
-        self, manipulator_id: str, depth: float, speed: int
-    ) -> com.DriveToDepthOutputData:
+    async def _drive_to_depth(self, manipulator_id: str, depth: float, speed: int) -> com.DriveToDepthOutputData:
         """Drive manipulator to depth
 
         :param manipulator_id: The ID of the manipulator to drive
@@ -506,9 +490,7 @@ class PlatformHandler(ABC):
         """
 
     @abstractmethod
-    def _set_inside_brain(
-        self, manipulator_id: str, inside: bool
-    ) -> com.StateOutputData:
+    def _set_inside_brain(self, manipulator_id: str, inside: bool) -> com.StateOutputData:
         """Set manipulator inside brain state (restricts motion)
 
         :param manipulator_id: The ID of the manipulator to set the state of
@@ -564,9 +546,7 @@ class PlatformHandler(ABC):
         """
 
     @abstractmethod
-    def _platform_space_to_unified_space(
-        self, platform_position: list[float]
-    ) -> list[float]:
+    def _platform_space_to_unified_space(self, platform_position: list[float]) -> list[float]:
         """Convert position in platform space to position in unified manipulator space
 
         :param platform_position: Position in platform space (x, y, z, w) in mm
@@ -576,9 +556,7 @@ class PlatformHandler(ABC):
         """
 
     @abstractmethod
-    def _unified_space_to_platform_space(
-        self, unified_position: list[float]
-    ) -> list[float]:
+    def _unified_space_to_platform_space(self, unified_position: list[float]) -> list[float]:
         """Convert position in unified manipulator space to position in platform space
 
         :param unified_position: Position in unified manipulator space (x, y, z, w) in mm

ephys_link/platforms/new_scale_handler.py

@@ -5,17 +5,20 @@ Implements New Scale specific API calls.
 This is a subclass of :class:`ephys_link.platform_handler.PlatformHandler`.
 """
 
+from __future__ import annotations
+
 import importlib
+from typing import TYPE_CHECKING
 
 # noinspection PyPackageRequirements
 import clr
 
-# noinspection PyPackageRequirements
-import socketio
-
 from ephys_link import common as com
 from ephys_link.platform_handler import PlatformHandler
 
+if TYPE_CHECKING:
+    import socketio
+
 
 class NewScaleHandler(PlatformHandler):
     """Handler for New Scale platform"""
@@ -45,15 +48,18 @@ class NewScaleHandler(PlatformHandler):
     def _register_manipulator(self, manipulator_id: str) -> None:
         # Check if ID is numeric
         if not manipulator_id.isnumeric():
-            raise ValueError("Manipulator ID must be numeric")
+            msg = "Manipulator ID must be numeric"
+            raise ValueError(msg)
 
         # Check if ID is connected
         if manipulator_id not in self._get_manipulators():
-            raise ValueError(f"Manipulator {manipulator_id} not connected")
+            msg = f"Manipulator {manipulator_id} not connected"
+            raise ValueError(msg)
 
         # Check if there are enough axes
         if int(manipulator_id) * 3 + 2 >= self.ctrl.AxisCount:
-            raise ValueError(f"Manipulator {manipulator_id} has no axes")
+            msg = f"Manipulator {manipulator_id} has no axes"
+            raise ValueError(msg)
 
         # Register manipulator
         first_axis_index = int(manipulator_id) * 3
@@ -78,38 +84,23 @@ class NewScaleHandler(PlatformHandler):
     def _get_shank_count(self, manipulator_id: str) -> com.ShankCountOutputData:
         raise NotImplementedError
 
-    async def _goto_pos(
-        self, manipulator_id: str, position: list[float], speed: int
-    ) -> com.PositionalOutputData:
+    async def _goto_pos(self, manipulator_id: str, position: list[float], speed: int) -> com.PositionalOutputData:
         return await self.manipulators[manipulator_id].goto_pos(position, speed)
 
-    async def _drive_to_depth(
-        self, manipulator_id: str, depth: float, speed: int
-    ) -> com.DriveToDepthOutputData:
+    async def _drive_to_depth(self, manipulator_id: str, depth: float, speed: int) -> com.DriveToDepthOutputData:
         return await self.manipulators[manipulator_id].drive_to_depth(depth, speed)
 
-    def _set_inside_brain(
-        self, manipulator_id: str, inside: bool
-    ) -> com.StateOutputData:
+    def _set_inside_brain(self, manipulator_id: str, inside: bool) -> com.StateOutputData:
         self.manipulators[manipulator_id].set_inside_brain(inside)
-        com.dprint(
-            f"[SUCCESS]\t Set inside brain state for manipulator:"
-            f" {manipulator_id}\n"
-        )
+        com.dprint(f"[SUCCESS]\t Set inside brain state for manipulator:" f" {manipulator_id}\n")
         return com.StateOutputData(inside, "")
 
     async def _calibrate(self, manipulator_id: str, sio: socketio.AsyncServer) -> str:
-        return (
-            ""
-            if self.manipulators[manipulator_id].calibrate()
-            else "Error calling calibrate"
-        )
+        return "" if self.manipulators[manipulator_id].calibrate() else "Error calling calibrate"
 
     def _bypass_calibration(self, manipulator_id: str) -> str:
         self.manipulators[manipulator_id].set_calibrated()
-        com.dprint(
-            f"[SUCCESS]\t Bypassed calibration for manipulator" f" {manipulator_id}\n"
-        )
+        com.dprint(f"[SUCCESS]\t Bypassed calibration for manipulator" f" {manipulator_id}\n")
         return ""
 
     def _set_can_write(
@@ -120,14 +111,10 @@ class NewScaleHandler(PlatformHandler):
         sio: socketio.AsyncServer,
     ) -> com.StateOutputData:
         self.manipulators[manipulator_id].set_can_write(can_write, hours, sio)
-        com.dprint(
-            f"[SUCCESS]\t Set can_write state for manipulator" f" {manipulator_id}\n"
-        )
+        com.dprint(f"[SUCCESS]\t Set can_write state for manipulator" f" {manipulator_id}\n")
         return com.StateOutputData(can_write, "")
 
-    def _platform_space_to_unified_space(
-        self, platform_position: list[float]
-    ) -> list[float]:
+    def _platform_space_to_unified_space(self, platform_position: list[float]) -> list[float]:
         # unified   <-  platform
         # +x        <-  -x
         # +y        <-  +z
@@ -141,9 +128,7 @@ class NewScaleHandler(PlatformHandler):
             self.dimensions[2] - platform_position[3],
         ]
 
-    def _unified_space_to_platform_space(
-        self, unified_position: list[float]
-    ) -> list[float]:
+    def _unified_space_to_platform_space(self, unified_position: list[float]) -> list[float]:
         # platform  <-  unified
         # +x        <-  -x
         # +y        <-  +z

ephys_link/platforms/new_scale_manipulator.py

@@ -5,14 +5,11 @@ function calls, error handling, managing per-manipulator attributes, and returni
 appropriate callback parameters like in :mod:`ephys_link.new_scale_handler`.
 """
 
+from __future__ import annotations
+
 import asyncio
 import threading
-
-# noinspection PyPackageRequirements
-import socketio
-
-# noinspection PyUnresolvedReferences
-from NstMotorCtrl import NstCtrlAxis
+from typing import TYPE_CHECKING
 
 import ephys_link.common as com
 from ephys_link.platform_manipulator import (
@@ -22,6 +19,12 @@ from ephys_link.platform_manipulator import (
     PlatformManipulator,
 )
 
+if TYPE_CHECKING:
+    import socketio
+
+    # noinspection PyUnresolvedReferences
+    from NstMotorCtrl import NstCtrlAxis
+
 # Constants
 ACCELERATION_MULTIPLIER = 5
 CUTOFF_MULTIPLIER = 0.005
@@ -85,9 +88,7 @@ class NewScaleManipulator(PlatformManipulator):
             print(f"{e}\n")
             return com.PositionalOutputData([], "Error getting position")
 
-    async def goto_pos(
-        self, position: list[float], speed: float
-    ) -> com.PositionalOutputData:
+    async def goto_pos(self, position: list[float], speed: float) -> com.PositionalOutputData:
         """Move manipulator to position
 
         :param position: The position to move to in mm
@@ -151,19 +152,14 @@ class NewScaleManipulator(PlatformManipulator):
             if not self._can_write:
                 return com.PositionalOutputData([], "Manipulator movement canceled")
 
-            com.dprint(
-                f"[SUCCESS]\t Moved manipulator {self._id} to position"
-                f" {manipulator_final_position}\n"
-            )
+            com.dprint(f"[SUCCESS]\t Moved manipulator {self._id} to position" f" {manipulator_final_position}\n")
             return com.PositionalOutputData(manipulator_final_position, "")
         except Exception as e:
             print(f"[ERROR]\t\t Moving manipulator {self._id} to position {position}")
             print(f"{e}\n")
             return com.PositionalOutputData([], "Error moving manipulator")
 
-    async def drive_to_depth(
-        self, depth: float, speed: int
-    ) -> com.DriveToDepthOutputData:
+    async def drive_to_depth(self, depth: float, speed: int) -> com.DriveToDepthOutputData:
         """Drive the manipulator to a certain depth
 
         :param depth: The depth to drive to in mm
@@ -215,10 +211,7 @@ class NewScaleManipulator(PlatformManipulator):
             if not self._can_write:
                 return com.DriveToDepthOutputData(0, "Manipulator movement canceled")
 
-            com.dprint(
-                f"[SUCCESS]\t Moved manipulator {self._id} to position"
-                f" {manipulator_final_position}\n"
-            )
+            com.dprint(f"[SUCCESS]\t Moved manipulator {self._id} to position" f" {manipulator_final_position}\n")
             return com.DriveToDepthOutputData(manipulator_final_position[3], "")
         except Exception as e:
             print(f"[ERROR]\t\t Moving manipulator {self._id} to depth {depth}")
@@ -231,11 +224,7 @@ class NewScaleManipulator(PlatformManipulator):
 
         :return: None
         """
-        return (
-            self._x.CalibrateFrequency()
-            and self._y.CalibrateFrequency()
-            and self._z.CalibrateFrequency()
-        )
+        return self._x.CalibrateFrequency() and self._y.CalibrateFrequency() and self._z.CalibrateFrequency()
 
     def get_calibrated(self) -> bool:
         """Return the calibration state of the manipulator.
@@ -252,9 +241,7 @@ class NewScaleManipulator(PlatformManipulator):
         """
         self._calibrated = True
 
-    def set_can_write(
-        self, can_write: bool, hours: float, sio: socketio.AsyncServer
-    ) -> None:
+    def set_can_write(self, can_write: bool, hours: float, sio: socketio.AsyncServer) -> None:
         """Set if the manipulator can move
 
         :param can_write: True if the manipulator can move, False otherwise
@@ -271,9 +258,7 @@ class NewScaleManipulator(PlatformManipulator):
         if can_write and hours > 0:
             if self._reset_timer:
                 self._reset_timer.cancel()
-            self._reset_timer = threading.Timer(
-                hours * HOURS_TO_SECONDS, self.reset_can_write, [sio]
-            )
+            self._reset_timer = threading.Timer(hours * HOURS_TO_SECONDS, self.reset_can_write, [sio])
             self._reset_timer.start()
 
     def get_can_write(self) -> bool: