Skip to content

Commit

Permalink
replace ROS_NAMESPACE with ROBOT_NAMESPACE
Browse files Browse the repository at this point in the history
  • Loading branch information
DominikN committed Jan 4, 2024
1 parent 5517f87 commit 9f156b6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.hardware
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ COPY run_healthcheck_node.sh /

COPY print-serial-number.py /usr/bin/

ENV ROS_NAMESPACE=
ENV ROBOT_NAMESPACE=

HEALTHCHECK --interval=5s --timeout=2s --start-period=10s --retries=6 \
CMD ["/healthcheck.sh"]
Expand Down
8 changes: 4 additions & 4 deletions demo/compose.build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ x-common-config:
ipc: host
environment:
- FASTRTPS_DEFAULT_PROFILES_FILE=/shm-only.xml
- ROS_DOMAIN_ID=10
# - ROS_DOMAIN_ID=10
- USER

services:
Expand All @@ -22,13 +22,13 @@ services:
privileged: true
devices:
- ${SERIAL_PORT:?err}
environment:
- ROS_NAMESPACE=rosbot
# environment:
# - ROS_NAMESPACE=rosbot
# command: tail -f /dev/null
# command: ros2 run rosbot_utils flash_firmware --usb
command: >
ros2 launch rosbot_bringup combined.launch.py
mecanum:=${MECANUM:-False}
serial_port:=$SERIAL_PORT
serial_baudrate:=576000
namespace:=rosbot
# namespace:=rosbot
2 changes: 1 addition & 1 deletion healthcheck.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) {
rclcpp::init(argc, argv);

std::string topic = "odometry/filtered";
if(const char* ns = std::getenv("ROS_NAMESPACE")) {
if(const char* ns = std::getenv("ROBOT_NAMESPACE")) {
topic = std::string(ns) + "/" + topic;
}

Expand Down

0 comments on commit 9f156b6

Please sign in to comment.