Skip to content

Commit

Permalink
moved blocks to new parent class in the PandA
Browse files Browse the repository at this point in the history
  • Loading branch information
evalott100 committed Mar 26, 2024
1 parent 64a5dba commit 6e98217
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/ophyd_async/panda/panda.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,15 @@ def _remove_inconsistent_blocks(pvi_info: Optional[Dict[str, PVIEntry]]) -> None
del pvi_info[k]


class PandA(Device):
class CommonPandABlocks(Device):
pulse: DeviceVector[PulseBlock]
seq: DeviceVector[SeqBlock]
pcap: PcapBlock


class PandA(CommonPandABlocks, Device):
def __init__(self, prefix: str, name: str = "") -> None:
super().__init__(name)
Device.__init__(self, name)
self._prefix = prefix

def verify_block(self, name: str, num: Optional[int]):
Expand Down Expand Up @@ -238,4 +240,4 @@ async def connect(
self.set_attribute(block_name, num, block)

self.set_name(self.name)
await super().connect(sim)
await Device.connect(self, sim)

0 comments on commit 6e98217

Please sign in to comment.