Skip to content

Commit 58e4b19

Browse files
committed
Support gas measurement inspection
1 parent 396a27f commit 58e4b19

File tree

6 files changed

+13
-1
lines changed

6 files changed

+13
-1
lines changed

backend/api/Database/Models/Inspection.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ public void UpdateWithIsarInfo(IsarTask isarTask)
129129
IsarTaskType.TakeThermalImage => InspectionType.ThermalImage,
130130
IsarTaskType.TakeVideo => InspectionType.Video,
131131
IsarTaskType.TakeThermalVideo => InspectionType.ThermalVideo,
132+
IsarTaskType.TakeGasMeasurement => InspectionType.GasMeasurement,
132133
_ => throw new ArgumentException(
133134
$"ISAR task type '{isarTask.TaskType}' not supported for inspections"
134135
),
@@ -168,6 +169,9 @@ public bool IsSupportedInspectionType(IList<RobotCapabilitiesEnum> capabilities)
168169
InspectionType.ThermalVideo => capabilities.Contains(
169170
RobotCapabilitiesEnum.take_thermal_video
170171
),
172+
InspectionType.GasMeasurement => capabilities.Contains(
173+
RobotCapabilitiesEnum.take_gas_measurement
174+
),
171175
InspectionType.Audio => capabilities.Contains(RobotCapabilitiesEnum.record_audio),
172176
_ => false,
173177
};
@@ -190,6 +194,7 @@ public enum InspectionType
190194
Video,
191195
ThermalVideo,
192196
Audio,
197+
GasMeasurement,
193198
}
194199

195200
public enum AnalysisType

backend/api/Database/Models/Robot.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ public enum RobotCapabilitiesEnum
192192
take_image,
193193
take_video,
194194
take_thermal_video,
195+
take_gas_measurement,
195196
record_audio,
196197
localize,
197198
auto_localize,

backend/api/MQTT/MessageModels/IsarTask.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public MissionTaskType GetMissionTaskTypeFromIsarTask(string isarTaskType)
3737
"take_thermal_image" => MissionTaskType.Inspection,
3838
"take_thermal_video" => MissionTaskType.Inspection,
3939
"return_to_home" => MissionTaskType.ReturnHome,
40+
"take_gas_measurement" => MissionTaskType.Inspection,
4041

4142
_ => throw new ArgumentException($"ISAR Task type '{isarTaskType}' not supported"),
4243
};

backend/api/Services/EchoService.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,9 @@ public async Task<IList<MissionTask>> MissionTasksFromEchoTag(EchoTag echoTag)
333333
{
334334
var inspections = echoTag
335335
.Inspections.Select(inspection => new Inspection(
336-
inspectionType: inspection.InspectionType,
336+
inspectionType: inspection.InspectionType != InspectionType.Audio
337+
? inspection.InspectionType
338+
: InspectionType.GasMeasurement,
337339
videoDuration: inspection.TimeInSeconds,
338340
inspectionTarget: inspection.InspectionPoint,
339341
inspectionTargetName: inspection.InspectionPointName,

backend/api/Services/Models/IsarTask.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public static IsarTaskType TaskTypeFromString(string isarClassName)
3636
"take_video" => IsarTaskType.TakeVideo,
3737
"take_thermal_image" => IsarTaskType.TakeThermalImage,
3838
"take_thermal_video" => IsarTaskType.TakeThermalVideo,
39+
"take_gas_measurement" => IsarTaskType.TakeGasMeasurement,
3940
"return_to_home" => IsarTaskType.ReturnToHome,
4041
"move_arm" => IsarTaskType.MoveArm,
4142
_ => throw new ArgumentException(
@@ -63,6 +64,7 @@ public enum IsarTaskType
6364
TakeVideo,
6465
TakeThermalImage,
6566
TakeThermalVideo,
67+
TakeGasMeasurement,
6668
RecordAudio,
6769
MoveArm,
6870
}

frontend/src/models/Robot.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export enum RobotCapabilitiesEnum {
5858
take_image = 'take_image',
5959
take_video = 'take_video',
6060
take_thermal_video = 'take_thermal_video',
61+
take_gas_measurement = 'take_gas_measurement',
6162
record_audio = 'record_audio',
6263
localize = 'localize',
6364
auto_localize = 'auto_localize',

0 commit comments

Comments
 (0)