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

Merge landing and LidarFov from dev #11

Merged
merged 7 commits into from
Feb 12, 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
2 changes: 1 addition & 1 deletion .gitman.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sources:
sources_locked:
- repo: https://github.com/ctu-mrs/mrs_flight_forge_connector.git
name: mrs_flight_forge_connertor
rev: 8af29bd8928463eb6d9c23352b826e1a011a40f8
rev: e87ab3cb3aab53a1b2982d308b4db6d54a3c2a2d
type: git
params:
sparse_paths:
Expand Down
7 changes: 5 additions & 2 deletions config/unreal_simulator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,11 @@ sensors:

rate: 10.0 # [Hz]

horizontal_fov: 360.0 # [deg]
vertical_fov: 90.0 # [deg]
horizontal_fov_left: 180.0 # [deg]
horizontal_fov_right: 180.0 # [deg]

vertical_fov_up: 52.0 # [deg]
vertical_fov_down: 7.0 # [deg]

horizontal_rays: 128 # [-]
vertical_rays: 64 # [-]
Expand Down
4 changes: 3 additions & 1 deletion src/unreal_simulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1904,9 +1904,11 @@ void UnrealSimulator::updateUnrealPoses(const bool teleport_without_collision) {
ueds_connector::Coordinates UnrealSimulator::position2ue(const Eigen::Vector3d &pos, const ueds_connector::Coordinates &ueds_world_origin){
ueds_connector::Coordinates pos_ue;

float PlayerStartOffset = 92.12;

pos_ue.x = ueds_world_origin.x + pos.x() * 100.0;
pos_ue.y = ueds_world_origin.y - pos.y() * 100.0;
pos_ue.z = ueds_world_origin.z + pos.z() * 100.0;
pos_ue.z = ueds_world_origin.z + pos.z() * 100.0 - PlayerStartOffset;

return pos_ue;
}
Expand Down
4 changes: 4 additions & 0 deletions tmux/one_drone/config/simulator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ uav1:
sensors:
lidar:
enabled: true

horizontal_rays: 128 # [-]
vertical_rays: 64 # [-]
lidar_intensity:
Expand All @@ -46,6 +47,9 @@ sensors:
std_slope: 0.81 # [-] # multiplies std_at_1m for each meter of measured distances

rgb:
rgb_segmented:
enabled: false
rate: 10.0 # [Hz]
enabled: true
stereo:
enabled: false
Loading