Skip to content

Commit f9ab913

Browse files
authored
1.1.4 (#207)
* update to plotly.js v2.8.3 * add heaters to ignore for idle timeout processing, #202 * fix ignored heaters split logic, #206
1 parent bdd4db6 commit f9ab913

File tree

4 files changed

+75
-7
lines changed

4 files changed

+75
-7
lines changed

octoprint_tasmota/__init__.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ def get_settings_defaults(self):
171171
"powerOffWhenIdle": False,
172172
"idleTimeout": 30,
173173
"idleIgnoreCommands": 'M105',
174+
"idleIgnoreHeaters": '',
174175
"idleTimeoutWaitTemp": 50,
175176
"idleWaitForTimelapse": True,
176177
"event_on_upload_monitoring": False,
@@ -980,11 +981,12 @@ def _wait_for_timelapse(self):
980981
def _wait_for_heaters(self):
981982
self._waitForHeaters = True
982983
heaters = self._printer.get_current_temperatures()
984+
ignored_heaters = [heater.strip() for heater in self._settings.get(["idleIgnoreHeaters"]).split(',')]
983985

984986
for heater, entry in heaters.items():
985987
target = entry.get("target")
986-
if target is None:
987-
# heater doesn't exist in fw
988+
if target is None or heater in ignored_heaters:
989+
# heater doesn't exist in fw or set to be ignored
988990
continue
989991

990992
try:
@@ -1010,7 +1012,7 @@ def _wait_for_heaters(self):
10101012
highest_temp = 0
10111013
heaters_above_waittemp = []
10121014
for heater, entry in heaters.items():
1013-
if not heater.startswith("tool"):
1015+
if not heater.startswith("tool") or heater in ignored_heaters:
10141016
continue
10151017

10161018
actual = entry.get("actual")

octoprint_tasmota/static/js/plotly-latest.min.js

Lines changed: 61 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

octoprint_tasmota/templates/tasmota_settings.jinja2

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,14 @@
207207
</div>
208208
</div>
209209
</div>
210+
<div class="row-fluid" data-bind="visible: settings.settings.plugins.tasmota.powerOffWhenIdle()">
211+
<div class="control-group">
212+
<label class="control-label">{{ _('Heaters to Ignore for Idle') }}</label>
213+
<div class="controls" data-toggle="tooltip" data-bind="tooltip: {}" title="{{ _('Comma separated list of heaters to ignore for idle temperature. ie, for Prusa MK4 include X.') }}">
214+
<input type="text" class="input-block-level" data-bind="value: settings.settings.plugins.tasmota.idleIgnoreHeaters, enable: settings.settings.plugins.tasmota.powerOffWhenIdle()" disabled />
215+
</div>
216+
</div>
217+
</div>
210218
<div class="row-fluid" data-bind="visible: settings.settings.plugins.tasmota.powerOffWhenIdle()">
211219
<div class="control-group">
212220
<div class="controls">

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 = "1.1.3"
17+
plugin_version = "1.1.4"
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)