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

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

@@ -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 → dsf_python-3.6.0rc3}/setup.cfg

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

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

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

{dsf_python-3.6.0rc2 → dsf_python-3.6.0rc3}/src/dsf/__init__.py

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

{dsf_python-3.6.0rc2 → dsf_python-3.6.0rc3}/src/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_python-3.6.0rc2 → dsf_python-3.6.0rc3}/src/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_python-3.6.0rc2 → dsf_python-3.6.0rc3}/src/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 → dsf_python-3.6.0rc3}/src/dsf_python.egg-info/PKG-INFO

@@ -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.