Skip to content
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.

Sign up for GitHub

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

examples: Don't assume array parameters are implemented as lists #924

Merged
merged 4 commits into from
Sep 24, 2024
Merged

examples: Don't assume array parameters are implemented as lists #924

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f37e8f1
examples: Update niscope_acquire_waveform to expect Sequence[str], no…
bkeryan Sep 23, 2024
c3ee08b
examples: Update sample_measurement to use Sequence[T] instead of Ite…
bkeryan Sep 23, 2024
0099d33
service/tests: Fix type hints
bkeryan Sep 24, 2024
e995379
examples: Undo Iterable->Sequence change in sample_measurement
bkeryan Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/niscope_acquire_waveform/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
import threading
import time
from typing import List, Tuple
from typing import List, Sequence, Tuple

import click
import grpc
Expand Down Expand Up @@ -64,7 +64,7 @@
@measurement_service.output("waveform2", nims.DataType.DoubleArray1D)
@measurement_service.output("waveform3", nims.DataType.DoubleArray1D)
def measure(
measurement_pins: List[str],
measurement_pins: Sequence[str],
vertical_range: float,
vertical_coupling: str,
input_impedance: float,
Expand All @@ -90,7 +90,7 @@ def measure(
measurement_service.context.add_cancel_callback(cancellation_event.set)

with measurement_service.context.reserve_session(
measurement_pins + [trigger_pin]
list(measurement_pins) + [trigger_pin]
) as reservation:
with reservation.initialize_niscope_session() as session_info:
# Use connections to map pin names to channel names. This sets the
Expand Down
8 changes: 4 additions & 4 deletions examples/sample_measurement/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import pathlib
import sys
from enum import Enum
from typing import Iterable, Tuple
from typing import Sequence, Tuple

import click
import ni_measurement_plugin_sdk_service as nims
Expand Down Expand Up @@ -62,14 +62,14 @@ class Color(Enum):
@measurement_service.output("String Array out", nims.DataType.StringArray1D)
def measure(
float_input: float,
double_array_input: Iterable[float],
double_array_input: Sequence[float],
bool_input: bool,
string_input: str,
enum_input: Color,
protobuf_enum_input: color_pb2.ProtobufColor.ValueType,
string_array_in: Iterable[str],
string_array_in: Sequence[str],
) -> Tuple[
float, Iterable[float], bool, str, Color, color_pb2.ProtobufColor.ValueType, Iterable[str]
float, Sequence[float], bool, str, Color, color_pb2.ProtobufColor.ValueType, Sequence[str]
]:
"""Perform a loopback measurement with various data types."""
logging.info("Executing measurement")
Expand Down