From 9140b0c350eb659f24902a1381fd699463cce837 Mon Sep 17 00:00:00 2001 From: Vitor de Miranda Henrique Date: Mon, 10 Oct 2016 14:27:42 -0500 Subject: [PATCH] Add files via upload Bug Fix --- octoprint_enclosure/__init__.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index fbd2405..209720f 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -43,12 +43,13 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, else: self.enclosureCurrentTemperature = float(sTemp) - stdout = Popen("sudo "+self._settings.get(["getHumiScript"])+" "+str(self._settings.get(["dhtModel"]))+" "+str(self._settings.get(["dhtPin"])), shell=True, stdout=PIPE).stdout - sTemp = stdout.read() - if sTemp.find("Failed") != -1: - self._logger.info("Failed to read Humidity") - else: - self.enclosureCurrentHumidity = float(sTemp) + if self._settings.get(["dhtModel"]) != 1820 or self._settings.get(["dhtModel"]) != '1820': + stdout = Popen("sudo "+self._settings.get(["getHumiScript"])+" "+str(self._settings.get(["dhtModel"]))+" "+str(self._settings.get(["dhtPin"])), shell=True, stdout=PIPE).stdout + sHum = stdout.read() + if sHum.find("Failed") != -1: + self._logger.info("Failed to read Humidity") + else: + self.enclosureCurrentHumidity = float(sHum) self._plugin_manager.send_plugin_message(self._identifier, dict(enclosuretemp=self.enclosureCurrentTemperature,enclosureHumidity=self.enclosureCurrentHumidity)) self.heaterHandler()