-
Notifications
You must be signed in to change notification settings - Fork 178
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(api,hardware): add hepa/uv config/control commands to api. #14489
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -79,6 +79,8 @@ | |
HardwareEvent, | ||
HardwareEventHandler, | ||
HardwareAction, | ||
HepaFanState, | ||
HepaUVState, | ||
MotionChecks, | ||
SubSystem, | ||
PauseType, | ||
|
@@ -2685,3 +2687,21 @@ def estop_acknowledge_and_clear(self) -> EstopOverallStatus: | |
|
||
def get_estop_state(self) -> EstopState: | ||
return self._backend.get_estop_state() | ||
|
||
async def set_hepa_fan_state( | ||
self, turn_on: bool = False, duty_cycle: int = 75 | ||
) -> bool: | ||
"""Sets the state and duty cycle of the Hepa/UV module.""" | ||
return await self._backend.set_hepa_fan_state(turn_on, duty_cycle) | ||
|
||
async def get_hepa_fan_state(self) -> Optional[HepaFanState]: | ||
return await self._backend.get_hepa_fan_state() | ||
|
||
async def set_hepa_uv_state( | ||
self, turn_on: bool = False, timeout_s: int = 900 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we need this long of a timeout? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yeah 900s (15m) is the default uv light timeout There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can we call it like |
||
) -> bool: | ||
"""Sets the state and timeout in seconds of the Hepa/UV module.""" | ||
return await self._backend.set_hepa_uv_state(turn_on, timeout_s) | ||
|
||
async def get_hepa_uv_state(self) -> Optional[HepaUVState]: | ||
return await self._backend.get_hepa_uv_state() |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,149 @@ | ||
"""Utilities for controlling the hepa/uv extension module.""" | ||
import logging | ||
import asyncio | ||
from typing import Optional | ||
from dataclasses import dataclass | ||
from opentrons_hardware.drivers.can_bus.can_messenger import CanMessenger | ||
from opentrons_hardware.firmware_bindings.arbitration_id import ArbitrationId | ||
|
||
from opentrons_hardware.firmware_bindings.messages import payloads | ||
from opentrons_hardware.firmware_bindings.messages.messages import MessageDefinition | ||
from opentrons_hardware.firmware_bindings.messages.message_definitions import ( | ||
SetHepaFanStateRequest, | ||
GetHepaFanStateRequest, | ||
GetHepaFanStateResponse, | ||
SetHepaUVStateRequest, | ||
GetHepaUVStateRequest, | ||
GetHepaUVStateResponse, | ||
) | ||
from opentrons_hardware.firmware_bindings.utils import ( | ||
UInt8Field, | ||
UInt32Field, | ||
) | ||
from opentrons_hardware.firmware_bindings.constants import ( | ||
MessageId, | ||
NodeId, | ||
ErrorCode, | ||
) | ||
|
||
log = logging.getLogger(__name__) | ||
|
||
|
||
@dataclass(frozen=True) | ||
class HepaFanState: | ||
"""Hepa Fan Config.""" | ||
|
||
fan_on: bool | ||
duty_cycle: int | ||
|
||
|
||
@dataclass(frozen=True) | ||
class HepaUVState: | ||
"""Hepa UV Light Config.""" | ||
|
||
uv_light_on: bool | ||
timeout_s: int | ||
remaining_time_s: int | ||
|
||
|
||
async def set_hepa_fan_state( | ||
can_messenger: CanMessenger, | ||
fan_on: bool, | ||
duty_cycle: int, | ||
) -> bool: | ||
"""Set the Hepa fan state and duty cycle.""" | ||
error = await can_messenger.ensure_send( | ||
node_id=NodeId.hepa_uv, | ||
message=SetHepaFanStateRequest( | ||
payload=payloads.SetHepaFanStateRequestPayload( | ||
duty_cycle=UInt32Field(duty_cycle), fan_on=UInt8Field(fan_on) | ||
), | ||
), | ||
expected_nodes=[NodeId.hepa_uv], | ||
) | ||
if error != ErrorCode.ok: | ||
log.error(f"recieved error trying to set hepa fan state {str(error)}") | ||
return error == ErrorCode.ok | ||
|
||
|
||
async def get_hepa_fan_state(can_messenger: CanMessenger) -> Optional[HepaFanState]: | ||
"""Gets the state of the Hepa fan.""" | ||
fan_state: Optional[HepaFanState] = None | ||
|
||
event = asyncio.Event() | ||
|
||
def _listener(message: MessageDefinition, arb_id: ArbitrationId) -> None: | ||
nonlocal fan_state | ||
if isinstance(message, GetHepaFanStateResponse): | ||
event.set() | ||
fan_state = HepaFanState( | ||
fan_on=bool(message.payload.fan_on.value), | ||
duty_cycle=int(message.payload.duty_cycle.value), | ||
) | ||
|
||
def _filter(arb_id: ArbitrationId) -> bool: | ||
return (NodeId(arb_id.parts.originating_node_id) == NodeId.hepa_uv) and ( | ||
MessageId(arb_id.parts.message_id) == MessageId.get_hepa_fan_state_response | ||
) | ||
|
||
can_messenger.add_listener(_listener, _filter) | ||
await can_messenger.send(node_id=NodeId.hepa_uv, message=GetHepaFanStateRequest()) | ||
try: | ||
await asyncio.wait_for(event.wait(), 1.0) | ||
except asyncio.TimeoutError: | ||
log.warning("hepa fan state request timed out") | ||
finally: | ||
can_messenger.remove_listener(_listener) | ||
return fan_state | ||
|
||
|
||
async def set_hepa_uv_state( | ||
can_messenger: CanMessenger, | ||
uv_light_on: bool, | ||
timeout_s: int, | ||
) -> bool: | ||
"""Set the Hepa UV state and timeout in seconds.""" | ||
error = await can_messenger.ensure_send( | ||
node_id=NodeId.hepa_uv, | ||
message=SetHepaUVStateRequest( | ||
payload=payloads.SetHepaUVStateRequestPayload( | ||
timeout_s=UInt32Field(timeout_s), uv_light_on=UInt8Field(uv_light_on) | ||
), | ||
), | ||
expected_nodes=[NodeId.hepa_uv], | ||
) | ||
if error != ErrorCode.ok: | ||
log.error(f"recieved error trying to set hepa uv light state {str(error)}") | ||
return error == ErrorCode.ok | ||
|
||
|
||
async def get_hepa_uv_state(can_messenger: CanMessenger) -> Optional[HepaUVState]: | ||
"""Gets the state of the Hepa uv light.""" | ||
uv_state: Optional[HepaUVState] = None | ||
|
||
event = asyncio.Event() | ||
|
||
def _listener(message: MessageDefinition, arb_id: ArbitrationId) -> None: | ||
nonlocal uv_state | ||
if isinstance(message, GetHepaUVStateResponse): | ||
event.set() | ||
uv_state = HepaUVState( | ||
uv_light_on=bool(message.payload.uv_light_on.value), | ||
timeout_s=int(message.payload.timeout_s.value), | ||
remaining_time_s=int(message.payload.remaining_time_s.value), | ||
) | ||
|
||
def _filter(arb_id: ArbitrationId) -> bool: | ||
return (NodeId(arb_id.parts.originating_node_id) == NodeId.hepa_uv) and ( | ||
MessageId(arb_id.parts.message_id) == MessageId.get_hepa_uv_state_response | ||
) | ||
|
||
can_messenger.add_listener(_listener, _filter) | ||
await can_messenger.send(node_id=NodeId.hepa_uv, message=GetHepaUVStateRequest()) | ||
try: | ||
await asyncio.wait_for(event.wait(), 1.0) | ||
except asyncio.TimeoutError: | ||
log.warning("hepa uv light state request timed out") | ||
finally: | ||
can_messenger.remove_listener(_listener) | ||
return uv_state |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you not just returning res here because of linter complaining?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
its to separate opentrons_hardware dataclasses from opentrons.hardware_control ones.