From 148f6a637f51a765bf3e55a0a2af4f888265a3c1 Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Mon, 28 Nov 2022 13:24:57 +0100 Subject: [PATCH 1/4] Rename l3xz- to l3xz_ wherever the old naming still persisted. --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6035490..f884d77 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -:floppy_disk: `l3xz-mapping` +:floppy_disk: `l3xz_mapping` ============================ -[![Spell Check status](https://github.com/107-systems/l3xz-mapping/actions/workflows/spell-check.yml/badge.svg)](https://github.com/107-systems/l3xz-mapping/actions/workflows/spell-check.yml) +[![Spell Check status](https://github.com/107-systems/l3xz_mapping/actions/workflows/spell-check.yml/badge.svg)](https://github.com/107-systems/l3xz_mapping/actions/workflows/spell-check.yml) This repository includes the ROS-based explorative mapping stack of L3X-Z for Elrob 2022. @@ -36,8 +36,8 @@ The stack consists of two parts tested under ROS1 Noetic Ninjemys. Part one runs ## Part 1 (the base station part) Clone the repository and go to host root: ~~~bash -git@github.com:107-systems/l3xz-mapping.git -cd l3xz-mapping/host +git@github.com:107-systems/l3xz_mapping.git +cd l3xz_mapping/host git submodule update --init ~~~ Build the docker container: @@ -62,8 +62,8 @@ sudo apt-get install ros-noetic-realsense2-camera chrony ~~~ Clone the repository and go to client root: ~~~bash -git@github.com:107-systems/l3xz-mapping.git -cd l3xz-mapping/client +git@github.com:107-systems/l3xz_mapping.git +cd l3xz_mapping/client git submodule update --init ~~~ Edit the following files according to Your setup: From ff081c472ec726657743f12391e76b0f1152befb Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Mon, 28 Nov 2022 13:28:28 +0100 Subject: [PATCH 2/4] By using --recursive during git clone you do not need to call "git submodule update init" later on. --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index f884d77..85fa648 100644 --- a/README.md +++ b/README.md @@ -36,9 +36,8 @@ The stack consists of two parts tested under ROS1 Noetic Ninjemys. Part one runs ## Part 1 (the base station part) Clone the repository and go to host root: ~~~bash -git@github.com:107-systems/l3xz_mapping.git +git clone --recursive https://github.com/107-systems/l3xz_mapping cd l3xz_mapping/host -git submodule update --init ~~~ Build the docker container: ~~~bash @@ -64,7 +63,6 @@ Clone the repository and go to client root: ~~~bash git@github.com:107-systems/l3xz_mapping.git cd l3xz_mapping/client -git submodule update --init ~~~ Edit the following files according to Your setup: * master_ip.conf: IP of base station @@ -143,4 +141,3 @@ Records waypoints according to Elrob log format with Unix timestamp and WSG84 co | `artifacts` | [] | List of artifact images | | `track_publishing_rate` | 1 | Period for publishing track rate | | `publish_track` | `true` | Enable publishing of track | - From c3f40bb0ea4014784849aec7da642199132e3695 Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Mon, 28 Nov 2022 13:29:22 +0100 Subject: [PATCH 3/4] Fixing writing of ELROB (all upper case, its an acronym). --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 85fa648..7a47f8c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ============================ [![Spell Check status](https://github.com/107-systems/l3xz_mapping/actions/workflows/spell-check.yml/badge.svg)](https://github.com/107-systems/l3xz_mapping/actions/workflows/spell-check.yml) -This repository includes the ROS-based explorative mapping stack of L3X-Z for Elrob 2022. +This repository includes the ROS-based explorative mapping stack of L3X-Z for ELROB 2022. The stack consists of two parts tested under ROS1 Noetic Ninjemys. Part one runs on a base station, does the mapping using RTAB-Map, data logging and comes with a browser frontend. Part two can be deployed to the Raspberry Pi on the robot. It's purpose is to read all the sensor data and transmit it to part one. @@ -103,7 +103,7 @@ Creates an odometry message from tf data. ### plotter -Plots robot track and OPIs according to Elrob rules into a map. The input map can be an image or data from a topic of type `nav_msgs/OccupancyGrid`. The OPIs to be plotted and the robot track are subscribed from a topic of type `l3xz_mapping/Track`. +Plots robot track and OPIs according to ELROB rules into a map. The input map can be an image or data from a topic of type `nav_msgs/OccupancyGrid`. The OPIs to be plotted and the robot track are subscribed from a topic of type `l3xz_mapping/Track`. #### Parameters | Name | Default | Description | @@ -120,7 +120,7 @@ Plots robot track and OPIs according to Elrob rules into a map. The input map ca ### recorder -Records waypoints according to Elrob log format with Unix timestamp and WSG84 coordinates with images of the artifacts. Also a track containing all waypoints can be published (e.g. for plotting). All the logs are based on an initial startpoint. +Records waypoints according to ELROB log format with Unix timestamp and WSG84 coordinates with images of the artifacts. Also a track containing all waypoints can be published (e.g. for plotting). All the logs are based on an initial startpoint. #### Service clients From c14f5eb90c011817d130ef8bd997e796c1fd6fc8 Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Mon, 28 Nov 2022 13:30:02 +0100 Subject: [PATCH 4/4] Ignore CLion folder .idea. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f2392c4..cdb41ab 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ **/devel **/build **/__pychache__ +.idea/