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.

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

Remove dock/undock from isar missions #2010

Merged
merged 3 commits into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 4 deletions backend/api/Controllers/InspectionAreaController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -266,17 +266,14 @@ [FromBody] CreateDefaultLocalizationPose newDefaultLocalizationPose
if (inspectionArea.DefaultLocalizationPose != null)
{
inspectionArea.DefaultLocalizationPose.Pose = newDefaultLocalizationPose.Pose;
inspectionArea.DefaultLocalizationPose.DockingEnabled =
newDefaultLocalizationPose.IsDockingStation;
_ = await defaultLocalizationPoseService.Update(
inspectionArea.DefaultLocalizationPose
);
}
else
{
inspectionArea.DefaultLocalizationPose = new DefaultLocalizationPose(
newDefaultLocalizationPose.Pose,
newDefaultLocalizationPose.IsDockingStation
newDefaultLocalizationPose.Pose
);
inspectionArea = await inspectionAreaService.Update(inspectionArea);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ public CreateDefaultLocalizationPose()
}

public Pose Pose { get; set; }
public bool IsDockingStation { get; set; } = false;
}
}
9 changes: 0 additions & 9 deletions backend/api/Database/Models/DefaultLocalizationPose.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ public class DefaultLocalizationPose
[Required]
public Pose Pose { get; set; }

[Required]
public bool DockingEnabled { get; set; } = false;

public DefaultLocalizationPose()
{
Pose = new Pose();
Expand All @@ -25,11 +22,5 @@ public DefaultLocalizationPose(Pose pose)
{
Pose = pose;
}

public DefaultLocalizationPose(Pose pose, bool dockingEnabled)
{
Pose = pose;
DockingEnabled = dockingEnabled;
}
}
}
1 change: 0 additions & 1 deletion backend/api/Database/Models/Robot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ public enum RobotCapabilitiesEnum
localize,
auto_localize,
auto_return_to_home,
docking_procedure,
return_to_home,
}

Expand Down
Loading