From a611bdea38f22890c80c39d3b5a84679cfa697fc Mon Sep 17 00:00:00 2001 From: brbjr1 Date: Mon, 4 Dec 2017 17:55:30 -0600 Subject: [PATCH] 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"])