Rework radar system

python_app/hardware_full/laser_control/protocol.py

@@ -6,7 +6,6 @@ serial port connection to the laser control board.
 
 import errno
 import logging
-import struct
 from typing import Optional
 from enum import IntEnum
 from datetime import datetime
@@ -30,7 +29,7 @@ from .conversions import (
     current_ma_to_n, current_n_to_ma,
     voltage_3v3_n_to_v, voltage_5v_n_to_v, voltage_7v_n_to_v,
 )
-from .models import Measurements, VariationType
+from .models import Measurements
 from .exceptions import (
     CommunicationError,
     PortNotFoundError,
@@ -42,16 +41,6 @@ from .exceptions import (
 logger = logging.getLogger(__name__)
 
 
-# Re-export enums so tests can import from protocol module
-class CommandCode(IntEnum):
-    DECODE_ENABLE  = CMD_DECODE_ENABLE
-    DEFAULT_ENABLE = CMD_DEFAULT_ENABLE
-    TRANS_ENABLE   = CMD_TRANS_ENABLE
-    REMOVE_FILE    = CMD_REMOVE_FILE
-    STATE          = CMD_STATE
-    TASK_ENABLE    = CMD_TASK_ENABLE
-
-
 class TaskType(IntEnum):
     MANUAL                = 0x00
     CHANGE_CURRENT_LD1    = 0x01
@@ -60,17 +49,6 @@ class TaskType(IntEnum):
     CHANGE_TEMPERATURE_LD2 = 0x04
 
 
-class DeviceState(IntEnum):
-    IDLE                = 0x0000
-    RUNNING             = 0x0001
-    BUSY                = 0x0002
-    ERROR               = 0x00FF
-    ERROR_OVERHEAT      = 0x0100
-    ERROR_POWER         = 0x0200
-    ERROR_COMMUNICATION = 0x0400
-    ERROR_INVALID_COMMAND = 0x0800
-
-
 # ---- Low-level helpers --------------------------------------------------
 
 def _int_to_hex4(value: int) -> str:
@@ -156,20 +134,6 @@ class Response:
         )
 
 
-# ---- Message builder --------------------------------------------------
-
-class Message:
-    """Named container for an encoded command byte array."""
-    def __init__(self, data: bytearray):
-        self._data = data
-
-    def to_bytes(self) -> bytes:
-        return bytes(self._data)
-
-    def __len__(self):
-        return len(self._data)
-
-
 # ---- Protocol class --------------------------------------------------
 
 class Protocol:
@@ -364,17 +328,17 @@ class Protocol:
     @staticmethod
     def encode_trans_enable(message_id: int = 0) -> bytes:
         """Build TRANS_ENABLE command (0x4444) — request last data."""
-        return bytearray.fromhex(_flipfour(_int_to_hex4(CMD_TRANS_ENABLE)))
+        return bytes.fromhex(_flipfour(_int_to_hex4(CMD_TRANS_ENABLE)))
 
     @staticmethod
     def encode_state(message_id: int = 0) -> bytes:
         """Build STATE command (0x6666) — request device state."""
-        return bytearray.fromhex(_flipfour(_int_to_hex4(CMD_STATE)))
+        return bytes.fromhex(_flipfour(_int_to_hex4(CMD_STATE)))
 
     @staticmethod
     def encode_default_enable(message_id: int = 0) -> bytes:
         """Build DEFAULT_ENABLE command (0x2222) — reset device."""
-        return bytearray.fromhex(_flipfour(_int_to_hex4(CMD_DEFAULT_ENABLE)))
+        return bytes.fromhex(_flipfour(_int_to_hex4(CMD_DEFAULT_ENABLE)))
 
     # ---- Response decoders -----------------------------------------------
 
@@ -433,7 +397,7 @@ class Protocol:
         Decode a 2-byte STATE response from the device.
 
         Returns:
-            Integer state code (compare with DeviceState enum).
+            Integer state code; see STATE_* constants.
         """
         if len(data) < 2:
             raise ProtocolError(f"STATE response too short: {len(data)} bytes")