Skip to content

Commit 2211b53

Browse files
Standardize time units per REP-103 (#120)
1 parent 6cb6a12 commit 2211b53

File tree

4 files changed

+24
-13
lines changed

4 files changed

+24
-13
lines changed

configuration/packages/configuring-lifecycle.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ Parameters
3737
Description
3838
Whether to transition nodes to active state on startup.
3939

40-
:bond_timeout_ms:
40+
:bond_timeout:
4141

4242
==== =======
4343
Type Default
4444
---- -------
45-
int 4000
45+
int 4.0
4646
==== =======
4747

4848
Description
49-
Timeout to transition down all lifecycle nodes of this manager if a server is non-responsive, in ms. Set to ``0`` to deactivate. Recommended to be always larger than 300ms for all-local node discovery. Note: if a server cleanly exits the manager will immediately be notified.
49+
Timeout to transition down all lifecycle nodes of this manager if a server is non-responsive, in seconds. Set to ``0`` to deactivate. Recommended to be always larger than 0.3s for all-local node discovery. Note: if a server cleanly exits the manager will immediately be notified.
5050

5151
Example
5252
*******
@@ -56,4 +56,4 @@ Example
5656
ros__parameters:
5757
autostart: true
5858
node_names: ['controller_server', 'planner_server', 'recoveries_server', 'bt_navigator', 'waypoint_follower']
59-
bond_timeout_ms: 4000
59+
bond_timeout: 4.0

configuration/packages/configuring-map-server.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ Map Saver Parameters
1818
============== =======
1919
Type Default
2020
-------------- -------
21-
int 2000
21+
int 2.0
2222
============== =======
2323

2424
Description
25-
Timeout to attempt saving the map (ms).
25+
Timeout to attempt saving the map (seconds).
2626

2727
:free_thresh_default:
2828

@@ -158,7 +158,7 @@ Example
158158
159159
map_saver:
160160
ros__parameters:
161-
save_map_timeout: 5000
161+
save_map_timeout: 5.0
162162
free_thresh_default: 0.25
163163
occupied_thresh_default: 0.65
164164

configuration/packages/configuring-smac-planner.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@ Parameters
8787
Description
8888
Maximum number of iterations after the search is within tolerance before returning approximate path with best heuristic if exact path not found.
8989

90-
:``<name>``.max_planning_time_ms:
90+
:``<name>``.max_planning_time:
9191

9292
====== =======
9393
Type Default
9494
------ -------
95-
double 5000.0
95+
double 5.0
9696
====== =======
9797

9898
Description
99-
Maximum planning time in ms.
99+
Maximum planning time in seconds.
100100

101101
:``<name>``.analytic_expansion_ratio:
102102

@@ -261,7 +261,7 @@ Parameters
261261
====== =======
262262

263263
Description
264-
Maximum time spent smoothing, in seconds. If planning takes too long, this can be dynamically adjusted to ensure the planner meets ``max_planning_time_ms``.
264+
Maximum time spent smoothing, in seconds. If planning takes too long, this can be dynamically adjusted to ensure the planner meets ``max_planning_time``.
265265

266266
:``<name>``.smoother.optimizer.max_iterations:
267267

@@ -390,7 +390,7 @@ Example
390390
allow_unknown: false # allow traveling in unknown space
391391
max_iterations: -1 # maximum total iterations to search for before failing
392392
max_on_approach_iterations: 1000 # maximum number of iterations to attempt to reach goal once in tolerance, 2D only
393-
max_planning_time_ms: 2000.0 # max time in ms for planner to plan, smooth, and upsample. Will scale maximum smoothing and upsampling times based on remaining time after planning.
393+
max_planning_time: 2.0 # max time in seconds for planner to plan, smooth, and upsample. Will scale maximum smoothing and upsampling times based on remaining time after planning.
394394
smooth_path: false # Whether to smooth searched path
395395
motion_model_for_search: "DUBIN" # 2D Moore, Von Neumann; SE2 Dubin, Redds-Shepp
396396
angle_quantization_bins: 72 # For SE2 node: Number of angle bins for search, must be 1 for 2D node (no angle search)

migration/Foxy.rst

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,15 @@ Costmap2D ``current_`` Usage
8888

8989
In costmap2D, ``current_`` was used in ROS1 to represent whether a costmap layer was still enabled and actively processing data. It would be turned to ``false`` only under the situation that the expected update rate of a sensor was not met, so it was getting stale or no messages. It acts as a fail-safe for if a navigation sensor stops publishing.
9090

91-
In galactic, that will remain turn, however it will also add additional capabilities. It is also now set to ``false`` when a costmap is reset due to clearing or other navigation recoveries. That stops the robot from creating a plan or control effort until after the costmap has been updated at least once after a reset. This enables us to make sure we cannot ever create a path or control with a completely empty costmap, potentially leading to collisions, due to clearing the costmap and then immediately requesting an algorithm to run.
91+
In galactic, that will remain turn, however it will also add additional capabilities. It is also now set to ``false`` when a costmap is reset due to clearing or other navigation recoveries. That stops the robot from creating a plan or control effort until after the costmap has been updated at least once after a reset. This enables us to make sure we cannot ever create a path or control with a completely empty costmap, potentially leading to collisions, due to clearing the costmap and then immediately requesting an algorithm to run.
92+
93+
Standard time units in parameters
94+
*********************************
95+
To follow the SI units outlined in REP-103 to the "T" nodes below were modified to use seconds consistently in every parameter. Under each node name you can see which parameters changed to seconds instead of using milliseconds.
96+
97+
- lifecycle manager
98+
- ``bond_timeout_ms`` became ``bond_timeout`` in seconds
99+
- smac planner
100+
- ``max_planning_time_ms`` became ``max_planning_time`` in seconds
101+
- map saver
102+
- ``save_map_timeout`` in seconds

0 commit comments

Comments
 (0)