v2: Initial support for NTNDArray and correct timestamp -> timeStamp

ophyd/v2/_p4p.py

@@ -110,7 +110,7 @@ def make_converter(datatype: Optional[Type], values: Dict[str, Any]) -> PvaConve
         if datatype and datatype != Sequence[str]:
             raise TypeError(f"{pv} has type [str] not {datatype.__name__}")
         return PvaArrayConverter()
-    elif "NTScalarArray" in typeid:
+    elif "NTScalarArray" in typeid or "NTNDArray" in typeid:
         pv_dtype = get_unique(
             {k: v["value"].dtype for k, v in values.items()}, "dtypes"
         )
@@ -215,7 +215,7 @@ async def get_descriptor(self) -> Descriptor:
 
     async def get_reading(self) -> Reading:
         value = await self.ctxt.get(
-            self.read_pv, request="field(value,alarm,timestamp)"
+            self.read_pv, request="field(value,alarm,timeStamp)"
         )
         return self.converter.reading(value)
 
@@ -233,7 +233,7 @@ async def async_callback(v):
                 callback(self.converter.reading(v), self.converter.value(v))
 
             self.subscription = self.ctxt.monitor(
-                self.read_pv, async_callback, request="field(value,alarm,timestamp)"
+                self.read_pv, async_callback, request="field(value,alarm,timeStamp)"
             )
         else:
             if self.subscription:

ophyd/v2/tests/test_epics.py

@@ -300,6 +300,34 @@ async def test_pva_table(ioc: IOC) -> None:
             q.close()
 
 
+async def test_pva_ntdarray(ioc: IOC):
+    if ioc.protocol == "ca":
+        # CA can't do ndarray
+        return
+    initial = np.zeros(4, np.int64)
+    put = np.ones_like(initial)
+
+    descriptor = dict(dtype="array", shape=[4])
+
+    for i, p in [(initial, put), (put, initial)]:
+        backend = await ioc.make_backend(npt.NDArray[np.int64], "ntndarray")
+        # Make a monitor queue that will monitor for updates
+        q = MonitorQueue(backend)
+        try:
+            # Check descriptor
+            assert (
+                dict(source=backend.source, **descriptor)
+                == await backend.get_descriptor()
+            )
+            # Check initial value
+            await q.assert_updates(pytest.approx(i))
+            # Put to new value and check that
+            await backend.put(p)
+            await q.assert_updates(pytest.approx(p))
+        finally:
+            q.close()
+
+
 async def test_non_existant_errors(ioc: IOC):
     backend = await ioc.make_backend(str, "non-existant", connect=False)
     # Can't use asyncio.wait_for on python3.8 because of

ophyd/v2/tests/test_records.db

@@ -241,4 +241,23 @@ record(waveform, "$(P)table:enum")
             "": {"+type": "meta", "+channel": "VAL"}
         }
     })
-}
+}
+
+record(waveform, "$(P)ntndarray")
+{
+  field(FTVL, "INT64")
+  field(NELM, "4")
+  field(INP, {const:[0, 0, 0, 0]})
+  field(PINI, "YES")
+  info(Q:group, {
+        "$(P)ntndarray":{
+            +id:"epics:nt/NTNDArray:1.0",
+            "value":{
+                +type:"any",
+                +channel:"VAL",
+                +trigger:"*",
+            },
+            "": {+type:"meta", +channel:"VAL"}
+        }
+    })
+}