Добавить поддержку GAS 167 и УМП, улучшить обмен по CAN и последовательному порту

python/set_devices/bus_demo.py

@@ -13,15 +13,59 @@
 from __future__ import annotations
 
 import random
+import math
 from datetime import datetime
 
 from . import can_transport as tr
 from protocan import protocan as pc
+from protocan.gas_167 import REGISTERS
 
 #: Типы сообщений, которые генератор выдаёт по кругу случайно.
 KINDS = ("pulse", "analog", "modbus", "gas", "status", "error", "discrete")
 
 
+class UmpDemoSource:
+    """Two simulated UMP nodes using the assigned global GAS map.
+
+    Call next_frames every 250 ms: four words per node per tick and a
+    heartbeat every second. Device Type=3, Device=5/6 are demo addresses,
+    not discovery results or a claim about firmware 167/v1 support.
+    """
+
+    def __init__(self) -> None:
+        self._tick = 0
+        self._seq = 0
+
+    def _frame(self, node: int, kind: int, body: int, data: bytes) -> bytes:
+        self._seq = (self._seq + 1) & 0xFF
+        identifier = pc.ProtoCanId.build(1, 1, 3, node, kind, body)
+        return tr.Frame(seq=self._seq, flags=tr.FLAG_IDE,
+                        can_id=identifier, data=data).encode()
+
+    def next_frames(self) -> list[bytes]:
+        """Return encoded bridge frames; one full map takes eight seconds."""
+        packets = []
+        # Show LOAD state immediately, then walk the entire dictionary.
+        start = (124 + self._tick * 4) % len(REGISTERS)
+        for node, key in ((5, "ump1_id"), (6, "ump2_id")):
+            if self._tick % 4 == 0:
+                packets.append(self._frame(
+                    node, pc.MsgType.PULSE, 0,
+                    bytes([(self._tick // 4) & 0xFF])))
+            values = []
+            for entry in REGISTERS[start:start + 4]:
+                offset = entry["modbus"]
+                value = int(2000 + 700 * math.sin(self._tick / 12 + offset / 8 + node))
+                command = 0x80 if (self._tick // 32) % 2 == 0 else 0x40
+                value = {82: 1000, 124: 8, 125: 0, 126: node, 127: command}.get(offset, value)
+                values.append(value.to_bytes(2, "little"))
+            packets.append(self._frame(
+                node, pc.MsgType.GENERAL_ADDRESS_SPACE,
+                REGISTERS[start][key], b"".join(values)))
+        self._tick += 1
+        return packets
+
+
 class BusDemoSource:
     """@brief Источник демонстрационных кадров шины.
 
@@ -58,11 +102,15 @@ class BusDemoSource:
             data = b"".join(self._rng.randint(0, 0xFFFF).to_bytes(2, "little")
                             for _ in range(cnt))
         elif kind == "gas":
-            adr = self._rng.randint(0, 0x400)
+            # Exercise the shared named map in the ordinary demo too.
+            dev_type, dev_id = 3, self._rng.choice((5, 6))
+            key = "ump1_id" if dev_id == 5 else "ump2_id"
+            count = self._rng.randint(1, 4)
+            adr = REGISTERS[self._rng.randrange(len(REGISTERS) - count + 1)][key]
             cid = pc.ProtoCanId.build(0, 1, dev_type, dev_id,
                                       pc.MsgType.GENERAL_ADDRESS_SPACE, adr)
             data = b"".join(self._rng.randint(0, 0xFFFF).to_bytes(2, "little")
-                            for _ in range(self._rng.randint(1, 4)))
+                            for _ in range(count))
         elif kind == "status":
             now = datetime.now()
             cid = pc.ProtoCanId.build(1, 1, dev_type, dev_id, pc.MsgType.BROADCAST,