From 1f5891865f10e9c0ec5ea609fca341ab213254d3 Mon Sep 17 00:00:00 2001
From: Vitor de Miranda Henrique <vitormhenrique@gmail.com>
Date: Fri, 3 Mar 2017 13:28:28 -0600
Subject: [PATCH] custom g-code for filament detection

---
 octoprint_enclosure/__init__.py               | 82 ++++++++++---------
 octoprint_enclosure/static/js/enclosure.js    | 14 +++-
 .../templates/enclosure_settings.jinja2       | 56 +++++++------
 3 files changed, 87 insertions(+), 65 deletions(-)

diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py
index 0f297f7..947a19e 100644
--- a/octoprint_enclosure/__init__.py
+++ b/octoprint_enclosure/__init__.py
@@ -85,14 +85,13 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
         self.filamentSensor = EnclosureGPIO(self._settings.get_int(["filamentSensorPin"]),"filamentSensor",self._settings.get(["filamentSensorActiveLow"]),
                                 self._settings.get(["filamentSensorEnable"]),False,False,0,False)
 
-
         self.io1.configureGPIO()
         self.io2.configureGPIO()
         self.io3.configureGPIO()
         self.io4.configureGPIO()
         self.heater.configureGPIO()
         self.filamentSensor.configureGPIO()
-        
+
         self._settings.set(["useCelsius"],not self._settings.get(["useFahrenheit"]))
 
     def startTimer(self):
@@ -107,46 +106,46 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
             return 0
 
     def checkEnclosureTemp(self):
-        if self._settings.get(["dhtModel"]) == 1820 or self._settings.get(["dhtModel"]) == '1820':
-            stdout = Popen("sudo "+self._settings.get(["getTempScript"])+" "+str(self._settings.get(["dhtModel"])), shell=True, stdout=PIPE).stdout
-        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 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:
-            if self._settings.get(["heaterEnable"]) == True:
+        if self._settings.get(["temperatureReadingEnable"]):
+            if self._settings.get(["dhtModel"]) == 1820 or self._settings.get(["dhtModel"]) == '1820':
+                stdout = Popen("sudo "+self._settings.get(["getTempScript"])+" "+str(self._settings.get(["dhtModel"])), shell=True, stdout=PIPE).stdout
+            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:
+                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")
-        else:
-            self.enclosureCurrentTemperature = fTemp*1.8 + 32 if self._settings.get(["useFahrenheit"]) else fTemp
+            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 and self._settings.get(["heaterEnable"]) == True:
-            self._logger.info("DEBUG -> Reading humidity stdout: %s",stdout)
+            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:
+                self._logger.info("DEBUG -> Reading humidity stdout: %s",stdout)
             sHum.replace(" ", "")
             fHum = self.toFloat(sHum)
             if sHum.find("Failed") != -1 or fHum == 0:
-                if self._settings.get(["heaterEnable"]) == True:
-                    self._logger.info("Failed to read Humidity")
+                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))
-        self.heaterHandler()
+            self._plugin_manager.send_plugin_message(self._identifier, dict(enclosuretemp=self.enclosureCurrentTemperature,enclosureHumidity=self.enclosureCurrentHumidity))
+            self.heaterHandler()
 
     def heaterHandler(self):
-        self.currrentHeaterStatus = self.enclosureCurrentTemperature<float(self.enclosureSetTemperature)
-        if self.currentHeaterStatus != self.previousHeaterStatus:
-            if self.currentHeaterStatus and self.heater.enable:
-                self._logger.info("Turning heater on.")
-                self.heater.write(True)
-            else:
-                self._logger.info("Turning heater off.")
-                self.heater.write(False)
-        self.previousHeaterStatus = self.currentHeaterStatus
+        if self._settings.get(["heaterEnable"]):
+            self.currrentHeaterStatus = self.enclosureCurrentTemperature<float(self.enclosureSetTemperature)
+            if self.currentHeaterStatus != self.previousHeaterStatus:
+                if self.currentHeaterStatus and self.heater.enable:
+                    self._logger.info("Turning heater on.")
+                    self.heater.write(True)
+                else:
+                    self._logger.info("Turning heater off.")
+                    self.heater.write(False)
+            self.previousHeaterStatus = self.currentHeaterStatus
 
     def startFilamentDetection(self):
         if not GPIO.input(self.filamentSensor.pinNumber):
@@ -165,12 +164,14 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
 
     def handleFilamentDetection(self,channel):
         if self._printer.is_printing():
-            if  self._settings.get(["filamentSensorActiveLow"]) and (not GPIO.input(self.filamentSensor.pinNumber)):
+            #if  self._settings.get(["filamentSensorActiveLow"]) and (not GPIO.input(self.filamentSensor.pinNumber)):
+            if  self._settings.get(["filamentSensorActiveLow"]) ^ GPIO.input(self.filamentSensor.pinNumber):
                 self._logger.info("Detected end of filament.")
-                self._printer.toggle_pause_print()
-            elif (not self._settings.get(["filamentSensorActiveLow"])) and GPIO.input(self.filamentSensor.pinNumber):
-                self._logger.info("Detected end of filament.")
-                self._printer.toggle_pause_print()
+                for line in filamentSensorGcode.split(';'):
+                    if line:
+                        self._printer.commands(line.strip().capitalize())
+                        self._logger.info("Sending GCODE command: %s",line.strip().capitalize())
+
 
     def stopFilamentDetection(self):
         try:
@@ -232,13 +233,14 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
                 scheduler.enter(self.toFloat(self.io3.timeDelay), 1, self.io3.write, (True,))
             if self.io4.autoStartup and self.io4.enable:
                 scheduler.enter(self.toFloat(self.io4.timeDelay), 1, self.io4.write, (True,))
+            scheduler.run()
 
         elif event in (Events.PRINT_DONE, Events.PRINT_FAILED, Events.PRINT_CANCELLED):
             if self.filamentSensor.enable:
                 self.stopFilamentDetection()
 
             if  self.heater.enable:
-                    self.enclosureSetTemperature = 0
+                self.enclosureSetTemperature = 0
 
             if self.io1.autoShutDown and self.io1.enable:
                 scheduler.enter(self.toFloat(self.io1.timeDelay), 1, self.io1.write, (False,))
@@ -258,6 +260,7 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
     def get_settings_defaults(self):
         return dict(
             debug=False,
+            temperatureReadingEnable=False,
             heaterEnable=False,
             heaterPin=17,
             heaterActiveLow=True,
@@ -268,6 +271,7 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
             filamentSensorPin=24,
             filamentSensorEnable=True,
             filamentSensorActiveLow=True,
+            filamentSensorGcode="M600;",
             dhtModel=2302,
             io1Pin=18,
             io2Pin=23,
diff --git a/octoprint_enclosure/static/js/enclosure.js b/octoprint_enclosure/static/js/enclosure.js
index 29c7156..4cd7e8b 100644
--- a/octoprint_enclosure/static/js/enclosure.js
+++ b/octoprint_enclosure/static/js/enclosure.js
@@ -9,8 +9,8 @@ $(function() {
         self.enclosureSetTemperature = ko.observable();
         self.enclosureHumidity = ko.observable();
 
-        self.onBeforeBinding = function () {
-            
+        self.onStartupComplete = function () {
+          correctCheckBoxStatus();
         };
 
         self.onDataUpdaterPluginMessage = function(plugin, data) {
@@ -90,7 +90,7 @@ $(function() {
     }
 
     ADDITIONAL_VIEWMODELS.push([
-        EnclosureViewModel, 
+        EnclosureViewModel,
         ["settingsViewModel","connectionViewModel"],
         [document.getElementById("tab_plugin_enclosure")]
     ]);
@@ -100,3 +100,11 @@ function isNumeric(n) {
   return !isNaN(parseFloat(n)) && isFinite(n);
 }
 
+function correctCheckBoxStatus() {
+  if($('#enableTemperatureReading').is(':checked')){
+    $('#enableHeater').prop('disabled', false);
+  }else{
+    $('#enableHeater').prop('disabled', true);
+    $('#enableHeater').prop('checked', false);
+  }
+}
diff --git a/octoprint_enclosure/templates/enclosure_settings.jinja2 b/octoprint_enclosure/templates/enclosure_settings.jinja2
index 8b9b0b2..6a85c9e 100644
--- a/octoprint_enclosure/templates/enclosure_settings.jinja2
+++ b/octoprint_enclosure/templates/enclosure_settings.jinja2
@@ -1,29 +1,11 @@
-<h4>{{ _('Heater') }}</h4>
-<form class="form-horizontal">
-    <div class="control-group">
-        <div class="controls">
-            <label class="checkbox">
-                <input type="checkbox" data-bind="checked: settings.plugins.enclosure.heaterEnable">  {{ _('Enable Heater') }}
-            </label>
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label" for="settings-enclosure-heaterpin">{{ _('Heater Pin') }}</label>
-        <div class="controls">
-            <input type="text" class="input-block-level" data-bind="value: settings.plugins.enclosure.heaterPin">
-        </div>
-    </div>
-    <div class="controls">
-        <label class="checkbox">
-            <input type="checkbox" data-bind="checked: settings.plugins.enclosure.heaterActiveLow">  {{ _('Heater Active Low') }}
-        </label>
-    </div>
-</form>
-
-
 <form class="form-horizontal" id="enclosure_settings_temperature">
 <h4>{{ _('Temperature Sensor') }}</h4>
 Available options are: 11 for DHT11; 22 for DHT22; 2302 for AM2302; 1820 for DS18B20 1-wire temperature sensor
+    <div class="controls">
+      <label class="checkbox">
+          <input id="enableTemperatureReading" type="checkbox" onclick="correctCheckBoxStatus()" data-bind="checked: settings.plugins.enclosure.temperatureReadingEnable">  {{ _('Temperature Reading') }}
+      </label>
+    </div>
     <div class="control-group">
         <label class="control-label" for="settings-enclosure-dhtPin">{{ _('Sensor Pin') }}</label>
         <div class="controls">
@@ -55,6 +37,28 @@ Available options are: 11 for DHT11; 22 for DHT22; 2302 for AM2302; 1820 for DS1
     </div>
 </form>
 
+<h4>{{ _('Heater') }}</h4>
+<form class="form-horizontal">
+    <div class="control-group">
+        <div class="controls">
+            <label class="checkbox">
+                <input id="enableHeater" type="checkbox" data-bind="checked: settings.plugins.enclosure.heaterEnable">  {{ _('Enable Heater') }}
+            </label>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label" for="settings-enclosure-heaterpin">{{ _('Heater Pin') }}</label>
+        <div class="controls">
+            <input type="text" class="input-block-level" data-bind="value: settings.plugins.enclosure.heaterPin">
+        </div>
+    </div>
+    <div class="controls">
+        <label class="checkbox">
+            <input type="checkbox" data-bind="checked: settings.plugins.enclosure.heaterActiveLow">  {{ _('Heater Active Low') }}
+        </label>
+    </div>
+</form>
+
 <h4>{{ _('IO 1') }}</h4>
 <form class="form-horizontal">
     <div class="control-group">
@@ -236,6 +240,12 @@ Available options are: 11 for DHT11; 22 for DHT22; 2302 for AM2302; 1820 for DS1
             <input type="checkbox" data-bind="checked: settings.plugins.enclosure.filamentSensorActiveLow">  {{ _('Active Low') }}
         </label>
     </div>
+    <div class="control-group">
+      <label class="control-label" for="settings-enclosure-filament-sensor">{{ _('Filament Change Gcode') }}</label>
+      <div class="controls">
+         <textarea rows="4" class="block" data-bind="value: settings.plugins.enclosure.filamentSensorGcode"></textarea>
+      </div>
+    </div>
 </form>
 
 <h4>{{ _('Debug / Other') }}</h4>