mx-remote 4.7.6__tar.gz → 4.7.7__tar.gz

{mx_remote-4.7.6 → mx_remote-4.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx_remote
-Version: 4.7.6
+Version: 4.7.7
 Summary: Python 3 library for interfacing with MX Remote compatible devices
 Project-URL: Homepage, https://github.com/opdenkamp/mx-remote/
 Project-URL: Documentation, https://github.com/opdenkamp/mx-remote/

{mx_remote-4.7.6 → mx_remote-4.7.7}/mx_remote/const.py

@@ -14,7 +14,7 @@ Default communication modes:
 """
 import os
 
-VERSION = '4.7.6'
+VERSION = '4.7.7'
 __version__ = VERSION
 
 MX_BCAST_UDP_PORT = 8811

{mx_remote-4.7.6 → mx_remote-4.7.7}/mx_remote/proto/FrameV2IPBayMapping.py

@@ -24,10 +24,12 @@ class FrameV2IPBayMapping(FrameBase):
     @cached_property
     def is_input(self) -> bool:
         '''Whether these are input bay mappings.'''
+        # Wire format: firmware sets bit 0 to ((mode == MBAY_MODE_INPUT) ? 1 : 0),
+        # so an input frame carries bit 0 = 1 (not 0).
         val = self.payload_u16(0)
         if (val is None):
             return False
-        return (val & 1 == 0)
+        return (val & 1 == 1)
 
     @cached_property
     def is_output(self) -> bool:
@@ -35,7 +37,7 @@ class FrameV2IPBayMapping(FrameBase):
         val = self.payload_u16(0)
         if (val is None):
             return False
-        return (val & 1 == 1)
+        return (val & 1 == 0)
 
     @cached_property
     def first_bay_id(self) -> int|None:

{mx_remote-4.7.6 → mx_remote-4.7.7}/mx_remote/remote/Bay.py

@@ -144,14 +144,20 @@ class Bay(BayBase):
     @override
     def bay_uid(self) -> MxrBayUid:
         # In a OneIP mesh the same source can be advertised by multiple devices
-        # (mesh forwarding etc.). MXR_OP_SYS_BAY_V2IP_SOURCES carries the uid of
-        # the originating source device alongside each stream, so collapse a
-        # v2ip source bay to its originating TX's first-input bay_uid — that
-        # gives the same physical source a single stable bay_uid.
-        if self.is_v2ip_source and ((stream := self.v2ip_source) is not None) and (stream.uid is not None):
-            src_dev = self.device.registry.get_by_uid(remote_id=stream.uid)
-            if (src_dev is not None) and ((src_input := src_dev.first_input) is not None):
-                return MxrBayUid(src_dev.remote_id, src_input.port)
+        # (mesh forwarding etc.). Resolve a v2ip source bay to (source_uid, 0)
+        # — every OneIP unit has at most one input, always at port 0 — using the
+        # source uid from MXR_OP_SYS_BAY_V2IP_SOURCES, falling back to the bay
+        # mapping uid if the sources frame hasn't supplied one. Yields a single
+        # stable bay_uid regardless of who advertises the source.
+        if self.is_v2ip_source:
+            src_uid:MxrDeviceUid|None = None
+            stream = self.v2ip_source
+            if (stream is not None) and (stream.uid is not None) and not stream.uid.empty:
+                src_uid = stream.uid
+            elif (self._v2ip_uid is not None) and not self._v2ip_uid.empty:
+                src_uid = self._v2ip_uid
+            if src_uid is not None:
+                return MxrBayUid(src_uid, 0)
         return MxrBayUid(self.device.remote_id, self.port)
 
     @property

{mx_remote-4.7.6 → mx_remote-4.7.7}/mx_remote/remote/Device.py

@@ -203,9 +203,15 @@ class Device(DeviceBase):
 			return None
 		if self._v2ip_sources is None:
 			return None
-		if bay.bay >= len(self._v2ip_sources):
+		# Firmware fills MXR_OP_SYS_BAY_V2IP_SOURCES by iterating bays in order
+		# (MBAY_ITERATE). Devices with no local input (pure RX) skip bay 0, so
+		# the list starts at bay 1 — shift the lookup so bay.bay still maps to
+		# the right entry.
+		offset = 0 if self.has_local_source else 1
+		idx = bay.bay - offset
+		if (idx < 0) or (idx >= len(self._v2ip_sources)):
 			return None
-		return self._v2ip_sources[bay.bay]
+		return self._v2ip_sources[idx]
 
 	@property
 	def v2ip_stats(self) -> V2IPDeviceStats|None:
@@ -619,13 +625,13 @@ class Device(DeviceBase):
 		elif isinstance(data, FrameV2IPBayMapping):
 			if data.first_bay_id is None:
 				return
+			# Firmware iterates bays in MBAY_ITERATE order; the wire payload's
+			# first_bay_id tells us the bay number of payload[0], so payload[i]
+			# maps to bay number (first_bay_id + i). Devices without a local
+			# bay 0 (pure RX) emit first_bay_id=1 and skip the bay-0 slot.
+			mode = 'Input' if data.is_input else 'Output'
 			for idx in range(data.nb_bays):
-				if (idx == 0):
-					if data.is_input and self.is_oneip_rx:
-						continue
-					if data.is_output and (self.is_oneip_tx or self.is_oneip_multiviewer):
-						continue
-				bay = self.get_by_mode_bay(mode=('Input' if data.is_input else 'Output'), bay=idx)
+				bay = self.get_by_mode_bay(mode=mode, bay=data.first_bay_id + idx)
 				if (bay is not None):
 					bay.v2ip_uid = data.bay(idx=idx) # pyright: ignore[reportAttributeAccessIssue]
 		elif isinstance(data, FrameSystemStatus):