diff options
| author | Christian Kolset <ckolset@colostate.edu> | 2026-07-29 13:41:29 -0600 |
|---|---|---|
| committer | Christian Kolset <ckolset@colostate.edu> | 2026-07-29 13:41:29 -0600 |
| commit | 934d3fc18bc4fc0e05d26a12d635915b00bd8c8d (patch) | |
| tree | efd235350b0cbd014e44591aeef8e6d806335b54 /devices | |
| parent | 23800a32231acecbace12bfc41c03b081b1bf565 (diff) | |
| parent | d9ca58e48cf92438087ac24ee261c2c4911316b1 (diff) | |
Merge branch 'feat/device-naming'
Diffstat (limited to 'devices')
| -rw-r--r-- | devices/analog_input.py | 1 | ||||
| -rw-r--r-- | devices/arduino_device.py | 1 | ||||
| -rw-r--r-- | devices/digital_io.py | 1 | ||||
| -rw-r--r-- | devices/nidaqmx_device.py | 1 | ||||
| -rw-r--r-- | devices/serial_device.py | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/devices/analog_input.py b/devices/analog_input.py index 6ac82d4..8938bf2 100644 --- a/devices/analog_input.py +++ b/devices/analog_input.py @@ -175,6 +175,7 @@ class AnalogInputDevice(BaseDevice): return { "device_type": self.DEVICE_TYPE, "device_id": self.info.device_id, + "name": self.info.name, "num_channels": self._num_channels, "simulate": self.simulate, "backend": self.backend, diff --git a/devices/arduino_device.py b/devices/arduino_device.py index 954d387..8293a23 100644 --- a/devices/arduino_device.py +++ b/devices/arduino_device.py @@ -203,6 +203,7 @@ class ArduinoDevice(BaseDevice): return { "device_type": self.DEVICE_TYPE, "device_id": self.info.device_id, + "name": self.info.name, "analog_pins": self._analog_pins, "di_pins": self._di_pins, "do_pins": self._do_pins, diff --git a/devices/digital_io.py b/devices/digital_io.py index 2bd0243..f60c330 100644 --- a/devices/digital_io.py +++ b/devices/digital_io.py @@ -258,6 +258,7 @@ class DigitalIODevice(BaseDevice): return { "device_type": self.DEVICE_TYPE, "device_id": self.info.device_id, + "name": self.info.name, "num_inputs": self._num_inputs, "num_outputs": self._num_outputs, "simulate": self.simulate, diff --git a/devices/nidaqmx_device.py b/devices/nidaqmx_device.py index 3f64998..9d9747e 100644 --- a/devices/nidaqmx_device.py +++ b/devices/nidaqmx_device.py @@ -219,6 +219,7 @@ class NidaqmxDevice(BaseDevice): return { "device_type": self.DEVICE_TYPE, "device_id": self.info.device_id, + "name": self.info.name, "num_analog": self._num_analog, "min_v": self._min_v, "max_v": self._max_v, diff --git a/devices/serial_device.py b/devices/serial_device.py index bd953b8..580421c 100644 --- a/devices/serial_device.py +++ b/devices/serial_device.py @@ -168,6 +168,7 @@ class SerialDevice(BaseDevice): cfg: Dict[str, Any] = { "device_type": self.DEVICE_TYPE, "device_id": self.info.device_id, + "name": self.info.name, "port": self._port, "baud_rate": self._baud, "parse_format": self._fmt, |