From 085b5b53e8c38205d3f63c50803d24b051552170 Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 16:53:32 -0600 Subject: [PATCH 01/21] t1 --- octoprint_enclosure/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 9c3cc3e..6840c47 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -98,6 +98,11 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, self.updateOutputUI() return flask.make_response("Ok.", 200) + @octoprint.plugin.BlueprintPlugin.route("/getOutputStatus", methods=["GET"]) + def getOutputStatus(self): + return flask.jsonify(self.getOutputList()) + + @octoprint.plugin.BlueprintPlugin.route("/getEnclosureTemperature", methods=["GET"]) def getEnclosureTemperature(self): return str(self.enclosureCurrentTemperature) From d146ab70b20e27654ac58c7612d2810acf4e561e Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 16:58:01 -0600 Subject: [PATCH 02/21] t2 --- octoprint_enclosure/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 6840c47..cf1a172 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -100,7 +100,7 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, @octoprint.plugin.BlueprintPlugin.route("/getOutputStatus", methods=["GET"]) def getOutputStatus(self): - return flask.jsonify(self.getOutputList()) + return self.getOutputList() @octoprint.plugin.BlueprintPlugin.route("/getEnclosureTemperature", methods=["GET"]) From c66f48392c4897596d71bf655c5996223c47dd03 Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 16:59:03 -0600 Subject: [PATCH 03/21] t2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 059eac5..f74827c 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 = "3.51" +plugin_version = "3.52" # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin # module From 7907f7d1252bd00fb5532b42c66801644f6fb0d5 Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 17:02:42 -0600 Subject: [PATCH 04/21] t3 --- octoprint_enclosure/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index cf1a172..7823eb0 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -100,7 +100,11 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, @octoprint.plugin.BlueprintPlugin.route("/getOutputStatus", methods=["GET"]) def getOutputStatus(self): - return self.getOutputList() + return str(self.getOutputList()[0]) + + @octoprint.plugin.BlueprintPlugin.route("/getTest", methods=["GET"]) + def getTest(self): + return flask.jsonify(success=True) @octoprint.plugin.BlueprintPlugin.route("/getEnclosureTemperature", methods=["GET"]) From 81af7d34546691163e5520b75d4c18e000edb134 Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 17:18:16 -0600 Subject: [PATCH 05/21] t3 --- octoprint_enclosure/__init__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 7823eb0..7113101 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -100,7 +100,14 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, @octoprint.plugin.BlueprintPlugin.route("/getOutputStatus", methods=["GET"]) def getOutputStatus(self): - return str(self.getOutputList()[0]) + getOutputStatusresult = '' + for rpi_output in self.rpi_outputs: + pin = self.toInt(rpi_output['gpioPin']) + if rpi_output['outputType']=='regular': + val = GPIO.input(pin) if not rpi_output['activeLow'] else (not GPIO.input(pin)) + getOutputStatusresult += pin + ':' + val + ',' + return getOutputStatusresult + @octoprint.plugin.BlueprintPlugin.route("/getTest", methods=["GET"]) def getTest(self): From 7a7c5c4a7e6ca92cb15de4d0b4354690d33a1d98 Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 17:25:00 -0600 Subject: [PATCH 06/21] t3 --- octoprint_enclosure/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 7113101..cf4fdcb 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -100,12 +100,12 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, @octoprint.plugin.BlueprintPlugin.route("/getOutputStatus", methods=["GET"]) def getOutputStatus(self): - getOutputStatusresult = '' + getOutputStatusresult = "" for rpi_output in self.rpi_outputs: pin = self.toInt(rpi_output['gpioPin']) if rpi_output['outputType']=='regular': val = GPIO.input(pin) if not rpi_output['activeLow'] else (not GPIO.input(pin)) - getOutputStatusresult += pin + ':' + val + ',' + getOutputStatusresult = getOutputStatusresult pin + ":" + val + "," return getOutputStatusresult From 295fdcb89f5c87943f4f615cdc54fbf254734b59 Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 17:31:12 -0600 Subject: [PATCH 07/21] t4 --- octoprint_enclosure/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index cf4fdcb..531335b 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -100,12 +100,12 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, @octoprint.plugin.BlueprintPlugin.route("/getOutputStatus", methods=["GET"]) def getOutputStatus(self): - getOutputStatusresult = "" + getOutputStatusresult = '' for rpi_output in self.rpi_outputs: pin = self.toInt(rpi_output['gpioPin']) if rpi_output['outputType']=='regular': val = GPIO.input(pin) if not rpi_output['activeLow'] else (not GPIO.input(pin)) - getOutputStatusresult = getOutputStatusresult pin + ":" + val + "," + getOutputStatusresult = getOutputStatusresult + str(pin) + ':' + str(val) + ',' return getOutputStatusresult From 63152facd2335a5eadbf1688cd590b27c70b4a6a Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 17:42:30 -0600 Subject: [PATCH 08/21] t4 --- octoprint_enclosure/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 531335b..9250bb2 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -105,8 +105,9 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, pin = self.toInt(rpi_output['gpioPin']) if rpi_output['outputType']=='regular': val = GPIO.input(pin) if not rpi_output['activeLow'] else (not GPIO.input(pin)) - getOutputStatusresult = getOutputStatusresult + str(pin) + ':' + str(val) + ',' - return getOutputStatusresult + getOutputStatusresult = getOutputStatusresult + str(pin) + ':' + str(val) + ', ' + getOutputStatusresultDict[str(pin)] = str(val) + return flask.jsonify(getOutputStatusresultDict) @octoprint.plugin.BlueprintPlugin.route("/getTest", methods=["GET"]) From 1942e0965df05bfd52e75eda2dcf375dccfdc16c Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 17:50:56 -0600 Subject: [PATCH 09/21] t5 --- octoprint_enclosure/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 9250bb2..1edecd6 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -101,13 +101,14 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, @octoprint.plugin.BlueprintPlugin.route("/getOutputStatus", methods=["GET"]) def getOutputStatus(self): getOutputStatusresult = '' + getOutputStatusresultDict = {} for rpi_output in self.rpi_outputs: pin = self.toInt(rpi_output['gpioPin']) if rpi_output['outputType']=='regular': val = GPIO.input(pin) if not rpi_output['activeLow'] else (not GPIO.input(pin)) getOutputStatusresult = getOutputStatusresult + str(pin) + ':' + str(val) + ', ' getOutputStatusresultDict[str(pin)] = str(val) - return flask.jsonify(getOutputStatusresultDict) + return flask.jsonify(getOutputStatusresult) @octoprint.plugin.BlueprintPlugin.route("/getTest", methods=["GET"]) From a611bdea38f22890c80c39d3b5a84679cfa697fc Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 17:55:30 -0600 Subject: [PATCH 10/21] t6 --- octoprint_enclosure/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 1edecd6..1092103 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -101,14 +101,16 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, @octoprint.plugin.BlueprintPlugin.route("/getOutputStatus", methods=["GET"]) def getOutputStatus(self): getOutputStatusresult = '' - getOutputStatusresultDict = {} + for rpi_output in self.rpi_outputs: pin = self.toInt(rpi_output['gpioPin']) if rpi_output['outputType']=='regular': val = GPIO.input(pin) if not rpi_output['activeLow'] else (not GPIO.input(pin)) - getOutputStatusresult = getOutputStatusresult + str(pin) + ':' + str(val) + ', ' - getOutputStatusresultDict[str(pin)] = str(val) - return flask.jsonify(getOutputStatusresult) + if (getOutputStatusresult != '') + getOutputStatusresult = getOutputStatusresult + ', ' + getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '":"' + str(val) + '"' + + return '{' + getOutputStatusresult + '}' @octoprint.plugin.BlueprintPlugin.route("/getTest", methods=["GET"]) From 651b49306b502f940772241ffa5929234615683b Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 18:12:31 -0600 Subject: [PATCH 11/21] t7 --- octoprint_enclosure/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 1092103..96a666e 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -106,8 +106,8 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, pin = self.toInt(rpi_output['gpioPin']) if rpi_output['outputType']=='regular': val = GPIO.input(pin) if not rpi_output['activeLow'] else (not GPIO.input(pin)) - if (getOutputStatusresult != '') - getOutputStatusresult = getOutputStatusresult + ', ' + # if (getOutputStatusresult != '') + # getOutputStatusresult = getOutputStatusresult + ', ' getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '":"' + str(val) + '"' return '{' + getOutputStatusresult + '}' From 6b62213b3c0d5300a4c796f524d4a668d0656256 Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 18:18:42 -0600 Subject: [PATCH 12/21] t8 --- octoprint_enclosure/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 96a666e..270130e 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -106,9 +106,9 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, pin = self.toInt(rpi_output['gpioPin']) if rpi_output['outputType']=='regular': val = GPIO.input(pin) if not rpi_output['activeLow'] else (not GPIO.input(pin)) - # if (getOutputStatusresult != '') - # getOutputStatusresult = getOutputStatusresult + ', ' - getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '":"' + str(val) + '"' + if (len(getOutputStatusresult) > 0) + getOutputStatusresult = getOutputStatusresult + ', ' + getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '":' + str(val) return '{' + getOutputStatusresult + '}' From 27007821fb5bb3c39c11fe21f6dcc0d258ab6aec Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 18:24:34 -0600 Subject: [PATCH 13/21] t9 --- octoprint_enclosure/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 270130e..ae6ecf3 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -106,7 +106,7 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, pin = self.toInt(rpi_output['gpioPin']) if rpi_output['outputType']=='regular': val = GPIO.input(pin) if not rpi_output['activeLow'] else (not GPIO.input(pin)) - if (len(getOutputStatusresult) > 0) + if (not getOutputStatusresult) getOutputStatusresult = getOutputStatusresult + ', ' getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '":' + str(val) From d600904b8340c1e6d397685994115cf58b6dc2af Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 18:32:23 -0600 Subject: [PATCH 14/21] t9 --- octoprint_enclosure/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index ae6ecf3..cb74da3 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -106,10 +106,9 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, pin = self.toInt(rpi_output['gpioPin']) if rpi_output['outputType']=='regular': val = GPIO.input(pin) if not rpi_output['activeLow'] else (not GPIO.input(pin)) - if (not getOutputStatusresult) - getOutputStatusresult = getOutputStatusresult + ', ' - getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '":' + str(val) - + if not getOutputStatusresult: + getOutputStatusresult = getOutputStatusresult + ', ' + getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '":' + str(val) return '{' + getOutputStatusresult + '}' From cd4e553b01c918f6e85daadd85481e09a5b19c9a Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 18:34:59 -0600 Subject: [PATCH 15/21] t9 --- octoprint_enclosure/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index cb74da3..05ad98d 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -101,15 +101,14 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, @octoprint.plugin.BlueprintPlugin.route("/getOutputStatus", methods=["GET"]) def getOutputStatus(self): getOutputStatusresult = '' - for rpi_output in self.rpi_outputs: pin = self.toInt(rpi_output['gpioPin']) if rpi_output['outputType']=='regular': val = GPIO.input(pin) if not rpi_output['activeLow'] else (not GPIO.input(pin)) - if not getOutputStatusresult: + if getOutputStatusresult: getOutputStatusresult = getOutputStatusresult + ', ' getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '":' + str(val) - return '{' + getOutputStatusresult + '}' + return flask.jsonify('{' + getOutputStatusresult + '}') @octoprint.plugin.BlueprintPlugin.route("/getTest", methods=["GET"]) From 5b36f68ffdc72d8702380fea83c4cfd32c276111 Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 18:37:10 -0600 Subject: [PATCH 16/21] t9 --- octoprint_enclosure/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 05ad98d..9b5a0ef 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -107,8 +107,8 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, val = GPIO.input(pin) if not rpi_output['activeLow'] else (not GPIO.input(pin)) if getOutputStatusresult: getOutputStatusresult = getOutputStatusresult + ', ' - getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '":' + str(val) - return flask.jsonify('{' + getOutputStatusresult + '}') + getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '": ' + str(val) + return '{' + getOutputStatusresult + '}' @octoprint.plugin.BlueprintPlugin.route("/getTest", methods=["GET"]) From 56cdb302fe573fddb2c1418199682f3a85cd8d57 Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 18:40:38 -0600 Subject: [PATCH 17/21] t9 --- octoprint_enclosure/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 9b5a0ef..0759768 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -107,7 +107,7 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, val = GPIO.input(pin) if not rpi_output['activeLow'] else (not GPIO.input(pin)) if getOutputStatusresult: getOutputStatusresult = getOutputStatusresult + ', ' - getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '": ' + str(val) + getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '": ' + str(val).lower() return '{' + getOutputStatusresult + '}' From 970c234d0831348e0fb36e86d796c1c30f751951 Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 18:44:32 -0600 Subject: [PATCH 18/21] Added rest method getOutputStatus --- octoprint_enclosure/__init__.py | 8 +------- setup.py | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 0759768..5d60bba 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -108,13 +108,7 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, if getOutputStatusresult: getOutputStatusresult = getOutputStatusresult + ', ' getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '": ' + str(val).lower() - return '{' + getOutputStatusresult + '}' - - - @octoprint.plugin.BlueprintPlugin.route("/getTest", methods=["GET"]) - def getTest(self): - return flask.jsonify(success=True) - + return flask.jsonify('{' + getOutputStatusresult + '}') @octoprint.plugin.BlueprintPlugin.route("/getEnclosureTemperature", methods=["GET"]) def getEnclosureTemperature(self): diff --git a/setup.py b/setup.py index f74827c..059eac5 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 = "3.52" +plugin_version = "3.51" # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin # module From 7ab6d0a27073620427009a6da0f3a2a7181ae92b Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 18:50:55 -0600 Subject: [PATCH 19/21] t1 --- octoprint_enclosure/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 5d60bba..e239dc3 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -101,6 +101,7 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, @octoprint.plugin.BlueprintPlugin.route("/getOutputStatus", methods=["GET"]) def getOutputStatus(self): getOutputStatusresult = '' + getOutputStatusresult2 = {} for rpi_output in self.rpi_outputs: pin = self.toInt(rpi_output['gpioPin']) if rpi_output['outputType']=='regular': @@ -108,7 +109,10 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, if getOutputStatusresult: getOutputStatusresult = getOutputStatusresult + ', ' getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '": ' + str(val).lower() - return flask.jsonify('{' + getOutputStatusresult + '}') + + getOutputStatusresult2[str(pin)] = str(val).lower() + #return flask.jsonify('{' + getOutputStatusresult + '}') + return flask.jsonify({count: len(getOutputStatusresult2), results: getOutputStatusresult2}) @octoprint.plugin.BlueprintPlugin.route("/getEnclosureTemperature", methods=["GET"]) def getEnclosureTemperature(self): From 0aff1d65ce9b88c1ace892108727749c48829edb Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 18:55:05 -0600 Subject: [PATCH 20/21] t9 --- octoprint_enclosure/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index e239dc3..97837cd 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -101,7 +101,7 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, @octoprint.plugin.BlueprintPlugin.route("/getOutputStatus", methods=["GET"]) def getOutputStatus(self): getOutputStatusresult = '' - getOutputStatusresult2 = {} + getOutputStatusresult2 = [] for rpi_output in self.rpi_outputs: pin = self.toInt(rpi_output['gpioPin']) if rpi_output['outputType']=='regular': @@ -112,7 +112,7 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, getOutputStatusresult2[str(pin)] = str(val).lower() #return flask.jsonify('{' + getOutputStatusresult + '}') - return flask.jsonify({count: len(getOutputStatusresult2), results: getOutputStatusresult2}) + return flask.jsonify({results: getOutputStatusresult2}) @octoprint.plugin.BlueprintPlugin.route("/getEnclosureTemperature", methods=["GET"]) def getEnclosureTemperature(self): From 20a7f62e8d2f970efef5795a2e2797cc9a66cc17 Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 19:01:04 -0600 Subject: [PATCH 21/21] t9 --- octoprint_enclosure/__init__.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index 97837cd..a73cd0c 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -101,7 +101,6 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, @octoprint.plugin.BlueprintPlugin.route("/getOutputStatus", methods=["GET"]) def getOutputStatus(self): getOutputStatusresult = '' - getOutputStatusresult2 = [] for rpi_output in self.rpi_outputs: pin = self.toInt(rpi_output['gpioPin']) if rpi_output['outputType']=='regular': @@ -109,10 +108,8 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, if getOutputStatusresult: getOutputStatusresult = getOutputStatusresult + ', ' getOutputStatusresult = getOutputStatusresult + '"' + str(pin) + '": ' + str(val).lower() - - getOutputStatusresult2[str(pin)] = str(val).lower() - #return flask.jsonify('{' + getOutputStatusresult + '}') - return flask.jsonify({results: getOutputStatusresult2}) + return '{' + getOutputStatusresult + '}' + @octoprint.plugin.BlueprintPlugin.route("/getEnclosureTemperature", methods=["GET"]) def getEnclosureTemperature(self):