Merge pull request #17 from CerebusOSS/14_simple_design_improvements

Expose monitor state

src/pycbsdk/cbhw/device/nsp.py

@@ -472,6 +472,7 @@ def _handle_nplay(self, pkt):
         self._config["nplay"] = pkt
 
     def _handle_procmon(self, pkt):
+        arrival_time = time.time()
         update_interval = max(pkt.header.time - self._monitor_state["time"], 1)
         pkt_delta = self.pkts_received - self._monitor_state["pkts_received"]
 
@@ -492,6 +493,7 @@ def _handle_procmon(self, pkt):
             "counter": pkt.counter if has_counter else -1,
             "time": pkt.header.time,
             "pkts_received": self.pkts_received,
+            "sys_time": arrival_time,
         }
 
     def _handle_log(self, pkt):
@@ -1129,6 +1131,9 @@ def get_transport(self, force_refresh=False) -> int:
             self.set_transport("CHECK", True, timeout=0.5)
         return self._config["transport"]
 
+    def get_monitor_state(self) -> dict:
+        return self._monitor_state.copy()
+
     def reset(self) -> int:
         print("TODO: reset NSP proctime to 0")
         return 0

src/pycbsdk/cbsdk.py

@@ -170,6 +170,10 @@ def get_runlevel(device: NSPDevice) -> CBRunLevel:
     return device.get_runlevel()
 
 
+def get_monitor_state(device: NSPDevice) -> dict:
+    return device.get_monitor_state()
+
+
 def register_event_callback(
     device: NSPDevice, channel_type: CBChannelType, func: Callable[[Structure], None]
 ):