Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support gas measurement inspection #1991

Merged
merged 1 commit into from
Jan 29, 2025
Merged

Support gas measurement inspection #1991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions backend/api/Database/Models/Inspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ public void UpdateWithIsarInfo(IsarTask isarTask)
IsarTaskType.TakeThermalImage => InspectionType.ThermalImage,
IsarTaskType.TakeVideo => InspectionType.Video,
IsarTaskType.TakeThermalVideo => InspectionType.ThermalVideo,
IsarTaskType.TakeGasMeasurement => InspectionType.GasMeasurement,
_ => throw new ArgumentException(
$"ISAR task type '{isarTask.TaskType}' not supported for inspections"
),
Expand Down Expand Up @@ -168,6 +169,9 @@ public bool IsSupportedInspectionType(IList<RobotCapabilitiesEnum> capabilities)
InspectionType.ThermalVideo => capabilities.Contains(
RobotCapabilitiesEnum.take_thermal_video
),
InspectionType.GasMeasurement => capabilities.Contains(
RobotCapabilitiesEnum.take_gas_measurement
),
InspectionType.Audio => capabilities.Contains(RobotCapabilitiesEnum.record_audio),
_ => false,
};
Expand All @@ -190,6 +194,7 @@ public enum InspectionType
Video,
ThermalVideo,
Audio,
GasMeasurement,
}

public enum AnalysisType
Expand Down
1 change: 1 addition & 0 deletions backend/api/Database/Models/Robot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ public enum RobotCapabilitiesEnum
take_image,
take_video,
take_thermal_video,
take_gas_measurement,
record_audio,
localize,
auto_localize,
Expand Down
1 change: 1 addition & 0 deletions backend/api/MQTT/MessageModels/IsarTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public MissionTaskType GetMissionTaskTypeFromIsarTask(string isarTaskType)
"take_thermal_image" => MissionTaskType.Inspection,
"take_thermal_video" => MissionTaskType.Inspection,
"return_to_home" => MissionTaskType.ReturnHome,
"take_gas_measurement" => MissionTaskType.Inspection,

_ => throw new ArgumentException($"ISAR Task type '{isarTaskType}' not supported"),
};
Expand Down
4 changes: 3 additions & 1 deletion backend/api/Services/EchoService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,9 @@ public async Task<IList<MissionTask>> MissionTasksFromEchoTag(EchoTag echoTag)
{
var inspections = echoTag
.Inspections.Select(inspection => new Inspection(
inspectionType: inspection.InspectionType,
inspectionType: inspection.InspectionType != InspectionType.Audio
? inspection.InspectionType
: InspectionType.GasMeasurement,
videoDuration: inspection.TimeInSeconds,
inspectionTarget: inspection.InspectionPoint,
inspectionTargetName: inspection.InspectionPointName,
Expand Down
2 changes: 2 additions & 0 deletions backend/api/Services/Models/IsarTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public static IsarTaskType TaskTypeFromString(string isarClassName)
"take_video" => IsarTaskType.TakeVideo,
"take_thermal_image" => IsarTaskType.TakeThermalImage,
"take_thermal_video" => IsarTaskType.TakeThermalVideo,
"take_gas_measurement" => IsarTaskType.TakeGasMeasurement,
"return_to_home" => IsarTaskType.ReturnToHome,
"move_arm" => IsarTaskType.MoveArm,
_ => throw new ArgumentException(
Expand Down Expand Up @@ -63,6 +64,7 @@ public enum IsarTaskType
TakeVideo,
TakeThermalImage,
TakeThermalVideo,
TakeGasMeasurement,
RecordAudio,
MoveArm,
}
Expand Down
1 change: 1 addition & 0 deletions frontend/src/models/Robot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export enum RobotCapabilitiesEnum {
take_image = 'take_image',
take_video = 'take_video',
take_thermal_video = 'take_thermal_video',
take_gas_measurement = 'take_gas_measurement',
record_audio = 'record_audio',
localize = 'localize',
auto_localize = 'auto_localize',
Expand Down