Switch other endpoints to new timestamp format

disk/src/decode.rs

@@ -1,5 +1,5 @@
 use crate::agg::binnedt::TimeBinnableType;
-use crate::agg::enp::{Identity, WaveNBinner, WavePlainProc, WaveXBinner};
+use crate::agg::enp::{ts_offs_from_abs, Identity, WaveNBinner, WavePlainProc, WaveXBinner};
 use crate::agg::streams::{Appendable, Collectable, Collector, StreamItem};
 use crate::agg::{Fits, FitsInside};
 use crate::binned::{
@@ -11,7 +11,6 @@ use crate::eventchunker::EventFull;
 use err::Error;
 use futures_core::Stream;
 use futures_util::StreamExt;
-use netpod::timeunits::SEC;
 use netpod::NanoRange;
 use serde::{Deserialize, Serialize};
 use std::marker::PhantomData;
@@ -324,8 +323,12 @@ impl<NTY> WithLen for EventValuesCollector<NTY> {
 
 #[derive(Serialize)]
 pub struct EventValuesCollectorOutput<NTY> {
-    ts0: u64,
-    tsoff: Vec<u64>,
+    #[serde(rename = "tsAnchor")]
+    ts_anchor_sec: u64,
+    #[serde(rename = "tsMs")]
+    ts_off_ms: Vec<u64>,
+    #[serde(rename = "tsNs")]
+    ts_off_ns: Vec<u64>,
     values: Vec<NTY>,
     #[serde(skip_serializing_if = "Bool::is_false", rename = "finalisedRange")]
     range_complete: bool,
@@ -353,11 +356,11 @@ where
     }
 
     fn result(self) -> Result<Self::Output, Error> {
-        let ts0 = self.vals.tss.first().map_or(0, |k| *k / SEC);
-        let tsoff = self.vals.tss.into_iter().map(|k| k - ts0 * SEC).collect();
+        let tst = ts_offs_from_abs(&self.vals.tss);
         let ret = Self::Output {
-            ts0,
-            tsoff,
+            ts_anchor_sec: tst.0,
+            ts_off_ms: tst.1,
+            ts_off_ns: tst.2,
             values: self.vals.values,
             range_complete: self.range_complete,
             timed_out: self.timed_out,