Skip to content

Commit 05954c5

Browse files
authored
0.8.12 (#71)
* fix wording of Automatic Power Off within the plug editor * set minimum polling interval to 1 * don't try to poll unless polling interval is greater than 0
1 parent 09a2327 commit 05954c5

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

.github/stale.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ daysUntilClose: 7
66
exemptLabels:
77
- enhancement
88
- bug
9+
- solved
910
# Label to use when marking an issue as stale
1011
staleLabel: stale
1112
# Comment to post when marking an issue as stale. Set to `false` to disable

octoprint_tasmota/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ def on_startup(self, host, port):
7373

7474
def on_after_startup(self):
7575
self._logger.info("Tasmota loaded!")
76-
if self._settings.get(["polling_enabled"]):
77-
self.poll_status = RepeatedTimer(int(self._settings.get(["polling_interval"]))*60, self.check_statuses)
76+
if self._settings.get_boolean(["polling_enabled"]) and self._settings.get_int(["polling_interval"]) > 0:
77+
self.poll_status = RepeatedTimer(int(self._settings.get_int(["polling_interval"]))*60, self.check_statuses)
7878
self.poll_status.start()
7979

8080
##~~ SettingsPlugin mixin
@@ -83,7 +83,7 @@ def get_settings_defaults(self):
8383
return dict(
8484
debug_logging = False,
8585
polling_enabled = False,
86-
polling_interval = 0,
86+
polling_interval = 5,
8787
thermal_runaway_monitoring = False,
8888
thermal_runaway_max_bed = 120,
8989
thermal_runaway_max_extruder = 300,
@@ -95,7 +95,7 @@ def get_settings_defaults(self):
9595
def on_settings_save(self, data):
9696
old_debug_logging = self._settings.get_boolean(["debug_logging"])
9797
old_polling_value = self._settings.get_boolean(["polling_enabled"])
98-
old_polling_timer = self._settings.get(["polling_interval"])
98+
old_polling_timer = self._settings.get_int(["polling_interval"])
9999
old_automatic_power_off = self._settings.get_boolean(["automatic_power_off"])
100100

101101
octoprint.plugin.SettingsPlugin.on_settings_save(self, data)
@@ -108,7 +108,7 @@ def on_settings_save(self, data):
108108

109109
new_debug_logging = self._settings.get_boolean(["debug_logging"])
110110
new_polling_value = self._settings.get_boolean(["polling_enabled"])
111-
new_polling_timer = self._settings.get(["polling_interval"])
111+
new_polling_timer = self._settings.get_int(["polling_interval"])
112112

113113
if old_debug_logging != new_debug_logging:
114114
if new_debug_logging:
@@ -120,7 +120,7 @@ def on_settings_save(self, data):
120120
if self.poll_status:
121121
self.poll_status.cancel()
122122

123-
if new_polling_value:
123+
if new_polling_value and new_polling_timer > 0:
124124
self.poll_status = RepeatedTimer(int(self._settings.get(["polling_interval"]))*60, self.check_statuses)
125125
self.poll_status.start()
126126

octoprint_tasmota/templates/tasmota_settings.jinja2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<div class="control-group" data-bind="visible: settings.settings.plugins.tasmota.polling_enabled">
8585
<div class="controls">
8686
<label class="control-label">{{ _('Minutes between checks') }}</label>
87-
<input type="number" min="0" class="input input-small" data-bind="value: settings.settings.plugins.tasmota.polling_interval" />
87+
<input type="number" min="1" class="input input-small" data-bind="value: settings.settings.plugins.tasmota.polling_interval" />
8888
</div>
8989
</div>
9090

@@ -126,7 +126,7 @@
126126
<span class="add-on" data-bind="visible: autoDisconnect">secs</span>
127127
</div>
128128
</td>
129-
<td><div class="controls"><label class="checkbox"><input type="checkbox" data-bind="checked: automaticShutdownEnabled" title="Automatically power off on print completion." /> Print Complete Off</label></div></td>
129+
<td><div class="controls"><label class="checkbox"><input type="checkbox" data-bind="checked: automaticShutdownEnabled" title="Automatically power off when printer is idle." /> Automatic Power Off</label></div></td>
130130
<td><div class="controls"><label class="checkbox"><input type="checkbox" data-bind="checked: displayWarning" title="Prompt for confirmation before powering off via the navbar button." /> Warning Prompt</label></div></td>
131131
<td><div class="controls"><label class="checkbox"><input type="checkbox" data-bind="checked: warnPrinting" title="Prompt for confimration before powering off when a print is active." /> Warn While Printing</label></div></td>
132132
<td><div class="controls"><label class="checkbox"><input type="checkbox" data-bind="checked: thermal_runaway" title="Power off if temperature exceeds configured max temperatures." /> Thermal Runaway</label></div></td>

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
plugin_name = "OctoPrint-Tasmota"
1515

1616
# The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
17-
plugin_version = "0.8.11"
17+
plugin_version = "0.8.12"
1818

1919
# The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
2020
# module

0 commit comments

Comments
 (0)