|
13 | 13 |
|
14 | 14 | import numpy as np
|
15 | 15 |
|
16 |
| -import PSL.commands_proto as CP |
17 |
| -from PSL import packet_handler |
18 |
| - |
19 | 16 | logger = logging.getLogger(__name__)
|
20 | 17 |
|
21 | 18 | GAIN_VALUES = (1, 2, 4, 5, 8, 10, 16, 32)
|
@@ -76,19 +73,18 @@ class AnalogInput:
|
76 | 73 | Number used to refer to this channel in the firmware.
|
77 | 74 | """
|
78 | 75 |
|
79 |
| - def __init__(self, name: str, device: packet_handler.Handler): |
| 76 | + def __init__(self, name: str): |
80 | 77 | self._name = name
|
81 |
| - self._device = device |
82 | 78 | self._resolution = 2 ** 10 - 1
|
83 | 79 |
|
84 | 80 | if self._name == "CH1":
|
85 |
| - self._programmable_gain_amplifier = 1 |
86 |
| - self.gain = 1 |
| 81 | + self.programmable_gain_amplifier = 1 |
| 82 | + self._gain = 1 |
87 | 83 | elif self._name == "CH2":
|
88 |
| - self._programmable_gain_amplifier = 2 |
89 |
| - self.gain = 1 |
| 84 | + self.programmable_gain_amplifier = 2 |
| 85 | + self._gain = 1 |
90 | 86 | else:
|
91 |
| - self._programmable_gain_amplifier = None |
| 87 | + self.programmable_gain_amplifier = None |
92 | 88 | self._gain = 1
|
93 | 89 |
|
94 | 90 | self.samples_in_buffer = 0
|
@@ -125,12 +121,6 @@ def gain(self, value: Union[int, float]):
|
125 | 121 | if value not in GAIN_VALUES:
|
126 | 122 | raise ValueError(f"Invalid gain. Valid values are {GAIN_VALUES}.")
|
127 | 123 |
|
128 |
| - gain_idx = GAIN_VALUES.index(value) |
129 |
| - self._device.send_byte(CP.ADC) |
130 |
| - self._device.send_byte(CP.SET_PGA_GAIN) |
131 |
| - self._device.send_byte(self._programmable_gain_amplifier) |
132 |
| - self._device.send_byte(gain_idx) |
133 |
| - self._device.get_ack() |
134 | 124 | self._gain = value
|
135 | 125 | self._calibrate()
|
136 | 126 |
|
|
0 commit comments