From ef3a107ff9411069422ff130e5dcbb5f19df3f4b Mon Sep 17 00:00:00 2001 From: Shawn Bruce Date: Sat, 3 Apr 2021 16:37:43 -0400 Subject: [PATCH] Minor adjustments --- octoprint_psucontrol/__init__.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/octoprint_psucontrol/__init__.py b/octoprint_psucontrol/__init__.py index 74077e1..fbf3924 100644 --- a/octoprint_psucontrol/__init__.py +++ b/octoprint_psucontrol/__init__.py @@ -385,8 +385,9 @@ def _check_psu_state(self): if (old_isPSUOn != self.isPSUOn): self._logger.debug("PSU state changed, firing psu_state_changed event.") + event = Events.PLUGIN_PSUCONTROL_PSU_STATE_CHANGED - self._event_bus.fire(event, payload=dict(psu_state=self.isPSUOn)) + self._event_bus.fire(event, payload=dict(isPSUOn=self.isPSUOn)) if (old_isPSUOn != self.isPSUOn) and self.isPSUOn: self._start_idle_timer() @@ -613,6 +614,10 @@ def turn_psu_off(self): time.sleep(0.1) self.check_psu_state() + + def get_psu_state(self): + return self.isPSUOn + def on_event(self, event, payload): if event == Events.CLIENT_OPENED: self._plugin_manager.send_plugin_message(self._identifier, dict(hasGPIO=self._hasGPIO, isPSUOn=self.isPSUOn)) @@ -814,9 +819,6 @@ def get_update_information(self): ) ) - def get_psu_state(self): - return self.isPSUOn - def register_custom_events(self): return ["psu_state_changed"] @@ -839,4 +841,4 @@ def __plugin_load__(): get_psu_state = __plugin_implementation__.get_psu_state, turn_psu_on = __plugin_implementation__.turn_psu_on, turn_psu_off = __plugin_implementation__.turn_psu_off - ) \ No newline at end of file + )