ManuelW/OctoPrint-Estop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

delete onEventDisconnected unregister it

Browse Source 
delete it, remove it, make it gone. I dunno what's right anymore
This commit is contained in:
ntoff 2018-03-10 04:35:55 +10:00
parent a236450cb5
commit c8ae6e7dde
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
octoprint_estop/static/js/estop.js
View File

@ -54,21 +54,11 @@ $(function() {
self.updateSettingsValues(); self.updateSettingsValues();
} }
self.updateSettingsValues = function () { //lazy way of making sure we have the latest version of the settings self.updateSettingsValues = function () {
self.estopCommand(self.settings.settings.plugins.estop.estopCommand()); self.estopCommand(self.settings.settings.plugins.estop.estopCommand());
self.estopReconnect(self.settings.settings.plugins.estop.estopReconnect()); self.estopReconnect(self.settings.settings.plugins.estop.estopReconnect());
} }
self.onEventDisconnected = function () {
if (self.estopReconnect() && self.emergencyCalled()) {
self.timedReconnect = setTimeout(function() { //reconnect 3 seconds after detecting the printer is offline
self.emergencyCalled(false);
OctoPrint.connection.connect();
}, 3*1000); //3 seconds
}
}
self.sendEstopCommand = function () { self.sendEstopCommand = function () {
if (self.enableEstop()) { if (self.enableEstop()) {
self.estopCommand(self.settings.settings.plugins.estop.estopCommand()); self.estopCommand(self.settings.settings.plugins.estop.estopCommand());
@ -76,7 +66,15 @@ $(function() {
if (self.estopReconnect()) { if (self.estopReconnect()) {
self.emergencyCalled(true); self.emergencyCalled(true);
OctoPrint.connection.disconnect(); //normally octoprint would probably disconnect anyway, just calling this here in case the printer is in a blocking loop OctoPrint.connection.disconnect();
self.onEventDisconnected = function () {
self.timedReconnect = setTimeout(function() {
self.emergencyCalled(false);
delete self.onEventDisconnected;
OctoPrint.connection.connect();
}, 3*1000); //3 seconds
}
} }
} }
} }