3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

power: remove state check when performing job queue requests 

Allow the device to refresh the state in the event that its stale.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2024-04-28 11:49:27 -04:00
parent 1ab413e9bc
commit 5570ab02ee
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moonraker/components/power.py
View File

@ -347,7 +347,7 @@ class PowerDevice:
power.set_device_power(self.name, "off") power.set_device_power(self.name, "off")
def should_turn_on_when_queued(self) -> bool: def should_turn_on_when_queued(self) -> bool:
return self.on_when_queued and self.state == "off" return self.on_when_queued
def _setup_bound_services(self) -> None: def _setup_bound_services(self) -> None:
if not self.bound_services: if not self.bound_services:
@ -679,6 +679,7 @@ class KlipperDevice(PowerDevice):
kapis: APIComp = self.server.lookup_component('klippy_apis') kapis: APIComp = self.server.lookup_component('klippy_apis')
value = "1" if state == "on" else "0" value = "1" if state == "on" else "0"
await kapis.run_gcode(f"{self.gc_cmd} VALUE={value}") await kapis.run_gcode(f"{self.gc_cmd} VALUE={value}")
assert self.update_fut is not None
await asyncio.wait_for(self.update_fut, 1.) await asyncio.wait_for(self.update_fut, 1.)
except TimeoutError: except TimeoutError:
self.state = "error" self.state = "error"
@ -1273,6 +1274,7 @@ class MQTTDevice(PowerDevice):
while self.mqtt.is_connected(): while self.mqtt.is_connected():
self.query_response = self.eventloop.create_future() self.query_response = self.eventloop.create_future()
try: try:
assert self.query_response is not None
await self._wait_for_update(self.query_response) await self._wait_for_update(self.query_response)
except asyncio.TimeoutError: except asyncio.TimeoutError:
# Only wait once if no query topic is set. # Only wait once if no query topic is set.
@ -1335,6 +1337,7 @@ class MQTTDevice(PowerDevice):
"MQTT Not Connected", 503) "MQTT Not Connected", 503)
self.query_response = self.eventloop.create_future() self.query_response = self.eventloop.create_future()
try: try:
assert self.query_response is not None
await self._wait_for_update(self.query_response) await self._wait_for_update(self.query_response)
except Exception: except Exception:
logging.exception(f"MQTT Power Device {self.name}: " logging.exception(f"MQTT Power Device {self.name}: "
@ -1361,6 +1364,7 @@ class MQTTDevice(PowerDevice):
self.query_response = self.eventloop.create_future() self.query_response = self.eventloop.create_future()
new_state = "error" new_state = "error"
try: try:
assert self.query_response is not None
payload = self.cmd_payload.render({'command': state}) payload = self.cmd_payload.render({'command': state})
await self.mqtt.publish_topic( await self.mqtt.publish_topic(
self.cmd_topic, payload, self.qos, self.cmd_topic, payload, self.qos,