This commit is contained in:
Björn Ellensohn 2023-11-30 09:13:22 +01:00
parent 1e1b6e8ca1
commit 8a1e43c3b8
6 changed files with 23 additions and 26 deletions

View File

@ -1,5 +1,4 @@
version: "3.9" version: "3.9"
services: services:
# Base image containing dependencies. # Base image containing dependencies.
base: base:
@ -37,7 +36,6 @@ services:
# Allows graphical programs in the container. # Allows graphical programs in the container.
- /tmp/.X11-unix:/tmp/.X11-unix:rw - /tmp/.X11-unix:/tmp/.X11-unix:rw
- ${XAUTHORITY:-$HOME/.Xauthority}:/root/.Xauthority - ${XAUTHORITY:-$HOME/.Xauthority}:/root/.Xauthority
# Overlay image containing the project specific source code. # Overlay image containing the project specific source code.
overlay: overlay:
extends: base extends: base
@ -54,7 +52,6 @@ services:
- linux/amd64 - linux/amd64
volumes: volumes:
- .:/repo - .:/repo
# Additional dependencies for GUI applications # Additional dependencies for GUI applications
guis: guis:
extends: overlay extends: overlay
@ -69,59 +66,50 @@ services:
platforms: platforms:
- linux/arm64 - linux/arm64
- linux/amd64 - linux/amd64
command: > command: |
/bin/bash /bin/bash
# Robot State Publisher # Robot State Publisher
robot_state_publisher: robot_state_publisher:
extends: overlay extends: overlay
command: > command: |
ros2 launch cps_loki_bringup rsp.launch.py ros2 launch cps_loki_bringup rsp.launch.py
# Controller # Controller
controller: controller:
extends: overlay extends: overlay
command: > command: |
ros2 launch cps_loki_bringup robot_controller.launch.py ros2 launch cps_loki_bringup robot_controller.launch.py
devices: devices:
- /dev/ttyUSB0:/dev/ttyUSB0 - /dev/ttyUSB0:/dev/ttyUSB0
- /dev/ttyACM0:/dev/ttyACM0 - /dev/ttyACM0:/dev/ttyACM0
restart: unless-stopped restart: unless-stopped
# teleop # teleop
teleop: teleop:
extends: overlay extends: overlay
command: > command: |
ros2 launch cps_loki_bringup robot_joy_teleop.launch.py ros2 launch cps_loki_bringup robot_joy_teleop.launch.py
devices: devices:
- /dev/input:/dev/input - /dev/input:/dev/input
restart: unless-stopped restart: unless-stopped
# scan filter node # scan filter node
lidar_filter: lidar_filter:
extends: overlay extends: overlay
command: > command: |
ros2 launch cps_loki_bringup robot_scan_filter.launch.py ros2 launch cps_loki_bringup robot_scan_filter.launch.py
# lidar # lidar
lidar: lidar:
extends: overlay extends: overlay
depends_on: depends_on:
- lidar_filter - lidar_filter
command: > command: |
ros2 launch cps_loki_bringup robot_lidar.launch.py ros2 launch cps_loki_bringup robot_lidar.launch.py
devices: devices:
- /dev/ttyUSB0:/dev/ttyUSB0 - /dev/ttyUSB0:/dev/ttyUSB0
#- /dev/ttyUSB1:/dev/ttyUSB1
- /dev/ttyACM0:/dev/ttyACM0 - /dev/ttyACM0:/dev/ttyACM0
# mapping # mapping
mapping: mapping:
extends: overlay extends: overlay
command: > command: |
ros2 launch cps_loki_bringup robot_mapper.launch.py ros2 launch cps_loki_bringup robot_mapper.launch.py
# navigation # navigation
navigation: navigation:
extends: overlay extends: overlay
@ -129,25 +117,26 @@ services:
# ros2 launch cbot_mini_bringup robot_navigation.launch.py # ros2 launch cbot_mini_bringup robot_navigation.launch.py
# map_subscribe_transient_local:=true # map_subscribe_transient_local:=true
command: > command: >
ros2 launch nav2_bringup bringup_launch.py slam:=True map:=/repo/map.yaml use_sim_time:=False use_composition:=True params_file:=/overlay_ws/src/cps_loki_bringup/config/nav2_params.yaml ros2 launch nav2_bringup bringup_launch.py slam:=True map:=/repo/map.yaml
use_sim_time:=False use_composition:=True
params_file:=/overlay_ws/src/cps_loki_bringup/config/nav2_params.yaml
depends_on: depends_on:
- lidar - lidar
- controller - controller
- teleop - teleop
# camera # camera
cam: cam:
extends: overlay extends: overlay
command: > command: |
bash bash
################################################################################################################################ ################################################################################################################################
# This section is mostly for supervision from PC # # This section is mostly for supervision from PC #
################################################################################################################################ ################################################################################################################################
# rviz2 # rviz2
rviz2: rviz2:
extends: guis extends: guis
command: > command: |
rviz2 rviz2
# Needed to display graphical applications # Needed to display graphical applications
privileged: true privileged: true
networks: {}

Binary file not shown.

View File

@ -0,0 +1,7 @@
image: cps_half_new_posegraph.pgm
mode: trinary
resolution: 0.05
origin: [5.07, -8.25, 0]
negate: 0
occupied_thresh: 0.65
free_thresh: 0.25

BIN
maps/cps_half_new_ser.data Normal file

Binary file not shown.

Binary file not shown.

1
sudo Normal file
View File

@ -0,0 +1 @@
powersave tee /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor