dsf-python 3.6.0rc1__tar.gz → 3.6.0rc2__tar.gz

{dsf_python-3.6.0rc1 → dsf_python-3.6.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dsf-python
-Version: 3.6.0rc1
+Version: 3.6.0rc2
 Summary: Python interface to access DuetSoftwareFramework
 Home-page: https://github.com/Duet3D/dsf-python
 Author: Duet3D Ltd.
@@ -36,6 +36,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: provides-extra
 Dynamic: requires-dist

{dsf_python-3.6.0rc1 → dsf_python-3.6.0rc2}/setup.cfg

@@ -5,7 +5,7 @@ license_files = LICENSE
 max-line-length = 120
 
 [sdist_dsc]
-forced-upstream-version = 3.6.0-rc1
+forced-upstream-version = 3.6.0-rc2
 
 [egg_info]
 tag_build = 

{dsf_python-3.6.0rc1 → dsf_python-3.6.0rc2}/setup.py

@@ -6,7 +6,7 @@ long_description = open("README.md", encoding="utf-8").read()
 
 setuptools.setup(
     name="dsf-python",
-    version="3.6.0-rc1",
+    version="3.6.0-rc2",
     description="Python interface to access DuetSoftwareFramework",
     long_description=long_description,
     long_description_content_type="text/markdown",

dsf_python-3.6.0rc2/src/dsf/__init__.py

@@ -0,0 +1,27 @@
+__version__ = "3.6.0-rc2"
+
+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 protocol version
+PROTOCOL_VERSION = 12
+
+from . import commands, connections, http, object_model

{dsf_python-3.6.0rc1 → dsf_python-3.6.0rc2}/src/dsf/object_model/heat/heater.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import List
+from typing import List, Union
 
 from .heater_model import HeaterModel
 from .heater_monitor import HeaterMonitor
@@ -39,6 +39,10 @@ class Heater(ModelObject):
         self._avg_pwm = 0
         # Current temperature of the heater (in C)
         self._current = -273.15
+        # Current feedforward PWM boost applied to the heater
+        self._extr_pwm_boost = 0.0
+        # Current temperature boost applied to the heater
+        self._extr_temp_boost = 0.0
         # Maximum temperature allowed for this heater (in C)
         # This is only temporary and should be replaced by a representation of the heater protection as in RRF
         self._max = 285
@@ -89,6 +93,24 @@ class Heater(ModelObject):
     def current(self, value: float):
         self._current = float(value)
 
+    @property
+    def extr_pwm_boost(self) -> float:
+        """Current feedforward PWM boost applied to the heater"""
+        return self._extr_pwm_boost
+
+    @extr_pwm_boost.setter
+    def extr_pwm_boost(self, value: float):
+        self._extr_pwm_boost = float(value)
+
+    @property
+    def extr_temp_boost(self) -> float:
+        """Current temperature boost applied to the heater"""
+        return self._extr_temp_boost
+
+    @extr_temp_boost.setter
+    def extr_temp_boost(self, value: float):
+        self._extr_temp_boost = float(value)
+
     @property
     def max(self) -> float:
         """Maximum temperature allowed for this heater (in C)

{dsf_python-3.6.0rc1 → dsf_python-3.6.0rc2}/src/dsf_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dsf-python
-Version: 3.6.0rc1
+Version: 3.6.0rc2
 Summary: Python interface to access DuetSoftwareFramework
 Home-page: https://github.com/Duet3D/dsf-python
 Author: Duet3D Ltd.
@@ -36,6 +36,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: provides-extra
 Dynamic: requires-dist

dsf_python-3.6.0rc1/src/dsf/__init__.py

@@ -1,12 +0,0 @@
-__version__ = "3.6.0-rc1"
-
-# path to unix socket file
-SOCKET_FILE = "/run/dsf/dcs.sock"
-
-# allowed connection per unix server
-DEFAULT_BACKLOG = 4
-
-# DSF protocol version
-PROTOCOL_VERSION = 12
-
-from . import commands, connections, http, object_model