From 8f64d22725d99d22489141cc45ab684d993c02f8 Mon Sep 17 00:00:00 2001 From: Vitor de Miranda Henrique Date: Thu, 2 Mar 2017 23:38:41 -0600 Subject: [PATCH] V 1.7 Log Improvement --- octoprint_enclosure/__init__.py | 12 ++++++++---- setup.py | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 4fa0328..6afd1af 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -55,8 +55,10 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, enclosureCurrentHumidity=0.0 def startGPIO(self): if self._settings.get(["useBoardPinNumber"]): + GPIO.cleanup() GPIO.setmode(GPIO.BOARD) else: + GPIO.cleanup() GPIO.setmode(GPIO.BCM) GPIO.setwarnings(False) @@ -109,24 +111,26 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, else: stdout = Popen("sudo "+self._settings.get(["getTempScript"])+" "+str(self._settings.get(["dhtModel"]))+" "+str(self._settings.get(["dhtPin"])), shell=True, stdout=PIPE).stdout sTemp = stdout.read() - if self._settings.get(["debug"]) == True: + if self._settings.get(["debug"]) == True and self._settings.get(["heaterEnable"]) == True: self._logger.info("DEBUG -> Reading temperature stdout: %s",stdout) sTemp.replace(" ", "") fTemp = self.toFloat(sTemp) if sTemp.find("Failed") != -1 or fTemp == 0: - self._logger.info("Failed to read Temperature") + if self._settings.get(["heaterEnable"]) == True: + self._logger.info("Failed to read Temperature") else: self.enclosureCurrentTemperature = fTemp*1.8 + 32 if self._settings.get(["useFahrenheit"]) else fTemp if 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 self._settings.get(["debug"]) == True: + if self._settings.get(["debug"]) == True and self._settings.get(["heaterEnable"]) == True: self._logger.info("DEBUG -> Reading humidity stdout: %s",stdout) sHum.replace(" ", "") fHum = self.toFloat(sHum) if sHum.find("Failed") != -1 or fHum == 0: - self._logger.info("Failed to read Humidity") + if self._settings.get(["heaterEnable"]) == True: + self._logger.info("Failed to read Humidity") else: self.enclosureCurrentHumidity = fHum self._plugin_manager.send_plugin_message(self._identifier, dict(enclosuretemp=self.enclosureCurrentTemperature,enclosureHumidity=self.enclosureCurrentHumidity)) diff --git a/setup.py b/setup.py index 64a3908..51a0f3c 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ plugin_package = "octoprint_enclosure" plugin_name = "OctoPrint-Enclosure" # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module -plugin_version = "1.6" +plugin_version = "1.7" # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin # module