dsf-python 3.6.0rc2__py3-none-any.whl → 3.6.0rc3__py3-none-any.whl

dsf/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.6.0-rc2"
+__version__ = "3.6.0-rc.3"
 
 import json
 import os

dsf/object_model/heat/heater.py

@@ -40,9 +40,9 @@ class Heater(ModelObject):
         # 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
+        self._extr_pwm_boost = None
         # Current temperature boost applied to the heater
-        self._extr_temp_boost = 0.0
+        self._extr_temp_boost = None
         # 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
@@ -94,22 +94,22 @@ class Heater(ModelObject):
         self._current = float(value)
 
     @property
-    def extr_pwm_boost(self) -> float:
+    def extr_pwm_boost(self) -> Union[float, None]:
         """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)
+    def extr_pwm_boost(self, value: Union[float, None]):
+        self._extr_pwm_boost = float(value) if value is not None else None
 
     @property
-    def extr_temp_boost(self) -> float:
+    def extr_temp_boost(self) -> Union[float, None]:
         """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)
+    def extr_temp_boost(self, value: Union[float, None]):
+        self._extr_temp_boost = float(value) if value is not None else None
 
     @property
     def max(self) -> float:

dsf/object_model/job/times_left.py

@@ -14,6 +14,8 @@ class TimesLeft(ModelObject):
         self._file = None
         # Time left based on the slicer reports (see M73, in s or null)
         self._slicer = None
+        # Time left before the next colour change is expected (see M73 C, in s or null)
+        self._to_pause = None
 
     @property
     def filament(self) -> Union[int, None]:
@@ -41,3 +43,12 @@ class TimesLeft(ModelObject):
     @slicer.setter
     def slicer(self, value):
         self._slicer = int(value) if value is not None else None
+
+    @property
+    def to_pause(self) -> Union[int, None]:
+        """Time left before the next colour change is expected (see M73 C, in s or null)"""
+        return self._to_pause
+
+    @to_pause.setter
+    def to_pause(self, value):
+        self._to_pause = int(value) if value is not None else None

dsf/object_model/sensors/analog_sensor_type.py

@@ -38,13 +38,13 @@ class AnalogSensorType(str, Enum):
     BME280 = "bme280"
 
     # BME280 pressure sensor
-    BME280Pressure = "bme280-pressure"
+    BME280Pressure = "bmepressure"
 
     # BME280 humidity sensor
-    BME280Humidity = "bme280-humidity"
+    BME280Humidity = "bmehumidity"
 
     # Current loop sensor
-    CurrentLoop = "currentloooppyro"
+    CurrentLoop = "currentlooppyro"
 
     # MCU temperature
     McuTemp = "mcutemp"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsf-python
-Version: 3.6.0rc2
+Version: 3.6.0rc3
 Summary: Python interface to access DuetSoftwareFramework
 Home-page: https://github.com/Duet3D/dsf-python
 Author: Duet3D Ltd.

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

@@ -1,4 +1,4 @@
-dsf/__init__.py,sha256=PSH0_AG_sZoF9RjzuwyA7pjvfcg-ojw3qjcTVJ2e1Dw,783
+dsf/__init__.py,sha256=XkcKSzylfJQQ7UCfEpSvfO1JX5_WtY8w-DRnigdz7WY,784
 dsf/exceptions.py,sha256=TIF-e0wAprfodFTfRD9chP6JZ97yA04dlaHN90mgGVI,93
 dsf/http.py,sha256=8itR1jlCx1QTusbbJP_RctuGBpV1pJcXssIKC4e0dDg,7266
 dsf/utils.py,sha256=9GfGUu0sbeoJBJ6RuRIpI-BZ-1PKIMWaemWliknt1v0,2571
@@ -57,7 +57,7 @@ dsf/object_model/fans/fan_thermostatic_control.py,sha256=9V5p-Ek3CHv0QyyykxNeGfs
 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=0GI5IWS8_WNeKAdHtv38g0EIs0CAjxRPrsRxuyCRtU4,6316
+dsf/object_model/heat/heater.py,sha256=dJR5S1K5jMMHs1Y9_uf2d-BQyyFRUz6X4qL0Jlj64q0,6432
 dsf/object_model/heat/heater_model.py,sha256=a3rXsNiPQ_xtdvNTXUBUHhxzZOmNlAoP-Im7lhV2l9E,3188
 dsf/object_model/heat/heater_model_pid.py,sha256=npGItqz2a6KMFhq2gsyLqWF16jZQbFk4GzOQLvqq1ys,1529
 dsf/object_model/heat/heater_monitor.py,sha256=H_nnEMCO3mZDY8PMtJuPhPonyH22yL6pg-VY_Q8I7VA,2899
@@ -74,7 +74,7 @@ dsf/object_model/job/gcode_fileinfo.py,sha256=A3_UKFhFZ4eoFSfT6TJMad7e91jBpt2LZ1
 dsf/object_model/job/job.py,sha256=xhn4DbKGQ5leH1YimLncr0_NRczZ5kqKpCJXt9RBLck,6825
 dsf/object_model/job/layer.py,sha256=s3Kt7xCrGGvjrtoYnQutcx_7UuycdiiNbHEk0gsvQSs,1660
 dsf/object_model/job/thumbnail_info.py,sha256=Hq3PrAMsm8Nl8mCCBOXzeCLJFPGXMsaZXxmeXUDzxps,2535
-dsf/object_model/job/times_left.py,sha256=qXuXejaJl1fwABEKFK8neN-Sf9Ypi3eEkH9Pxpm5MjE,1275
+dsf/object_model/job/times_left.py,sha256=Rw3Y7HqG39Zy3erk2CU84Yn6ENSHsFO3-Fqg4-nUuDM,1694
 dsf/object_model/led_strips/__init__.py,sha256=NCG-jAQk7lao1OuILdhmuhQdN3sNArIspnq5Rs80k5I,46
 dsf/object_model/led_strips/led_strip.py,sha256=MeryQ4jX7-DRnhsh1MP1pY22xnInYfA0vXHRqDIiX54,2142
 dsf/object_model/limits/__init__.py,sha256=h32hQ0bar4eRSytIaZJ8fZt5TSCGNEsRlLaMY-qGzPQ,49
@@ -135,7 +135,7 @@ dsf/object_model/sbc/dsf/user_sessions/session_type.py,sha256=_eBDauWwEoJdO4zUs5
 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=Evwb6d1hq2bGz9oeMX7EQzntuUuLEQmkSIeQfbcDQWg,4430
-dsf/object_model/sensors/analog_sensor_type.py,sha256=IPB4--lexKFxi8_Ue8k6Cv_veHkWoGilvT2RJJucMbY,1152
+dsf/object_model/sensors/analog_sensor_type.py,sha256=VohpHdZFiITazty_hyM0BRfgXX43OuUkPewdkzjYCRI,1143
 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
@@ -173,8 +173,8 @@ dsf/object_model/tools/tools.py,sha256=0hc1xeCkjvB36kcW9N3_6fl0J3KnBJqeZOtKCTYbI
 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.6.0rc2.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-dsf_python-3.6.0rc2.dist-info/METADATA,sha256=A4Yf2WUTNAP-00TOO5kU82bxbdPIQWa0ODjOMoDjJpQ,2337
-dsf_python-3.6.0rc2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-dsf_python-3.6.0rc2.dist-info/top_level.txt,sha256=hrm-wnKtms7vAmVuHX6jIj3C6G5p3uKCiXZH4HwJ4LA,4
-dsf_python-3.6.0rc2.dist-info/RECORD,,
+dsf_python-3.6.0rc3.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+dsf_python-3.6.0rc3.dist-info/METADATA,sha256=5TvoAnkdUTy3JzXQZ-AsxJXU4bYf_Xf1c6ZGiLHtdwY,2337
+dsf_python-3.6.0rc3.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
+dsf_python-3.6.0rc3.dist-info/top_level.txt,sha256=hrm-wnKtms7vAmVuHX6jIj3C6G5p3uKCiXZH4HwJ4LA,4
+dsf_python-3.6.0rc3.dist-info/RECORD,,

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

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