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

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,7 +18,7 @@ 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):
@@ -37,7 +37,7 @@ def set_plugin_data(plugin: str, key: str, value: str):
     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 +49,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 +65,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 +81,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/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,6 +34,7 @@ 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,
     ):
@@ -39,12 +43,18 @@ class InterceptConnection(BaseCommandConnection):
         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/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"""

dsf/object_model/move/axis.py

@@ -26,6 +26,26 @@ class AxisLetter(str, Enum):
     d = 'd'
     e = 'e'
     f = 'f'
+    g = 'g'
+    h = 'h'
+    i = 'i'
+    j = 'j'
+    k = 'k'
+    l = 'l'
+    m = 'm'
+    n = 'n'
+    o = 'o'
+    p = 'p'
+    q = 'q'
+    r = 'r'
+    s = 's'
+    t = 't'
+    u = 'u'
+    v = 'v'
+    w = 'w'
+    x = 'x'
+    y = 'y'
+    z = 'z'
     none = ''
 
 

dsf/object_model/move/input_shaping.py

@@ -23,10 +23,10 @@ class InputShapingType(str, Enum):
     zvddd = "zvddd"
 
     # EI2 (2-hump)
-    ei2 = "ei2"
+    ei2 = "eI2"
 
     # EI3 (3-hump)
-    ei3 = "ei3"
+    ei3 = "eI3"
 
     # Custom
     custom = "custom"

dsf/object_model/move/move_segmentation.py

@@ -5,17 +5,17 @@ class MoveSegmentation(ModelObject):
     """Move segmentation parameters"""
     def __init__(self):
         super().__init__()
-        self._segments_per_sec = 0
-        self._min_segment_length = 0
+        self._segments_per_sec = 0.0
+        self._min_segment_length = 0.0
         
     @property
-    def segments_per_sec(self) -> int:
+    def segments_per_sec(self) -> float:
         """Number of segments per second"""
         return self._segments_per_sec
     
     @segments_per_sec.setter
     def segments_per_sec(self, value):
-        self._segments_per_sec = int(value)
+        self._segments_per_sec = float(value)
         
     @property
     def min_segment_length(self) -> float:

dsf/object_model/plugins/plugin_manifest.py

@@ -20,6 +20,7 @@ class PluginManifest(ModelObject):
         self._name = None
         self._rrf_version = None
         self._sbc_auto_restart = False
+        self._sbc_config_files = []
         self._sbc_dsf_version = None
         self._sbc_executable = None
         self._sbc_executable_arguments = []
@@ -137,6 +138,13 @@ class PluginManifest(ModelObject):
     @sbc_auto_restart.setter
     def sbc_auto_restart(self, value):
         self._sbc_auto_restart = bool(value)
+        
+    @property
+    def sbc_config_files(self) -> List[str]:
+        """List of files in the sys or virtual SD directory that should not be overwritten on upgrade
+        The file may be specified either relative to 0:/sys directory (e.g. motion.conf) or relative to the
+        virtual SD directory (e.g. sys/motion.conf). Drive indices as in 0:/sys/motion.conf are not allowed!"""
+        return self._sbc_config_files
 
     @property
     def sbc_dsf_version(self) -> str:

dsf/object_model/sbc/dsf/dsf.py

@@ -13,6 +13,7 @@ class DSF(ModelObject):
         super().__init__()
         self._build_date_time = ""
         self._http_endpoints = ModelCollection(HttpEndpoint)
+        self._is64bit = False
         self._plugin_support = False
         self._root_plugin_support = False
         self._user_sessions = ModelCollection(UserSession)
@@ -27,6 +28,15 @@ class DSF(ModelObject):
     def build_date_time(self, value):
         self._build_date_time = str(value)
 
+    @property
+    def is64bit(self) -> bool:
+        """Indicates if the process is 64-bit"""
+        return self._is64bit
+
+    @is64bit.setter
+    def is64bit(self, value):
+        self._is64bit = bool(value)
+
     @property
     def http_endpoints(self) -> List[HttpEndpoint]:
         """List of registered third-party HTTP endpoints"""

dsf/object_model/sensors/analog_sensor.py

@@ -14,9 +14,11 @@ class AnalogSensor(ModelObject):
         self._c = None
         self._last_reading = None
         self._name = None
+        self._offset_adj = 0.0
         self._port = None
         self._r_25 = None
         self._r_ref = None
+        self._slope_adj = 0.0
         self._state = TemperatureError.ok
         self._type = AnalogSensorType.Unknown
 
@@ -55,6 +57,16 @@ class AnalogSensor(ModelObject):
     @name.setter
     def name(self, value):
         self._name = str(value) if value is not None else None
+        
+    @property
+    def offset_adj(self) -> float:
+        """Offset adjustment (in K)
+        See also M308 U"""
+        return self._offset_adj
+    
+    @offset_adj.setter
+    def offset_adj(self, value):
+        self._offset_adj = float(value)
 
     @property
     def port(self) -> Union[str, None]:
@@ -83,6 +95,16 @@ class AnalogSensor(ModelObject):
     def r_ref(self, value):
         self._r_ref = float(value) if value is not None else None
 
+    @property
+    def slope_adj(self) -> float:
+        """Slope adjustment factor
+        See also M308 V"""
+        return self._slope_adj
+
+    @slope_adj.setter
+    def slope_adj(self, value):
+        self._slope_adj = float(value)
+
     @property
     def state(self) -> TemperatureError:
         """State of this sensor"""

dsf/object_model/sensors/probe.py

@@ -1,4 +1,4 @@
-from typing import List, Union
+from typing import List, Optional
 
 from .probe_type import ProbeType
 from ..model_object import ModelObject
@@ -20,6 +20,7 @@ class Probe(ModelObject):
         self._is_calibrated = None
         self._last_stop_height = 0
         self._max_probe_count = 1
+        self._measured_height = None
         self._offsets = [0, 0]
         self._recovery_time = 0
         self._scan_coefficients = None
@@ -33,7 +34,7 @@ class Probe(ModelObject):
         self._value = []
 
     @property
-    def calib_a(self) -> Union[float, None]:
+    def calib_a(self) -> Optional[float]:
         """Linear coefficient for scanning probes"""
         return self._calib_a
 
@@ -42,7 +43,7 @@ class Probe(ModelObject):
         self._calib_a = float(value) if value is not None else None
 
     @property
-    def calib_b(self) -> Union[float, None]:
+    def calib_b(self) -> Optional[float]:
         """Quadratic coefficient for scanning probes"""
         return self._calib_b
 
@@ -97,7 +98,7 @@ class Probe(ModelObject):
         return self._dive_heights
 
     @property
-    def is_calibrated(self) -> Union[bool, None]:
+    def is_calibrated(self) -> Optional[bool]:
         """Indicates if the scanning probe is calibrated"""
         return self._is_calibrated
 
@@ -123,6 +124,15 @@ class Probe(ModelObject):
     def max_probe_count(self, value):
         self._max_probe_count = int(value)
         
+    @property
+    def measured_height(self) -> Optional[float]:
+        """Measured height (only applicable for scanning probes, in mm or null)"""
+        return self._measured_height
+    
+    @measured_height.setter
+    def measured_height(self, value):
+        self._measured_height = None if value is None else float(value)
+        
     @property
     def offsets(self) -> List[float]:
         """X+Y offsets (in mm)"""
@@ -144,7 +154,7 @@ class Probe(ModelObject):
         return self._speeds[0]
 
     @property
-    def scan_coefficients(self) -> Union[List[float], None]:
+    def scan_coefficients(self) -> Optional[List[float]]:
         """Coefficients for the scanning Z-probe (4 elements, if applicable)"""
         return self._scan_coefficients
 
@@ -154,7 +164,8 @@ class Probe(ModelObject):
         
     @property
     def speeds(self) -> List[float]:
-        """Fast and slow probing speeds (in mm/s)"""
+        """Fast and slow probing speeds (in mm/s)
+        Scanning probes may have three speeds where the last one is the movement speed while probing heightmaps"""
         return self._speeds
     
     @speeds.setter

dsf/object_model/sensors/probe_type.py

@@ -36,3 +36,6 @@ class ProbeType(IntEnum):
 
     # Z motor stall detection
     ZMotorStall = 10
+
+    # Scanning Z Probe
+    ScanningZProbe = 11

dsf/object_model/spindles/spindles.py

@@ -1,6 +1,8 @@
 from .spindle_state import SpindleState
 from ..model_object import ModelObject
 
+from typing import Union
+
 
 class Spindle(ModelObject):
     """Information about a CNC spindles"""
@@ -29,85 +31,85 @@ class Spindle(ModelObject):
         self._state = SpindleState.unconfigured
         
     @property
-    def active(self) -> int:
+    def active(self) -> Union[int, None]:
         """Active RPM"""
         return self._active
     
     @active.setter
-    def active(self, value: int):
-        self._active = int(value)
+    def active(self, value: Union[int, None]):
+        self._active = None if value is None else int(value)
         
     @property
-    def can_reverse(self) -> bool:
+    def can_reverse(self) -> Union[bool, None]:
         """Flags whether the spindles may spin in reverse direction"""
         return self._can_reverse
     
     @can_reverse.setter
-    def can_reverse(self, value: bool):
-        self._can_reverse = bool(value)
+    def can_reverse(self, value: Union[bool, None]):
+        self._can_reverse = None if value is None else bool(value)
         
     @property
-    def current(self) -> int:
+    def current(self) -> Union[int, None]:
         """Current RPM, negative if anticlockwise direction"""
         return self._current
     
     @current.setter
-    def current(self, value: int):
-        self._current = int(value)
+    def current(self, value: Union[int, None]):
+        self._current = None if value is None else int(value)
         
     @property
-    def frequency(self) -> int:
+    def frequency(self) -> Union[int, None]:
         """Frequency (in Hz)"""
         return self._frequency
     
     @frequency.setter
-    def frequency(self, value: int):
-        self._frequency = int(value)
+    def frequency(self, value: Union[int, None]):
+        self._frequency = None if value is None else int(value)
 
     @property
-    def idle_pwm(self) -> float:
+    def idle_pwm(self) -> Union[float, None]:
         """Idle PWM value (0..1)"""
         return self._idle_pwm
 
     @idle_pwm.setter
-    def idle_pwm(self, value: float):
-        self._idle_pwm = float(value)
+    def idle_pwm(self, value: Union[float, None]):
+        self._idle_pwm = None if value is None else float(value)
         
     @property
-    def max(self) -> int:
+    def max(self) -> Union[int, None]:
         """Maximum RPM"""
         return self._max
     
     @max.setter
-    def max(self, value: int):
-        self._max = int(value)
+    def max(self, value: Union[int, None]):
+        self._max = None if value is None else int(value)
 
     @property
-    def max_pwm(self) -> float:
+    def max_pwm(self) -> Union[float, None]:
         """Maximum PWM value when turned on (0..1)"""
         return self._max_pwm
 
     @max_pwm.setter
-    def max_pwm(self, value: float):
-        self._max_pwm = float(value)
+    def max_pwm(self, value: Union[float, None]):
+        self._max_pwm = None if value is None else float(value)
         
     @property
-    def min(self) -> int:
+    def min(self) -> Union[int, None]:
         """Minimum RPM when turned on"""
         return self._min
     
     @min.setter
-    def min(self, value: int):
-        self._min = int(value)
+    def min(self, value: Union[int, None]):
+        self._min = None if value is None else int(value)
 
     @property
-    def min_pwm(self) -> float:
+    def min_pwm(self) -> Union[float, None]:
         """Minimum PWM value when turned on (0..1)"""
         return self._min_pwm
 
     @min_pwm.setter
-    def min_pwm(self, value: float):
-        self._min_pwm = float(value)
+    def min_pwm(self, value: Union[float, None]):
+        self._min_pwm = None if value is None else float(value)
         
     @property
     def state(self) -> SpindleState:

{dsf_python-3.5.0.2rc2.dist-info → dsf_python-3.6.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsf-python
-Version: 3.5.0.2rc2
+Version: 3.6.0b2
 Summary: Python interface to access DuetSoftwareFramework
 Home-page: https://github.com/Duet3D/dsf-python
 Author: Duet3D Ltd.
@@ -27,8 +27,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: python-dateutil
 Provides-Extra: dev
-Requires-Dist: sphinx ; extra == 'dev'
-Requires-Dist: tox ; extra == 'dev'
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: tox; extra == "dev"
 
 # Duet Software Framework Python Bindings
 
@@ -36,7 +36,7 @@ This is also availabe as a [pip package on pypi](https://pypi.org/project/dsf-py
 
 Find out more about [Duet Software Framework](https://github.com/Duet3D/DuetSoftwareFramework).
 
-Find out more about [Duet Software Framework Python Bindings](https://github.com/Duet3D/dsf-python).
+Examples of the [Duet Software Framework Python Bindings](https://github.com/Duet3D/dsf-python/tree/main/examples).
 
 Get in touch with the community at [Duet Software Framework Forum](https://forum.duet3d.com/category/31/dsf-development) for bug reports, discussion and any kind of exchange.
 

{dsf_python-3.5.0.2rc2.dist-info → dsf_python-3.6.0b2.dist-info}/RECORD

@@ -4,31 +4,31 @@ dsf/http.py,sha256=ZOz0dRGWyxgWDoS-1c3DqQkNmyAZuhPi9y6vtano-mU,5829
 dsf/utils.py,sha256=9GfGUu0sbeoJBJ6RuRIpI-BZ-1PKIMWaemWliknt1v0,2571
 dsf/commands/__init__.py,sha256=O4_mLIDnLnN3zLxvH8_3mx3Yx2rU4f2Ha3cm9PmFaS4,198
 dsf/commands/base_command.py,sha256=rwjaXeZ38yayAH7gYBm9Nf1xpYsg38Ul6oMexSkuCIo,378
-dsf/commands/code.py,sha256=UHIBBtJDVR0QJkiYpuo3TA57cvtfIMWzE8m2Z0YY-uE,5795
+dsf/commands/code.py,sha256=4hP4vySeL_TQ8dbBIT-Xjbmn8amxpvW2IYEuLclzlgs,5877
 dsf/commands/code_channel.py,sha256=RiwN-eDKpFdvus7h8vxbpGRKigleDXUIbI1MZkjF4_8,1399
 dsf/commands/code_flags.py,sha256=dE7B5LrSdY2VBPquR2kF8PacjsR8ELC0BKOaPJMjPCM,2134
-dsf/commands/code_interception.py,sha256=sWWYVDMeOUojq8-4ElKyWlzaJj5L9_BfvfnogsdYByE,1076
+dsf/commands/code_interception.py,sha256=0MD71Wq4c0Mss2VOgyKxjbj49f-DOkKOZDQ-Tz3K928,1076
 dsf/commands/code_parameter.py,sha256=7vjxgQI5LxaRRzXxEOYK_mk71fng7MKiTYBh-nZ-6h0,8145
 dsf/commands/code_type.py,sha256=NU8GNaN2AAdNRVc964yQCnlqo82E8QqJ-g31hsdOT80,456
 dsf/commands/condition_type.py,sha256=bml4YGcPdpk_TZ_aB7RHuS4o0XazpgNkuKMRcqW8XNU,563
-dsf/commands/files.py,sha256=feBbNtGkn_VAQuN3N6KhmCxT2OvworzYibLRgE-b9Hk,918
-dsf/commands/generic.py,sha256=Fvg1GUrDMKEr4iT-PLr3h27YneI9capymygqVOOIJ-g,5752
-dsf/commands/http_endpoints.py,sha256=TMqhtcvmyG92NQAZdziYRtWPtZUK1PjwuL7Onu6PPNM,2341
+dsf/commands/files.py,sha256=wMFY3cbhfmyNh85cpBIgtqlxE7xhCk3QpawXgimBVd8,1062
+dsf/commands/generic.py,sha256=hjTzFJVVjzxFSMgc3ou7AevwnQmNBrJ9WFjTXIq_8y0,5752
+dsf/commands/http_endpoints.py,sha256=CevsLjAh_9GG6MQkAL7aFZKsuyRvYgNkiSCc5-jGv7g,2341
 dsf/commands/model_subscription.py,sha256=Dq4M7EfRjkHUcIbTrLjJRAxhAhMiawowLbEFS11NMEc,224
-dsf/commands/object_model.py,sha256=umDS0QBYke6kA_rjJzTghMUL0FZpW7m7FpgDd81AhCE,2522
-dsf/commands/packages.py,sha256=oAERVIeKdbFpkBiN30_yxz6R7npwnPuuhCg-YMeCH6g,712
-dsf/commands/plugins.py,sha256=xm5ZVF7fDEFNVLd2Q2v14EGLK6_qgcmjwkxKdrw5CcU,3020
+dsf/commands/object_model.py,sha256=QDtxBbkJA7AozjicUtMAhBq9uGkB9_OHcZQIr8koJG4,2522
+dsf/commands/packages.py,sha256=e7LObfz7xNygMPGi2A5o_F6OG1yFhN5fYO--U0tf5WM,712
+dsf/commands/plugins.py,sha256=w_7YlIxj95w046vO89qGbAXyVzOBw_o-dlMuaqFE-JA,3020
 dsf/commands/responses.py,sha256=Q6jZwEKbmKkph96EepUdgD6LfY2VAX41MAaj6aJ1-XQ,1755
-dsf/commands/user_sessions.py,sha256=BKq8--kh_eoFWDJCL1byiJ4NV3HZ7h3C4jxDI8j2kWo,1312
+dsf/commands/user_sessions.py,sha256=qFN_NfS8n2gVXqfdN0_kA3--kvtrX0ELYKtkxT1U7-E,1312
 dsf/connections/__init__.py,sha256=83E9M8yOZfdQqm196fnOaR7Wy4_IDYVhFwIl9BltsxI,1898
 dsf/connections/base_command_connection.py,sha256=kF-qhT_MJYey7wH2Rh1tA5LqauiFA_qNGS609in8FVA,9968
 dsf/connections/base_connection.py,sha256=U9UcGElF_68sK_7UCENpECvTgtBI2nbh1GTFWjRUrQg,5495
 dsf/connections/command_connection.py,sha256=siw-Rv2uOgE0DvNElbBpH8zGjjSVy0iSuNx5jBas8yM,478
 dsf/connections/exceptions.py,sha256=53NNjIs6fB6UtdcP0aGnIUQsH7fr5HwVM_21TDXjuZM,610
-dsf/connections/intercept_connection.py,sha256=2v2SuInq5oSp7FDLeGekjIc3fwztFuJy0Odi-0IlsEw,3033
+dsf/connections/intercept_connection.py,sha256=sv3cPS8OT1w4wRlCrvpoIUgsu6f_cJ7to0GBQPflQBQ,3480
 dsf/connections/subscribe_connection.py,sha256=gxJ32Ojvp30d2UIgCG1udTZJTtVNHqJjAYOpr1fWwH0,2444
 dsf/connections/init_messages/__init__.py,sha256=EzPfwszMfvxl3lwrgq9HUDgqLPjRlkWgoBKme-DZMO8,56
-dsf/connections/init_messages/client_init_messages.py,sha256=uWBBrFUe7DT7LqRtudx66UB14QB8HvjCL0OCvFndK5c,3734
+dsf/connections/init_messages/client_init_messages.py,sha256=3sdL07FXIEHegqhNedvGyHIEBImyReAYpA8wc91TpLs,4090
 dsf/connections/init_messages/server_init_message.py,sha256=87aMgtYa9n_XHa9ZKKoMYPxo1bJd41D_PEa2CR49YBE,1610
 dsf/object_model/__init__.py,sha256=UrzocKhApHnYUO8MQ3gyDNwuaEoXmwgUEe2vbx4o2RY,967
 dsf/object_model/model_collection.py,sha256=7K8C7bb5Sz_cVqlbKdGtgJi8fElJcrYjWFvizvlF9LQ,2008
@@ -37,11 +37,12 @@ dsf/object_model/model_object.py,sha256=ORySkN-m_geMjiolxwqmmvOM7QESHwn_yjHzozYm
 dsf/object_model/object_model.py,sha256=Sci1t4HYEhFLLPKq8wB0AM_2f9Qzle7QkgSzwmGjknI,5213
 dsf/object_model/utils.py,sha256=7QbKzCb4MzFmGSR5lpjx0iocg1jAETGHFx_k3y6Dff4,1602
 dsf/object_model/boards/__init__.py,sha256=LIdq7wTaYZdmDveMQlE8eyiaf9D7pA6XF7VmC3Axibo,541
-dsf/object_model/boards/accelerometer.py,sha256=rmEB27xCRABLxDQsNbG32x2uSTQpGoflaxrfpWEj-6g,794
+dsf/object_model/boards/accelerometer.py,sha256=AVcNQpZHhEkF0jtNdQGKpEiypdiuKq9-M6_BGz9rsw8,1351
 dsf/object_model/boards/board_closed_loop.py,sha256=JXT0LDtiCYlInvE-39u-AG6AMDzvR4-DTx9vf_nTjL8,818
-dsf/object_model/boards/boards.py,sha256=diRAIMXTw2spWFvhLnITlYZOW3eS8x_Fuf_8bFoqh_Q,9386
+dsf/object_model/boards/boards.py,sha256=uPV9zVP2BYQ5cpEFE8-mre4ud8EpHWM5I27jJwE-ixQ,10055
 dsf/object_model/boards/driver.py,sha256=Q9OEroanT1z96uSz4g7NLD5fBft0c0JyQPMJRcZl-EA,988
 dsf/object_model/boards/driver_closed_loop.py,sha256=204h78FV3VNnvDSZzRO_y3RFzWQoVSpd8eF9KvZE8d4,1958
+dsf/object_model/boards/inductive_sensor.py,sha256=eYOwQxaDFVAEpELj7yNRPIvFddkeABwtLZy5WgX1BBU,183
 dsf/object_model/boards/min_max_current.py,sha256=3hgP_gawmxE49hF377zHmRLQnrOUo5fV8Y6n9y_UXc8,930
 dsf/object_model/boards/direct_display/__init__.py,sha256=MlEwefhOdonXekr5L1BqBDMrWLL3XrSB0PflRXEKn9U,428
 dsf/object_model/boards/direct_display/direct_display.py,sha256=FrOE8Q6gWCNfWjF9-LMbldZ7lKzNcx-0l8WW_3aKerg,721
@@ -53,7 +54,7 @@ dsf/object_model/directories/__init__.py,sha256=hA7GZngL3t5Fl7p95wQjlMmDbA_fKyNm
 dsf/object_model/directories/directories.py,sha256=fOg7wpl1ZG-2YKguqRgkyEwsKiA72s4v7OsgAmVE35E,2310
 dsf/object_model/fans/__init__.py,sha256=poaHZyeTxUTvvyATlGfoL6xcc5m8t2pm0od1vMRgZcw,128
 dsf/object_model/fans/fan_thermostatic_control.py,sha256=9V5p-Ek3CHv0QyyykxNeGfs5bdn0NZ_KSJ1OVFoxdek,1610
-dsf/object_model/fans/fans.py,sha256=Tn_GeuJ40_4iH1mmZCpW86vO9Usc_HWdZtJki8xuqes,2951
+dsf/object_model/fans/fans.py,sha256=6FAmgBOA0uqd5RPuCJRcQ4q7Ts3UdtMMT8g8Rpefnnw,3235
 dsf/object_model/heat/__init__.py,sha256=iT38cPXNDOdXy0upTjKlF5J2z1aETRvZpEYwlf7yCdw,388
 dsf/object_model/heat/heat.py,sha256=-ZZ4rKIBss9Ax62dr5VIGbMSNzEI-iQbAvIp_rut3nM,1909
 dsf/object_model/heat/heater.py,sha256=LXTuoI8Igjc6kF_f7PDaPWMn-ImeLePeS80Zc0jswbU,5573
@@ -81,12 +82,12 @@ dsf/object_model/limits/limits.py,sha256=hYZKO5X6ZcxwqBzloGrOMhLgqU0x4CQqtNsPm3f
 dsf/object_model/messages/__init__.py,sha256=GCFZZNH3R7kKpxvZE5g5S1RzzhmgSjfYTdyaxARt0p0,81
 dsf/object_model/messages/messages.py,sha256=cGHFC4KqDZki6mzUpRGiOFecaQb4v2OBbp8YI_lri08,2398
 dsf/object_model/move/__init__.py,sha256=SC9H4mw28BzaxdRVctJbQXSZFA3SzliiZMnpOcDx7K4,708
-dsf/object_model/move/axis.py,sha256=oOa1Tx6CT70if7grQnYegQCj3XwvdCZ4Frzhyu7eUVo,7805
+dsf/object_model/move/axis.py,sha256=IWSjAEWMiFJ31-4VRCa5_B-XHRdnt5EZqXhlJ6kNIB8,8045
 dsf/object_model/move/current_move.py,sha256=Qlt7-d7SrsPbYkHKAz7_SeOsrrboKvPxbd1OpfZydek,2244
 dsf/object_model/move/driver_id.py,sha256=5iMNYRgViw5IcSYxrG2LNurA7ytDSXfBC8v4meAdO-k,2202
 dsf/object_model/move/extruder.py,sha256=fFr9XRG-ePTg4lTsNcgrdjeyJoduwgCSLOYTzMt9SUQ,5164
 dsf/object_model/move/extruder_non_linear.py,sha256=C8UUZuyvA32EmgtpZu2yNYVcuLg8guamgKgfg9mvqok,976
-dsf/object_model/move/input_shaping.py,sha256=84KOJgJDngN4EAHxyvjOT7n8ODJvO1R1PY0qz7ETW38,2593
+dsf/object_model/move/input_shaping.py,sha256=kwOar7Bfi7RC1pB_OwQCntw7iYvvQw0cTM2ben5wdJ4,2593
 dsf/object_model/move/keepout_zone.py,sha256=eMP1ramG6cB-a1IJ89Y8BG3VVYIkfh_945jP4D9IAkA,1416
 dsf/object_model/move/microstepping.py,sha256=-9qWeoLihWPYQqJrAKz4CqvnaNj-zYAtYFVDVxJ0iaE,762
 dsf/object_model/move/motors_idle_control.py,sha256=ihKMYCm7yTiIkqsA9KCLZpU6FgdkcS5h_6JmcTH1AvU,844
@@ -96,7 +97,7 @@ dsf/object_model/move/move_compensation.py,sha256=A_3CMgd-tjKLuKbDyfrZUGgCAfgA8h
 dsf/object_model/move/move_deviations.py,sha256=rnS6PC2hf9JYaoYgZ8OqTNz9vnEoZKWQ2-tU-yg9org,682
 dsf/object_model/move/move_queue_item.py,sha256=u1PSUU8Ti3zPz2M0WSIJXVfFg0dySgQUtE4ycsOpJUs,859
 dsf/object_model/move/move_rotation.py,sha256=P_rojtqWrQn1HaqMgLfcEm1vn05tTXjRetar0xSYM0g,704
-dsf/object_model/move/move_segmentation.py,sha256=ENWhu6xIu6Lf52p4AmkLgDScppHDeZMM1nkOcoRb5Fc,782
+dsf/object_model/move/move_segmentation.py,sha256=xXd2vw22Gjv2staN3VamngnaDmFaS3aQxpuoI5Bu7ac,790
 dsf/object_model/move/probe_grid.py,sha256=bSPjMQ8FxM0S2M_9z4uK9pkexrnN39KAkqLKXNLXlXg,1284
 dsf/object_model/move/skew.py,sha256=BVvh_m2nlUdgc5OK4y9EyKTnTeA-bhIlsCOmPHlQSKI,1512
 dsf/object_model/move/kinematics/__init__.py,sha256=hG-K2GELZ8dt429LhXXaTzso_qAlIN-zUxQi9ba8Gnw,666
@@ -117,7 +118,7 @@ dsf/object_model/network/network_interface_type.py,sha256=TZyP1mmR8IlhlDhOqy4L3Y
 dsf/object_model/network/network_protocol.py,sha256=qMZQcgLST4oMk6KjWPHB3NC6SHBVdl2IrrFfHzKskys,333
 dsf/object_model/network/network_state.py,sha256=SkjP-bdfdtS4-egQdXLh7rRNL6gG9OJeU4fIvKkKidk,867
 dsf/object_model/plugins/__init__.py,sha256=bWA02R8c5xUVGV2bTU4X2NkRFrv_ox1APKR-TCFALX8,116
-dsf/object_model/plugins/plugin_manifest.py,sha256=A4k5KDkJndOdIcmEYz0_laNB7YhQ6HI1Legk4um4nyk,8797
+dsf/object_model/plugins/plugin_manifest.py,sha256=vGn83nD-x0M1Jvz2lr_Zd8MO0uXKrlwR8kYkbQOO3NU,9261
 dsf/object_model/plugins/plugins.py,sha256=EYkHycuEO4K92xte_znIw0Oq4XPRVPWzS71CZyYcUwA,999
 dsf/object_model/plugins/sbc_permissions.py,sha256=2oyLIG81GE2nCzkUa-uSH_XXsveEypFOCRhMWFc-sss,2514
 dsf/object_model/sbc/__init__.py,sha256=zpiPaAdXcJEyWSZvy6Ur_NYCkqFGO5BB5u8bxVQh20s,69
@@ -125,7 +126,7 @@ dsf/object_model/sbc/cpu.py,sha256=vtjZRqrM4L81i07SGg7OxmwkXaA5BRoT2GZkiMLSaeo,1
 dsf/object_model/sbc/memory.py,sha256=FKGXsUj5zpJQx4HkZ4js6Ax1ruZcC9xDCvBrnjPnYSs,743
 dsf/object_model/sbc/sbc.py,sha256=Xdjpwie9F2Jkhgap7TCXZZw12obeET_GBuxkssPpMFE,2998
 dsf/object_model/sbc/dsf/__init__.py,sha256=_cJkKrrhT_nJcdE9jQyNr75_OjqNTwu3gOGrO0GD1A8,144
-dsf/object_model/sbc/dsf/dsf.py,sha256=C097Wv0AFpAWncr67OWkfJPzdZ5ow1wQpKNr7BpAC9E,2046
+dsf/object_model/sbc/dsf/dsf.py,sha256=utbvpJnIzucaI6n5jnRbE2s6TdInI7sR4fqqtfajP-c,2287
 dsf/object_model/sbc/dsf/http_endpoint.py,sha256=hQIRNN7SLdeQOpzgTYF5nU5AaHDs2KORsw6ciNm-q8o,2305
 dsf/object_model/sbc/dsf/http_endpoint_type.py,sha256=JjtQAotrJFs6PowZkW2mrJXkIE-zqg-I3WdCcDjzRPM,554
 dsf/object_model/sbc/dsf/user_sessions/__init__.py,sha256=c8aLd_vyow01xMNVwh-Z7p0KnsvRZ5MaQ73cunMV_Ac,173
@@ -133,13 +134,13 @@ dsf/object_model/sbc/dsf/user_sessions/access_level.py,sha256=gCVS0JuVJ40i1NSYAx
 dsf/object_model/sbc/dsf/user_sessions/session_type.py,sha256=_eBDauWwEoJdO4zUs5xNgFC4yqn5LUWjG7BLJGaQ7cQ,229
 dsf/object_model/sbc/dsf/user_sessions/user_sessions.py,sha256=J76IEm-ZBAt8ZQf17OXpgkY0KX0Yn3daFArkCMB2FYg,2364
 dsf/object_model/sensors/__init__.py,sha256=Yb9OkMQI3jNF5Yx84UwMjQreckhraA8PRH0uLfaTAFg,283
-dsf/object_model/sensors/analog_sensor.py,sha256=slBz8Dw0k1K4pfhrR7j_4AYFwqq43_h1XWmlSliIC7E,3194
+dsf/object_model/sensors/analog_sensor.py,sha256=LKmRbolM8qNa-YkFSc521kHNFBup90AXvn_7n0tGw2A,3745
 dsf/object_model/sensors/analog_sensor_type.py,sha256=IPB4--lexKFxi8_Ue8k6Cv_veHkWoGilvT2RJJucMbY,1152
 dsf/object_model/sensors/endstop.py,sha256=QqL4WJ-bmmvAYTf6keS_wlL7w3nkCXEs59UBqJVySxs,1527
 dsf/object_model/sensors/endstop_type.py,sha256=XvdO-aJtUGuqtJzOx7DStnzjT-WbbJWdbexDJHoxdJw,474
 dsf/object_model/sensors/gp_input_port.py,sha256=xNtBsEs8m7ws6nAAKqH_Wan9CNMY3RdeZ_jpBRNvcK8,413
-dsf/object_model/sensors/probe.py,sha256=jJYkwW103LCNQpDaFNKrdx4uuOCYjA2SP4nwWNxfTEU,6782
-dsf/object_model/sensors/probe_type.py,sha256=MzGQnB-Nm35J2bYJbUuRkEosdgTYYhN5Vu_f1LYyqZI,978
+dsf/object_model/sensors/probe.py,sha256=mjkKcPRLxoPASn_D1oHkT8Hnk8O3iC99Xb-mQ8Lkuz8,7258
+dsf/object_model/sensors/probe_type.py,sha256=eE4ImrNCQ41iz_dza7hbLcfkoUdTIBD8Kei9wm2jEfA,1026
 dsf/object_model/sensors/sensors.py,sha256=W3lU-89QESx2jbg6_CRD6U8uw6UN136tPozSNpNCjCw,1333
 dsf/object_model/sensors/temperature_error.py,sha256=ahqOv7iRzLy88HvXMMRigZCbf3mkbbwYWdiZNnQ5rXI,1232
 dsf/object_model/sensors/filament_monitors/Duet3DFilamentMonitor.py,sha256=mYm_CWuKJeD63bOoO5npXQyHgCN-Xt6F0E8sTw8upPI,2301
@@ -153,7 +154,7 @@ dsf/object_model/sensors/filament_monitors/pulsed_filament_monitor.py,sha256=hu_
 dsf/object_model/sensors/filament_monitors/rotating_magnet_filament_monitor.py,sha256=TreikhdkGpyCZXYns0zXVnQLgPArmkvY-75maIEZx_g,3811
 dsf/object_model/spindles/__init__.py,sha256=YpC_jGR6TrfF3MPo4CeiUuu52AHz9vmYPcZhBAriNEM,109
 dsf/object_model/spindles/spindle_state.py,sha256=J76S84U9h-mICoFqp58KSPcfuVxoHuSsibtpeOMqnhw,334
-dsf/object_model/spindles/spindles.py,sha256=VnJ0LIaweeR7lrZ5oEDq9EP-4bqdiX796KzEC2fAFYA,3291
+dsf/object_model/spindles/spindles.py,sha256=BNqwHG41DFdG2cSnHpMZvFwiUUimUdQ_Nm9CNE7fDWA,3794
 dsf/object_model/state/__init__.py,sha256=aPuQU1fvoaWUJxCkUkSREh8J3JqbzYSIdyGnSnmgW5U,310
 dsf/object_model/state/beep_request.py,sha256=-Ah0obdAmVvXLsqTQMPHFCT18_gBI_MesxMSkzSPTkQ,679
 dsf/object_model/state/gp_output_port.py,sha256=Dhr8We-HIJPqPTcDPzSItIb8w656ET5lO-knmHm_h5E,710
@@ -171,8 +172,8 @@ dsf/object_model/tools/tools.py,sha256=2wOEZlXswUnVBa0cuhyGYHz1z2R-mF25fi0a7WY3W
 dsf/object_model/volumes/__init__.py,sha256=XuRDty30gqn8jshASvclpxVTachXeAeJyo2-iHKEsKc,50
 dsf/object_model/volumes/volumes.py,sha256=gqbo5kUQo037A7Wv49vxnnaBhGlNjilJydjW8V2sKZ4,3073
 dsf/utility/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsf_python-3.5.0.2rc2.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-dsf_python-3.5.0.2rc2.dist-info/METADATA,sha256=O1hzKrUHFc-nXFALmWb4sCS-unL8XbzzX9UpbFpNYic,2044
-dsf_python-3.5.0.2rc2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-dsf_python-3.5.0.2rc2.dist-info/top_level.txt,sha256=hrm-wnKtms7vAmVuHX6jIj3C6G5p3uKCiXZH4HwJ4LA,4
-dsf_python-3.5.0.2rc2.dist-info/RECORD,,
+dsf_python-3.6.0b2.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+dsf_python-3.6.0b2.dist-info/METADATA,sha256=BwSRQmLS4RsuytQ4UH9CUUZYgfHcE4uByQaxIGXKdDU,2054
+dsf_python-3.6.0b2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+dsf_python-3.6.0b2.dist-info/top_level.txt,sha256=hrm-wnKtms7vAmVuHX6jIj3C6G5p3uKCiXZH4HwJ4LA,4
+dsf_python-3.6.0b2.dist-info/RECORD,,

{dsf_python-3.5.0.2rc2.dist-info → dsf_python-3.6.0b2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any