Skip to content

Commit

Permalink
fixed watch dog notification while hold
Browse files Browse the repository at this point in the history
  • Loading branch information
alexkv committed Dec 25, 2019
1 parent 9372990 commit 3e826c6
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions octoprint_zbolt_octoscreen/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,20 @@
}
]"""


class ZBoltOctoScreenSettings(object):
def __init__(self, settings):
self._settings = settings
self.default_menu_structure = default_menu_structure

def get_all(self):
return {
"filament_in_length": float(self._settings.get(["filament_in_length"])),
"filament_out_length": float(self._settings.get(["filament_out_length"])),
"gcodes": self._settings.get(["gcodes"]),
"toolchanger": bool(self._settings.get(["toolchanger"])),
"z_axis_inverted": bool(self._settings.get(["z_axis_inverted"])),
"menu_structure": json.loads(self._settings.get(["menu_structure"]))
"menu_structure": json.loads(self._settings.get(["menu_structure"])),
}

@staticmethod
Expand All @@ -102,14 +103,11 @@ def default_settings():
filament_out_length=800,
toolchanger=False,
z_axis_inverted=True,
gcodes = dict(
auto_bed_level="G29"
),
menu_structure = default_menu_structure
gcodes=dict(auto_bed_level="G29"),
menu_structure=default_menu_structure,
)

@staticmethod
def template_vars():
return dict(
default_menu_structure = default_menu_structure
)
return dict(default_menu_structure=default_menu_structure)

0 comments on commit 3e826c6

Please sign in to comment.