dsf-python 3.5.0.2rc2__py3-none-any.whl → 3.6.0__py3-none-any.whl

dsf/__init__.py

@@ -1,6 +1,23 @@
-# path to unix socket file
+__version__ = "3.6.0"
+
+import json
+import os
+
+# Default socket file path
 SOCKET_FILE = "/run/dsf/dcs.sock"
 
+# Try to read socket file path from config
+config_path = "/opt/dsf/conf/config.json"
+if os.path.exists(config_path):
+    try:
+        with open(config_path, 'r') as f:
+            config = json.load(f)
+            socket_dir = config.get("SocketDirectory", "/run/dsf")
+            socket_file = config.get("SocketFile", "dcs.sock")
+            SOCKET_FILE = os.path.join(socket_dir, socket_file)
+    except (json.JSONDecodeError, IOError):
+        pass  # Use default if config file is invalid or inaccessible
+
 # allowed connection per unix server
 DEFAULT_BACKLOG = 4
 

dsf/commands/code.py

@@ -134,7 +134,7 @@ class Code(BaseCommand):
         if self.type == CodeType.Comment:
             return "(comment)"
 
-        prefix = "G53 " if self.flags & CodeFlags.EnforceAbsolutePosition != 0 else ""
+        prefix = "G53 " if self.is_flag_set(CodeFlags.EnforceAbsolutePosition) else ""
         if self.majorNumber is not None:
             if self.minorNumber is not None:
                 return f"{prefix}{self.type}{self.majorNumber}.{self.minorNumber}"
@@ -158,3 +158,6 @@ class Code(BaseCommand):
             KeywordType.Echo: "echo",
             KeywordType.Global: "global",
         }.get(self.keyword)
+
+    def is_flag_set(self, flag: CodeFlags):
+        return self.flags & flag != 0

dsf/commands/code_interception.py

@@ -28,4 +28,4 @@ def resolve_code(rtype: MessageType, content: Optional[str]):
         raise TypeError("rtype must be a MessageType")
     if content is not None and not isinstance(content, str):
         raise TypeError("content must be None or a string")
-    return BaseCommand("Resolve", **{"Type": rtype, "Content": content})
+    return BaseCommand("Resolve", **{"type": rtype, "content": content})

dsf/commands/files.py

@@ -9,15 +9,16 @@ def get_file_info(file_name: str, read_thumbnail_content: bool = False):
     """
     if not isinstance(file_name, str) or not file_name:
         raise TypeError("file_name must be a string")
-    return BaseCommand("GetFileInfo", **{"FileName": file_name, "ReadThumbnailContent": read_thumbnail_content})
+    return BaseCommand("GetFileInfo", **{"fileName": file_name, "readThumbnailContent": read_thumbnail_content})
 
 
-def resolve_path(path: str):
+def resolve_path(path: str, base_directory: str = None):
     """
     Resolve a RepRapFirmware-style path to an actual file path
     :param path: Path that is RepRapFirmware-compatible
+    :param base_directory: Optional base directory to resolve the path relative to
     :returns: The resolved path
     """
     if not isinstance(path, str) or not path:
         raise TypeError("path must be a string")
-    return BaseCommand("ResolvePath", **{"Path": path})
+    return BaseCommand("ResolvePath", **{"path": path, "baseDirectory": base_directory})

dsf/commands/generic.py

@@ -17,7 +17,7 @@ def check_password(password: str):
     """
     if not isinstance(password, str) or not password:
         raise TypeError("password must be a string")
-    return BaseCommand("CheckPassword", **{"Password": password})
+    return BaseCommand("CheckPassword", **{"password": password})
 
 
 def evaluate_expression(channel: CodeChannel, expression: str):
@@ -33,7 +33,7 @@ def evaluate_expression(channel: CodeChannel, expression: str):
         raise TypeError("channel must be a CodeChannel")
     if not isinstance(expression, str) or not expression:
         raise TypeError("expression must be a string")
-    return BaseCommand("EvaluateExpression", **{"Channel": channel, "Expression": expression})
+    return BaseCommand("EvaluateExpression", **{"channel": channel, "expression": expression})
 
 
 def flush(channel: CodeChannel, sync_file_streams: bool = False, if_executing: bool = True):
@@ -57,7 +57,7 @@ def flush(channel: CodeChannel, sync_file_streams: bool = False, if_executing: b
     if not isinstance(if_executing, bool):
         raise TypeError("if_executing must be a boolean")
     return BaseCommand("Flush",
-                       **{"Channel": channel, "SyncFileStreams": sync_file_streams, "IfExecuting": if_executing})
+                       **{"channel": channel, "syncFileStreams": sync_file_streams, "ifExecuting": if_executing})
 
 
 def invalidate_channel(channel: CodeChannel):
@@ -70,7 +70,7 @@ def invalidate_channel(channel: CodeChannel):
     """
     if not isinstance(channel, CodeChannel):
         raise TypeError("channel must be a CodeChannel")
-    return BaseCommand("InvalidateChannel", **{"Channel": channel})
+    return BaseCommand("InvalidateChannel", **{"channel": channel})
 
 
 def set_update_status(updating: bool):
@@ -81,7 +81,7 @@ def set_update_status(updating: bool):
     """
     if not isinstance(updating, bool):
         raise TypeError("updating must be a boolean")
-    return BaseCommand("SetUpdateStatus", **{"Updating": updating})
+    return BaseCommand("SetUpdateStatus", **{"updating": updating})
 
 
 def simple_code(code: str, channel: CodeChannel = CodeChannel.DEFAULT_CHANNEL, async_exec: bool = False):
@@ -101,7 +101,7 @@ def simple_code(code: str, channel: CodeChannel = CodeChannel.DEFAULT_CHANNEL, a
         raise TypeError("code must be a string")
     if not isinstance(channel, CodeChannel):
         raise TypeError("channel must be a CodeChannel")
-    return BaseCommand("SimpleCode", **{"Code": code, "Channel": channel, "ExecuteAsynchronously": async_exec})
+    return BaseCommand("SimpleCode", **{"code": code, "channel": channel, "executeAsynchronously": async_exec})
 
 
 def write_message(
@@ -129,9 +129,9 @@ def write_message(
     return BaseCommand(
         "WriteMessage",
         **{
-            "Type": message_type,
-            "Content": content,
-            "OutputMessage": output_message,
-            "LogLevel": log_level,
+            "type": message_type,
+            "content": content,
+            "outputMessage": output_message,
+            "logLevel": log_level,
         },
     )

dsf/commands/http_endpoints.py

@@ -25,10 +25,10 @@ def add_http_endpoint(endpoint_type: HttpEndpointType, namespace: str, path: str
     return BaseCommand(
         "AddHttpEndpoint",
         **{
-            "EndpointType": endpoint_type,
-            "Namespace": namespace,
-            "Path": path,
-            "IsUploadRequest": is_upload_request,
+            "endpointType": endpoint_type,
+            "namespace": namespace,
+            "path": path,
+            "isUploadRequest": is_upload_request,
         },
     )
 
@@ -49,5 +49,5 @@ def remove_http_endpoint(endpoint_type: HttpEndpointType, namespace: str, path:
         raise TypeError("path must be a string")
     return BaseCommand(
         "RemoveHttpEndpoint",
-        **{"EndpointType": endpoint_type, "Namespace": namespace, "Path": path},
+        **{"endpointType": endpoint_type, "namespace": namespace, "path": path},
     )

dsf/commands/object_model.py

@@ -24,7 +24,7 @@ def patch_object_model(key: str, patch: str):
         raise TypeError("key must be a string")
     if not isinstance(patch, str) or not patch:
         raise TypeError("patch must be a string")
-    return BaseCommand("PatchObjectModel", **{"Key": key, "Patch": patch})
+    return BaseCommand("PatchObjectModel", **{"key": key, "patch": patch})
 
 
 def set_network_protocol(protocol: str, enabled: bool):
@@ -38,7 +38,7 @@ def set_network_protocol(protocol: str, enabled: bool):
         raise TypeError("protocol must be a string")
     if not isinstance(enabled, bool):
         raise TypeError("enabled must be a boolean")
-    return BaseCommand("SetNetworkProtocol", **{"NetworkProtocol": protocol, "Enabled": enabled})
+    return BaseCommand("SetNetworkProtocol", **{"networkProtocol": protocol, "enabled": enabled})
 
 
 def set_object_model(property_path: str, value: str):
@@ -53,7 +53,7 @@ def set_object_model(property_path: str, value: str):
         raise TypeError("property_path must be a string")
     if not isinstance(value, str):
         raise TypeError("value must be a string")
-    return BaseCommand("SetObjectModel", **{"PropertyPath": property_path, "Value": value})
+    return BaseCommand("SetObjectModel", **{"propertyPath": property_path, "value": value})
 
 
 def sync_object_model():

dsf/commands/packages.py

@@ -7,7 +7,7 @@ def install_system_package(package_file: str):
     """
     if not isinstance(package_file, str) or not package_file:
         raise TypeError("package_file must be a string")
-    return BaseCommand("InstallSystemPackage", **{"PackageFile": package_file})
+    return BaseCommand("InstallSystemPackage", **{"packageFile": package_file})
 
 
 def uninstall_system_package(package: str):
@@ -16,4 +16,4 @@ def uninstall_system_package(package: str):
     """
     if not isinstance(package, str) or not package:
         raise TypeError("package must be a string")
-    return BaseCommand("UninstallSystemPackage", **{"Package": package})
+    return BaseCommand("UninstallSystemPackage", **{"package": package})

dsf/commands/plugins.py

@@ -8,7 +8,7 @@ def install_plugin(plugin_file: str):
     """
     if not isinstance(plugin_file, str) or not plugin_file:
         raise TypeError("plugin_file must be a string")
-    return BaseCommand("InstallPlugin", **{"PluginFile": plugin_file})
+    return BaseCommand("InstallPlugin", **{"pluginFile": plugin_file})
 
 
 def reload_plugin(plugin: str):
@@ -18,10 +18,10 @@ def reload_plugin(plugin: str):
     """
     if not isinstance(plugin, str) or not plugin:
         raise TypeError("plugin must be a string")
-    return BaseCommand("ReloadPlugin", **{"Plugin": plugin})
+    return BaseCommand("ReloadPlugin", **{"plugin": plugin})
 
 
-def set_plugin_data(plugin: str, key: str, value: str):
+def set_plugin_data(plugin: str, key: str, value):
     """
     Update custom plugin data in the object model
     May be used to update only the own plugin data unless the plugin has the ManagePlugins permission.
@@ -34,10 +34,8 @@ def set_plugin_data(plugin: str, key: str, value: str):
         raise TypeError("plugin must be a string")
     if not isinstance(key, str) or not key:
         raise TypeError("key must be a string")
-    if not isinstance(value, str):
-        raise TypeError("value must be a string")
     return BaseCommand(
-        "SetPluginData", **{"Plugin": plugin, "Key": key, "Value": value}
+        "SetPluginData", **{"plugin": plugin, "key": key, "value": value}
     )
 
 
@@ -49,7 +47,7 @@ def start_plugin(plugin: str, save_state: bool = True):
     """
     if not isinstance(plugin, str) or not plugin:
         raise TypeError("plugin must be a string")
-    return BaseCommand("StartPlugin", **{"Plugin": plugin, "SaveState": save_state})
+    return BaseCommand("StartPlugin", **{"plugin": plugin, "saveState": save_state})
 
 
 def start_plugins():
@@ -65,7 +63,7 @@ def stop_plugin(plugin: str, save_state: bool = True):
     """
     if not isinstance(plugin, str) or not plugin:
         raise TypeError("plugin must be a string")
-    return BaseCommand("StopPlugin", **{"Plugin": plugin, "SaveState": save_state})
+    return BaseCommand("StopPlugin", **{"plugin": plugin, "saveState": save_state})
 
 
 def stop_plugins():
@@ -81,4 +79,4 @@ def uninstall_plugin(plugin: str):
     """
     if not isinstance(plugin, str) or not plugin:
         raise TypeError("plugin must be a string")
-    return BaseCommand("UninstallPlugin", **{"Plugin": plugin})
+    return BaseCommand("UninstallPlugin", **{"plugin": plugin})

dsf/commands/user_sessions.py

@@ -19,9 +19,9 @@ def add_user_session(access_level: AccessLevel, session_type: SessionType, origi
     return BaseCommand(
         "AddUserSession",
         **{
-            "AccessLevel": access_level,
-            "SessionType": session_type,
-            "Origin": origin,
+            "accessLevel": access_level,
+            "sessionType": session_type,
+            "origin": origin,
         },
     )
 
@@ -33,4 +33,4 @@ def remove_user_session(session_id: int):
     """
     if not isinstance(session_id, int):
         raise TypeError("session_id must be an integer")
-    return BaseCommand("RemoveUserSession", **{"Id": session_id})
+    return BaseCommand("RemoveUserSession", **{"id": session_id})

dsf/connections/base_connection.py

@@ -1,5 +1,6 @@
 import json
 import socket
+import time
 from typing import Optional
 
 from .exceptions import IncompatibleVersionException, InternalServerException, TaskCanceledException
@@ -25,7 +26,8 @@ class BaseConnection:
 
         self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
         self.socket.connect(socket_file)
-        self.socket.setblocking(True)
+        self.socket.settimeout(self.timeout if self.timeout > 0 else None)
+        # self.socket.setblocking(True)
         server_init_msg = server_init_message.ServerInitMessage.from_json(
             json.loads(self.socket.recv(50).decode("utf8"))
         )
@@ -98,7 +100,11 @@ class BaseConnection:
             json_string = json_string[:end_index]
         else:
             found = False
+            start_time = time.time()
             while not found:
+                if (self.timeout > 0) and (time.time() - start_time > self.timeout):
+                    raise TimeoutError("Timeout while waiting for JSON response")
+
                 # Refill the buffer and check again
                 BUFF_SIZE = 4096  # 4 KiB
                 data = b""

dsf/connections/init_messages/client_init_messages.py

@@ -41,7 +41,8 @@ def intercept_init_message(
         channels: List[CodeChannel],
         filters: List[str],
         priority_codes: bool,
-        auto_flush: bool = True):
+        auto_flush: bool = True,
+        auto_evaluate_expression: bool = True):
     """
     Enter interception mode
     Whenever a code is received, the connection must respond with one of
@@ -62,15 +63,19 @@ def intercept_init_message(
     is specified.
     This option makes extra Flush calls in the interceptor implementation obsolete.
     It is highly recommended to enable this in order to avoid potential deadlocks when dealing with macros!
+    :param auto_evaluate_expression: Automatically evaluate expression parameters to their final values
+    before sending it over to the client.
+    This requires auto_flush to be True and happens when the remaining codes have been processed.
     """
     return ClientInitMessage(
         ConnectionMode.INTERCEPT,
         **{
-            "InterceptionMode": intercept_mode,
-            "Channels": channels,
-            "AutoFlush": auto_flush,
-            "Filters": filters,
-            "PriorityCodes": priority_codes,
+            "interceptionMode": intercept_mode,
+            "channels": channels,
+            "autoFlush": auto_flush,
+            "autoEvaluateExpressions": auto_evaluate_expression,
+            "filters": filters,
+            "priorityCodes": priority_codes,
         },
     )
 
@@ -85,8 +90,8 @@ def subscribe_init_message(subscription_mode: SubscriptionMode, filter_string: s
     return ClientInitMessage(
         ConnectionMode.SUBSCRIBE,
         **{
-            "SubscriptionMode": subscription_mode,
-            "Filter": filter_string,
-            "Filters": filter_list,
+            "subscriptionMode": subscription_mode,
+            "filter": filter_string,
+            "filters": filter_list,
         },
     )

dsf/connections/intercept_connection.py

@@ -21,6 +21,9 @@ class InterceptConnection(BaseCommandConnection):
     in case a code filter is specified.
     This option makes extra Flush calls in the interceptor implementation obsolete.
     It is highly recommended to enable this in order to avoid potential deadlocks when dealing with macros!
+    :param auto_evaluate_expression: Automatically evaluate expression parameters to their final values
+    before sending it over to the client.
+    This requires auto_flush to be True and happens when the remaining codes have been processed.
     :param priority_codes: Defines if priority codes may be intercepted (e.g. M122 or M999)
     :param debug: Whether debugging output is turned on for this connection
     """
@@ -31,20 +34,28 @@ class InterceptConnection(BaseCommandConnection):
         channels: List[CodeChannel] = None,
         filters: List[str] = None,
         auto_flush: bool = True,
+        auto_evaluate_expression: bool = True,
         priority_codes: bool = False,
         debug: bool = False,
+        timeout: int = 0
     ):
-        super().__init__(debug)
+        super().__init__(debug, timeout)
         self.interception_mode = interception_mode
         self.channels = channels if channels is not None else CodeChannel.list()
         self.filters = filters
         self.auto_flush = auto_flush
+        self.auto_evaluate_expression = auto_evaluate_expression
         self.priority_codes = priority_codes
 
     def connect(self, socket_file: str = SOCKET_FILE):  # noqa
         """Establishes a connection to the given UNIX socket file"""
         iim = client_init_messages.intercept_init_message(
-            self.interception_mode, self.channels, self.filters, self.priority_codes, self.auto_flush
+            self.interception_mode,
+            self.channels,
+            self.filters,
+            self.priority_codes,
+            self.auto_flush,
+            self.auto_evaluate_expression
         )
         return super().connect(iim, socket_file)
 

dsf/http.py

@@ -1,5 +1,8 @@
 import asyncio
 import json
+import socket
+import stat
+import errno
 import os
 from concurrent.futures import ThreadPoolExecutor
 from enum import Enum
@@ -11,10 +14,11 @@ from .object_model import HttpEndpointType
 class HttpResponseType(str, Enum):
     """Enumeration of supported HTTP responses"""
 
-    StatusCode = "StatusCode"
-    PlainText = "PlainText"
-    JSON = "JSON"
-    File = "File"
+    StatusCode = "statuscode"
+    PlainText = "plainText"
+    JSON = "json"
+    File = "file"
+    URI = "uri"
 
 
 class ReceivedHttpRequest:
@@ -47,7 +51,7 @@ class HttpEndpointConnection:
         """Close the connection"""
         self.writer.close()
 
-    async def read_request(self):
+    async def read_request(self) -> ReceivedHttpRequest:
         """
         Read information about the last HTTP request.
         Note that a call to this method may fail!
@@ -67,9 +71,9 @@ class HttpEndpointConnection:
         try:
             await self.send(
                 {
-                    "StatusCode": status_code,
-                    "Response": response,
-                    "ResponseType": response_type,
+                    "statusCode": status_code,
+                    "response": response,
+                    "responseType": response_type,
                 }
             )
         finally:
@@ -136,7 +140,8 @@ class HttpEndpointUnixSocket:
         if self._loop is not None:
             # TODO: this enables correctly ending the loop. Why?
             self._loop.set_debug(True)
-            self._server.close()
+            if self._server is not None:
+                self._server.close()
             self._loop.stop()
         self.event_loop.cancel()
         self.executor.shutdown(wait=False)
@@ -149,11 +154,47 @@ class HttpEndpointUnixSocket:
         """Set the handler to handle client connections"""
         self.handler = handler
 
+    def _create_socket(self, path: str):
+        path = os.fspath(path)
+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+
+        # Check for abstract socket. `str` and `bytes` paths are supported.
+        if path[0] not in (0, '\x00'):
+            try:
+                if stat.S_ISSOCK(os.stat(path).st_mode):
+                    os.remove(path)
+            except FileNotFoundError:
+                pass
+            except OSError as err:
+                # Directory may have permissions only to create socket.
+                # logger.error('Unable to check or remove stale UNIX socket '
+                #                 '%r: %r', path, err)
+                pass
+
+        try:
+            sock.bind(path)
+            os.chmod(path, os.stat(path).st_mode | stat.S_IWGRP | stat.S_IRGRP)
+        except OSError as exc:
+            sock.close()
+            if exc.errno == errno.EADDRINUSE:
+                # Let's improve the error message by adding
+                # with what exact address it occurs.
+                msg = f'Address {path!r} is already in use'
+                raise OSError(errno.EADDRINUSE, msg) from None
+            else:
+                raise
+        except:
+            sock.close()
+            raise
+
+        return sock
+
     def start_connection_listener(self):
         try:
             self._loop = asyncio.new_event_loop()
+            sock = self._create_socket(self.socket_file)
             self._server = asyncio.start_unix_server(
-                self.handle_connection, self.socket_file, backlog=self.backlog
+                self.handle_connection, sock=sock, backlog=self.backlog
             )
             self._loop.create_task(self._server)
             self._loop.run_forever()

dsf/object_model/boards/accelerometer.py

@@ -5,11 +5,24 @@ class Accelerometer(ModelObject):
     """This represents an accelerometer"""
     def __init__(self):
         super(Accelerometer, self).__init__()
+        # Orientation of the accelerometer
+        # See https://docs.duet3d.com/en/Duet3D_hardware/Accessories/Duet3D_Accelerometer#orientation for a list of orientations
+        self._orientation = 20
         # Number of collected data points in the last run or 0 if it failed
         self._points = 0
         # Number of completed sampling runs
         self._runs = 0
 
+    @property
+    def orientation(self) -> int:
+        """Orientation of the accelerometer
+        See https://docs.duet3d.com/en/Duet3D_hardware/Accessories/Duet3D_Accelerometer#orientation for a list of orientations"""
+        return self._orientation
+
+    @orientation.setter
+    def orientation(self, value):
+        self._orientation = int(value)
+
     @property
     def points(self) -> int:
         """Number of collected data points in the last run or 0 if it failed"""

dsf/object_model/boards/boards.py

@@ -1,10 +1,11 @@
 from enum import Enum
-from typing import List, Union
+from typing import List, Optional
 
 from .accelerometer import Accelerometer
 from .board_closed_loop import BoardClosedLoop
 from .direct_display import DirectDisplay
 from .driver import Driver
+from .inductive_sensor import InductiveSensor
 from .min_max_current import MinMaxCurrent
 from ..model_collection import ModelCollection
 from ..model_object import ModelObject
@@ -42,6 +43,8 @@ class Board(ModelObject):
     closed_loop = wrap_model_property('closed_loop', BoardClosedLoop)
     # Details about a connected display or None if none is connected
     direct_display = wrap_model_property('direct_display', DirectDisplay)
+    # Information about an inductive sensor or None if not present
+    inductive_sensor = wrap_model_property('inductive_sensor', InductiveSensor)
     # Minimum, maximum, and current temperatures of the MCU or None if unknown
     mcu_temp = wrap_model_property('mcu_temp', MinMaxCurrent)
     # Minimum, maximum, and current voltages on the 12V rail or None if unknown
@@ -72,11 +75,15 @@ class Board(ModelObject):
         self._firmware_name = ""
         # Version of the firmware build
         self._firmware_version = ""
+        # Amount of free RAM on this board (in bytes or null if unknown)
+        self._free_ram = None
         # Filename of the IAP binary that is used for updates from the SBC or None if unsupported
         self._iap_file_name_SBC = None
         # Filename of the IAP binary that is used for updates from the SD card or None if unsupported
         # This is only available for the mainboard (first board item)
         self._iap_file_name_SD = None
+        # Information about an inductive sensor or None if not present
+        self._inductive_sensor = None
         # Maximum number of heaters this board can control
         self._max_heaters = 0
         # Maximum number of motors this board can drive
@@ -104,7 +111,7 @@ class Board(ModelObject):
         self._wifi_firmware_file_name = None
 
     @property
-    def bootloader_file_name(self) -> Union[str, None]:
+    def bootloader_file_name(self) -> Optional[str]:
         """Filename of the bootloader binary or None if unknown"""
         return self._bootloader_file_name
 
@@ -113,7 +120,7 @@ class Board(ModelObject):
         self._bootloader_file_name = str(value) if value is not None else None
 
     @property
-    def can_address(self) -> Union[int, None]:
+    def can_address(self) -> Optional[int]:
         """CAN address of this board or None if not applicable"""
         return self._can_address
 
@@ -122,7 +129,7 @@ class Board(ModelObject):
         self._can_address = int(value) if value is not None else None
 
     @property
-    def drivers(self) -> Union[List[Driver], None]:
+    def drivers(self) -> Optional[List[Driver]]:
         """Drivers of this board"""
         return self._drivers
 
@@ -167,7 +174,16 @@ class Board(ModelObject):
         self._firmware_version = str(value)
 
     @property
-    def iap_file_name_SBC(self) -> Union[str, None]:
+    def free_ram(self) -> Optional[int]:
+        """Amount of free RAM on this board (in bytes or null if unknown)"""
+        return self._free_ram
+
+    @free_ram.setter
+    def free_ram(self, value):
+        self._free_ram = None if value is None else int(value)
+
+    @property
+    def iap_file_name_SBC(self) -> Optional[str]:
         """Filename of the IAP binary that is used for updates from the SBC or None if unsupported"""
         return self._iap_file_name_SBC
 
@@ -176,7 +192,7 @@ class Board(ModelObject):
         self._iap_file_name_SBC = str(value) if value is not None else None
 
     @property
-    def iap_file_name_SD(self) -> Union[str, None]:
+    def iap_file_name_SD(self) -> Optional[str]:
         """Filename of the IAP binary that is used for updates from the SD card or None if unsupported
         This is only available for the mainboard (first board item)"""
         return self._iap_file_name_SD
@@ -256,7 +272,7 @@ class Board(ModelObject):
         self._supports_direct_display = bool(value)
 
     @property
-    def unique_id(self) -> Union[str, None]:
+    def unique_id(self) -> Optional[str]:
         """Unique identifier of the board or None if unknown"""
         return self._unique_id
 

dsf/object_model/boards/inductive_sensor.py

@@ -0,0 +1,9 @@
+from ..model_object import ModelObject
+
+
+class InductiveSensor(ModelObject):
+    """"""
+
+    def __init__(self):
+        super(InductiveSensor, self).__init__()
+        # still empty

dsf/object_model/fans/fans.py

@@ -23,6 +23,8 @@ class Fan(ModelObject):
         self._requested_value = 0
         # Current RPM of this fan or -1 if unknown/unset
         self._rpm = -1
+        # Pulses per tacho revolution
+        self._tacho_ppr = 2.0
         # Thermostatic control parameters
         self._thermostatic = FanThermostaticControl()
 
@@ -99,6 +101,15 @@ class Fan(ModelObject):
     def rpm(self, value):
         self._rpm = int(value)
 
+    @property
+    def tacho_ppr(self) -> float:
+        """Pulses per tacho revolution"""
+        return self._tacho_ppr
+
+    @tacho_ppr.setter
+    def tacho_ppr(self, value):
+        self._tacho_ppr = float(value)
+
     @property
     def thermostatic(self) -> FanThermostaticControl:
         """Thermostatic control parameters"""