Update ProtocolDefinitions

BluEye-Robotics · Jan 8, 2025 · 604ed42 · 604ed42
1 parent 31af4b1
commit 604ed42
Show file tree

Hide file tree

Showing 4 changed files with 124 additions and 123 deletions.
diff --git a/ProtocolDefinitions b/ProtocolDefinitions
diff --git a/blueye/protocol/protos.py b/blueye/protocol/protos.py
@@ -290,7 +290,6 @@
     'AquaTrollDevice',
     'AquaTrollDeviceStatus',
     'AquaTrollParameter',
-    'AquaTrollParameterBlock',
     'AquaTrollProbeMetadata',
     'AquaTrollProbeMetadataTel',
     'AquaTrollQuality',
@@ -319,6 +318,7 @@
     'BatteryBQ40Z50',
     'BatteryBQ40Z50Tel',
     'BatteryTel',
+    'BinlogRecord',
     'CPUInfo',
     'CPUInfoTel',
     'CPUTemperature',
@@ -547,5 +547,5 @@
     'WaypointCommand',
     'WeatherVaningCtrl',
     'WeatherVaningState',
-'BinlogRecord',
+'AquaTrollParameterBlock',
 )
diff --git a/blueye/protocol/types/__init__.py b/blueye/protocol/types/__init__.py
@@ -15,6 +15,24 @@
 # limitations under the License.
 #
 
+from .aquatroll import (
+    AquaTrollParameterBlock,
+    AquaTrollSensorMetadata,
+    AquaTrollSensorMetadataArray,
+    AquaTrollProbeMetadata,
+    AquaTrollSensorParameters,
+    AquaTrollSensorParametersArray,
+    SetAquaTrollParameterUnit,
+    SetAquaTrollConnectionStatus,
+    Type,
+    AquaTrollDevice,
+    AquaTrollQuality,
+    AquaTrollParameter,
+    AquaTrollUnit,
+    AquaTrollSensor,
+    AquaTrollSensorStatus,
+    AquaTrollDeviceStatus,
+)
 from .message_formats import (
     BinlogRecord,
     MotionInput,
@@ -112,68 +130,6 @@
     GuestPortError,
     MultibeamFrequencyMode,
 )
-from .aquatroll import (
-    AquaTrollParameterBlock,
-    AquaTrollSensorMetadata,
-    AquaTrollSensorMetadataArray,
-    AquaTrollProbeMetadata,
-    AquaTrollSensorParameters,
-    AquaTrollSensorParametersArray,
-    SetAquaTrollParameterUnit,
-    SetAquaTrollConnectionStatus,
-    Type,
-    AquaTrollDevice,
-    AquaTrollQuality,
-    AquaTrollParameter,
-    AquaTrollUnit,
-    AquaTrollSensor,
-    AquaTrollSensorStatus,
-    AquaTrollDeviceStatus,
-)
-from .control import (
-    MotionInputCtrl,
-    TiltVelocityCtrl,
-    LightsCtrl,
-    GuestportLightsCtrl,
-    LaserCtrl,
-    PilotGPSPositionCtrl,
-    WatchdogCtrl,
-    RecordCtrl,
-    TakePictureCtrl,
-    StartCalibrationCtrl,
-    CancelCalibrationCtrl,
-    FinishCalibrationCtrl,
-    AutoHeadingCtrl,
-    AutoDepthCtrl,
-    AutoAltitudeCtrl,
-    StationKeepingCtrl,
-    WeatherVaningCtrl,
-    AutoPilotSurgeYawCtrl,
-    AutoPilotHeaveCtrl,
-    RunMissionCtrl,
-    PauseMissionCtrl,
-    ClearMissionCtrl,
-    ResetPositionCtrl,
-    ResetOdometerCtrl,
-    CalibrateDvlGyroCtrl,
-    TiltStabilizationCtrl,
-    WaterDensityCtrl,
-    PingerConfigurationCtrl,
-    SystemTimeCtrl,
-    GripperCtrl,
-    GenericServoCtrl,
-    MultibeamServoCtrl,
-    DeactivateGuestPortsCtrl,
-    ActivateGuestPortsCtrl,
-    RestartGuestPortsCtrl,
-    SetAquaTrollParameterUnitCtrl,
-    SetAquaTrollConnectionStatusCtrl,
-    SetMultibeamConfigCtrl,
-    ActivateMultibeamCtrl,
-    DeactivateMultibeamCtrl,
-    StartDiveCtrl,
-    EndDiveCtrl,
-)
 from .mission_planning import (
     Mission,
     Instruction,
@@ -292,8 +248,68 @@
     GetPersistentStorageSettingsReq,
     GetPersistentStorageSettingsRep,
 )
+from .control import (
+    MotionInputCtrl,
+    TiltVelocityCtrl,
+    LightsCtrl,
+    GuestportLightsCtrl,
+    LaserCtrl,
+    PilotGPSPositionCtrl,
+    WatchdogCtrl,
+    RecordCtrl,
+    TakePictureCtrl,
+    StartCalibrationCtrl,
+    CancelCalibrationCtrl,
+    FinishCalibrationCtrl,
+    AutoHeadingCtrl,
+    AutoDepthCtrl,
+    AutoAltitudeCtrl,
+    StationKeepingCtrl,
+    WeatherVaningCtrl,
+    AutoPilotSurgeYawCtrl,
+    AutoPilotHeaveCtrl,
+    RunMissionCtrl,
+    PauseMissionCtrl,
+    ClearMissionCtrl,
+    ResetPositionCtrl,
+    ResetOdometerCtrl,
+    CalibrateDvlGyroCtrl,
+    TiltStabilizationCtrl,
+    WaterDensityCtrl,
+    PingerConfigurationCtrl,
+    SystemTimeCtrl,
+    GripperCtrl,
+    GenericServoCtrl,
+    MultibeamServoCtrl,
+    DeactivateGuestPortsCtrl,
+    ActivateGuestPortsCtrl,
+    RestartGuestPortsCtrl,
+    SetAquaTrollParameterUnitCtrl,
+    SetAquaTrollConnectionStatusCtrl,
+    SetMultibeamConfigCtrl,
+    ActivateMultibeamCtrl,
+    DeactivateMultibeamCtrl,
+    StartDiveCtrl,
+    EndDiveCtrl,
+)
 
 __all__ = (
+    'AquaTrollParameterBlock',
+    'AquaTrollSensorMetadata',
+    'AquaTrollSensorMetadataArray',
+    'AquaTrollProbeMetadata',
+    'AquaTrollSensorParameters',
+    'AquaTrollSensorParametersArray',
+    'SetAquaTrollParameterUnit',
+    'SetAquaTrollConnectionStatus',
+    'Type',
+    'AquaTrollDevice',
+    'AquaTrollQuality',
+    'AquaTrollParameter',
+    'AquaTrollUnit',
+    'AquaTrollSensor',
+    'AquaTrollSensorStatus',
+    'AquaTrollDeviceStatus',
     'BinlogRecord',
     'MotionInput',
     'Lights',
@@ -389,64 +405,6 @@
     'GuestPortDetachStatus',
     'GuestPortError',
     'MultibeamFrequencyMode',
-    'AquaTrollParameterBlock',
-    'AquaTrollSensorMetadata',
-    'AquaTrollSensorMetadataArray',
-    'AquaTrollProbeMetadata',
-    'AquaTrollSensorParameters',
-    'AquaTrollSensorParametersArray',
-    'SetAquaTrollParameterUnit',
-    'SetAquaTrollConnectionStatus',
-    'Type',
-    'AquaTrollDevice',
-    'AquaTrollQuality',
-    'AquaTrollParameter',
-    'AquaTrollUnit',
-    'AquaTrollSensor',
-    'AquaTrollSensorStatus',
-    'AquaTrollDeviceStatus',
-    'MotionInputCtrl',
-    'TiltVelocityCtrl',
-    'LightsCtrl',
-    'GuestportLightsCtrl',
-    'LaserCtrl',
-    'PilotGPSPositionCtrl',
-    'WatchdogCtrl',
-    'RecordCtrl',
-    'TakePictureCtrl',
-    'StartCalibrationCtrl',
-    'CancelCalibrationCtrl',
-    'FinishCalibrationCtrl',
-    'AutoHeadingCtrl',
-    'AutoDepthCtrl',
-    'AutoAltitudeCtrl',
-    'StationKeepingCtrl',
-    'WeatherVaningCtrl',
-    'AutoPilotSurgeYawCtrl',
-    'AutoPilotHeaveCtrl',
-    'RunMissionCtrl',
-    'PauseMissionCtrl',
-    'ClearMissionCtrl',
-    'ResetPositionCtrl',
-    'ResetOdometerCtrl',
-    'CalibrateDvlGyroCtrl',
-    'TiltStabilizationCtrl',
-    'WaterDensityCtrl',
-    'PingerConfigurationCtrl',
-    'SystemTimeCtrl',
-    'GripperCtrl',
-    'GenericServoCtrl',
-    'MultibeamServoCtrl',
-    'DeactivateGuestPortsCtrl',
-    'ActivateGuestPortsCtrl',
-    'RestartGuestPortsCtrl',
-    'SetAquaTrollParameterUnitCtrl',
-    'SetAquaTrollConnectionStatusCtrl',
-    'SetMultibeamConfigCtrl',
-    'ActivateMultibeamCtrl',
-    'DeactivateMultibeamCtrl',
-    'StartDiveCtrl',
-    'EndDiveCtrl',
     'Mission',
     'Instruction',
     'DepthSetPoint',
@@ -559,4 +517,46 @@
     'SetPersistentStorageSettingsRep',
     'GetPersistentStorageSettingsReq',
     'GetPersistentStorageSettingsRep',
+    'MotionInputCtrl',
+    'TiltVelocityCtrl',
+    'LightsCtrl',
+    'GuestportLightsCtrl',
+    'LaserCtrl',
+    'PilotGPSPositionCtrl',
+    'WatchdogCtrl',
+    'RecordCtrl',
+    'TakePictureCtrl',
+    'StartCalibrationCtrl',
+    'CancelCalibrationCtrl',
+    'FinishCalibrationCtrl',
+    'AutoHeadingCtrl',
+    'AutoDepthCtrl',
+    'AutoAltitudeCtrl',
+    'StationKeepingCtrl',
+    'WeatherVaningCtrl',
+    'AutoPilotSurgeYawCtrl',
+    'AutoPilotHeaveCtrl',
+    'RunMissionCtrl',
+    'PauseMissionCtrl',
+    'ClearMissionCtrl',
+    'ResetPositionCtrl',
+    'ResetOdometerCtrl',
+    'CalibrateDvlGyroCtrl',
+    'TiltStabilizationCtrl',
+    'WaterDensityCtrl',
+    'PingerConfigurationCtrl',
+    'SystemTimeCtrl',
+    'GripperCtrl',
+    'GenericServoCtrl',
+    'MultibeamServoCtrl',
+    'DeactivateGuestPortsCtrl',
+    'ActivateGuestPortsCtrl',
+    'RestartGuestPortsCtrl',
+    'SetAquaTrollParameterUnitCtrl',
+    'SetAquaTrollConnectionStatusCtrl',
+    'SetMultibeamConfigCtrl',
+    'ActivateMultibeamCtrl',
+    'DeactivateMultibeamCtrl',
+    'StartDiveCtrl',
+    'EndDiveCtrl',
 )
diff --git a/blueye/protocol/types/message_formats.py b/blueye/protocol/types/message_formats.py
@@ -316,6 +316,7 @@ class GuestPortDeviceID(proto.Enum):
     GUEST_PORT_DEVICE_ID_CERULEAN_OMNISCAN_450SS = 37
     GUEST_PORT_DEVICE_ID_BLUEYE_GNSS_DEVICE = 38
     GUEST_PORT_DEVICE_ID_WATERLINKED_DVL_A50_600 = 39
+    GUEST_PORT_DEVICE_ID_IMAGENEX_831L = 40
 
 
 class GuestPortNumber(proto.Enum):
+1 −1		.github/workflows/ci-dotnet.yaml
+4 −4		Blueye.Protocol.Protobuf.csproj
+1 −0		protobuf_definitions/message_formats.proto