diff --git a/config/machine_settings/defaults.ini b/config/machine_settings/defaults.ini index 5373d60..e2baedd 100644 --- a/config/machine_settings/defaults.ini +++ b/config/machine_settings/defaults.ini @@ -70,6 +70,7 @@ status_pin: 0 ; port: ? baudrate: 115200 cable_resistance: 0.75 +4wire: disabled [neo_pixels] ; port: ? diff --git a/config/machine_settings/st-ten-2.ini b/config/machine_settings/st-ten-2.ini index df7db02..8639302 100644 --- a/config/machine_settings/st-ten-2.ini +++ b/config/machine_settings/st-ten-2.ini @@ -13,6 +13,7 @@ port: COM6 [multicomp] port: COM10 +4wire: enabled [recipe] recipe_name_field: cod finito cliente diff --git a/src/components/multicomp_730424.py b/src/components/multicomp_730424.py index f49538c..291dabd 100644 --- a/src/components/multicomp_730424.py +++ b/src/components/multicomp_730424.py @@ -40,7 +40,10 @@ class Multicomp730424(Component): self.write("FUNC1 \"RES\"") self.write("RATE F") self.write("AUTO 0") - self.write("CONF:RES 500") + if self.config[self.name]["4wire"] is "enabled": + self.write("CONF:FRES 500") + else: + self.write("CONF:RES 500") def set_resistance_scale(self, resistance=None): if resistance is None: @@ -79,6 +82,7 @@ class Multicomp730424(Component): self.write(command) info[value_name] = self.read() if isinstance(info["measure"], float) and info["measure"] < 1e9: - info["measure"] -= self.cable_resistance + if self.config[self.name]["4wire"] is not "enabled": + info["measure"] -= self.cable_resistance self.log.debug(str(info)) super()._get([info])