|
7 | 7 | from dataclasses import dataclass |
8 | 8 | from numpy import dtype |
9 | 9 | from pandas import DataFrame, Series |
10 | | -from typing import Any, BinaryIO, Callable, Iterable, Optional, Protocol, Union |
| 10 | +from typing import Any, BinaryIO, Callable, Iterable, Mapping, Optional, Protocol, Union |
| 11 | +from collections import UserDict |
11 | 12 | from pandas._typing import Axes |
12 | 13 | from harp.model import BitMask, GroupMask, Model, PayloadMember, Register |
13 | 14 | from harp.io import MessageType, read |
@@ -44,13 +45,29 @@ def __init__( |
44 | 45 | self.read = read |
45 | 46 |
|
46 | 47 |
|
| 48 | +class RegisterMap(UserDict[str, RegisterReader]): |
| 49 | + _address_map: Mapping[int, RegisterReader] |
| 50 | + |
| 51 | + def __init__(self, registers: Mapping[str, RegisterReader]) -> None: |
| 52 | + super().__init__(registers) |
| 53 | + self._address_map = { |
| 54 | + value.register.address: value for value in registers.values() |
| 55 | + } |
| 56 | + |
| 57 | + def __getitem__(self, __key: Union[str, int]) -> RegisterReader: |
| 58 | + if isinstance(__key, int): |
| 59 | + return self._address_map[__key] |
| 60 | + else: |
| 61 | + return super().__getitem__(__key) |
| 62 | + |
| 63 | + |
47 | 64 | class DeviceReader: |
48 | 65 | device: Model |
49 | | - registers: dict[str, RegisterReader] |
| 66 | + registers: RegisterMap |
50 | 67 |
|
51 | | - def __init__(self, device: Model, registers: dict[str, RegisterReader]) -> None: |
| 68 | + def __init__(self, device: Model, registers: Mapping[str, RegisterReader]) -> None: |
52 | 69 | self.device = device |
53 | | - self.registers = registers |
| 70 | + self.registers = RegisterMap(registers) |
54 | 71 |
|
55 | 72 | def __dir__(self) -> Iterable[str]: |
56 | 73 | return self.registers.keys() |
|
0 commit comments