Merge pull request #1 from jneilliii/dev

Merge dev
jneilliii · Sep 3, 2017 · 997ce74 · 997ce74
2 parents ee6e2f6 + eeb1757
commit 997ce74
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/octoprint_tplinksmartplug/__init__.py b/octoprint_tplinksmartplug/__init__.py
@@ -132,7 +132,8 @@ def sendCommand(self, cmd):
 			self._logger.info("Sending command %s" % cmd)
 			return json.loads(self.decrypt(data[4:]))
 		except socket.error:
-			self._logger.info("Error sending command")
+			self._logger.info("Could not connect to ip %s." % self._settings.get(["ip"]))
+			return {"system":{"get_sysinfo":{"relay_state":3}}}
 
 	##~~ Softwareupdate hook
 

diff --git a/octoprint_tplinksmartplug/static/css/tplinksmartplug.css b/octoprint_tplinksmartplug/static/css/tplinksmartplug.css
diff --git a/octoprint_tplinksmartplug/static/js/tplinksmartplug.js b/octoprint_tplinksmartplug/static/js/tplinksmartplug.js
@@ -36,6 +36,7 @@ $(function() {
 			self.connectOnPowerOn(self.settings.settings.plugins.tplinksmartplug.connectOnPowerOn());
 			self.connectOnPowerOnDelay(self.settings.settings.plugins.tplinksmartplug.connectOnPowerOnDelay());
 			self.enablePowerOffWarningDialog(self.settings.settings.plugins.tplinksmartplug.enablePowerOffWarningDialog());
+			self.checkStatus();
 		}
 
 		self.onDataUpdaterPluginMessage = function(plugin, data) {