From 97f74087a41fbca5127b8b84ab16bd4f87bda99d Mon Sep 17 00:00:00 2001
From: Vitor de Miranda Henrique <vitormhenrique@gmail.com>
Date: Mon, 18 Jun 2018 14:42:30 -0500
Subject: [PATCH] add shell controll output

---
 octoprint_enclosure/__init__.py | 58 ++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py
index 22685f4..ac9ddc2 100644
--- a/octoprint_enclosure/__init__.py
+++ b/octoprint_enclosure/__init__.py
@@ -1062,33 +1062,37 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
             if self._settings.get(["debug"]) is True:
                 self._logger.info(
                     "GPIO event triggered on channel %s", channel)
-            for rpi_input in [r_inp for r_inp in self.rpi_inputs if self.to_int(r_inp['gpio_pin']) == self.to_int(channel)]:
-                gpio_pin = self.to_int(rpi_input['gpio_pin'])
-                controlled_io = self.to_int(rpi_input['controlled_io'])
-                if (rpi_input['edge'] == 'fall') ^ GPIO.input(gpio_pin):
-                    rpi_output = [r_out for r_out in self.rpi_outputs if self.to_int(
-                        r_out['index_id']) == controlled_io].pop()
-                    if rpi_output['output_type'] == 'regular':
-                        if rpi_input['controlled_io_set_value'] == 'toggle':
-                            val = GPIO.LOW if GPIO.input(self.to_int(
-                                rpi_output['gpio_pin'])) == GPIO.HIGH else GPIO.HIGH
-                        else:
-                            val = GPIO.LOW if rpi_input['controlled_io_set_value'] == 'low' else GPIO.HIGH
-                        self.write_gpio(self.to_int(
-                            rpi_output['gpio_pin']), val)
-                        for notification in self.notifications:
-                            if notification['gpioAction']:
-                                msg = "GPIO control action caused by input " + str(rpi_input['label']) + ". Setting GPIO" + str(
-                                    rpi_input['controlled_io']) + " to: " + str(rpi_input['controlled_io_set_value'])
-                                self.send_notification(msg)
-                    if rpi_output['output_type'] == 'gcode_output':
-                        self.send_gcode_command(rpi_output['gcode'])
-                        for notification in self.notifications:
-                            if notification['gpioAction']:
-                                msg = "GPIO control action caused by input " + \
-                                    str(rpi_input['label']) + \
-                                    ". Sending GCODE command"
-                                self.send_notification(msg)
+            rpi_input = [r_inp for r_inp in self.rpi_inputs if self.to_int(
+                r_inp['gpio_pin']) == self.to_int(channel)].pop()
+            gpio_pin = self.to_int(rpi_input['gpio_pin'])
+            controlled_io = self.to_int(rpi_input['controlled_io'])
+            if (rpi_input['edge'] == 'fall') ^ GPIO.input(gpio_pin):
+                rpi_output = [r_out for r_out in self.rpi_outputs if self.to_int(
+                    r_out['index_id']) == controlled_io].pop()
+                if rpi_output['output_type'] == 'regular':
+                    if rpi_input['controlled_io_set_value'] == 'toggle':
+                        val = GPIO.LOW if GPIO.input(self.to_int(
+                            rpi_output['gpio_pin'])) == GPIO.HIGH else GPIO.HIGH
+                    else:
+                        val = GPIO.LOW if rpi_input['controlled_io_set_value'] == 'low' else GPIO.HIGH
+                    self.write_gpio(self.to_int(
+                        rpi_output['gpio_pin']), val)
+                    for notification in self.notifications:
+                        if notification['gpioAction']:
+                            msg = "GPIO control action caused by input " + str(rpi_input['label']) + ". Setting GPIO" + str(
+                                rpi_input['controlled_io']) + " to: " + str(rpi_input['controlled_io_set_value'])
+                            self.send_notification(msg)
+                if rpi_output['output_type'] == 'gcode_output':
+                    self.send_gcode_command(rpi_output['gcode'])
+                    for notification in self.notifications:
+                        if notification['gpioAction']:
+                            msg = "GPIO control action caused by input " + \
+                                str(rpi_input['label']) + \
+                                ". Sending GCODE command"
+                            self.send_notification(msg)
+                if rpi_output['output_type'] == 'shell_output':
+                    command = rpi_output['shell_script']
+                    self.shell_command(command)
         except Exception as ex:
             self.log_error(ex)
             pass