diff --git a/Docs/ros_installation.md b/Docs/ros_installation.md index f7d3705e5..f94cd470f 100644 --- a/Docs/ros_installation.md +++ b/Docs/ros_installation.md @@ -32,7 +32,7 @@ First add the apt repository: * __Bridge for ROS Melodic:__ ```sh sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 81061A1A042F527D && -sudo add-apt-repository "deb [trusted=yes] http://34.227.255.250/carla-ros-bridge-melodic/ bionic main" +sudo add-apt-repository "deb [trusted=yes] http://dist.carla.org/carla-ros-bridge-melodic/ bionic main" ``` * __Bridge for ROS Kinetic:__ diff --git a/Docs/ros_msgs.md b/Docs/ros_msgs.md index 94f84949b..198a6403f 100644 --- a/Docs/ros_msgs.md +++ b/Docs/ros_msgs.md @@ -51,7 +51,9 @@ These messages are used to control the simulation while in synchronous mode. The | Field | Type | Description | | ----------- | ---- | ----------- | -| `command` | int8 | __PLAY__=0, __PAUSE__=1, __STEP_ONCE__=2 | +| `command` | int8 | __PLAY__=0
__PAUSE__=1
__STEP_ONCE__=2 | + +
!!! Important In synchronous mode, only the ROS bridge client is allowed to tick. @@ -133,16 +135,46 @@ These messages are used to publish lane invasions detected by a lane-invasion se | `header` | [Header](http://docs.ros.org/melodic/api/std_msgs/html/msg/Header.html) | Time stamp and frame ID when the message is published. | | `crossed_lane_markings` | int32[] | __LANE_MARKING_OTHER__=0
__LANE_MARKING_BROKEN__=1
__LANE_MARKING_SOLID__=2 | +--- +## CarlaScenario.msg + +Details for a test scenario. + +| Field | Type | Description | +| ---------------| ------------------ | --------------------------------------------- | +| `name` | string | Name of the scenario. | +| `scenario_file`| string | Test file for the scenario. | +| `destination` | geometry_msgs/Pose | Goal location of the scenario. | +| `target_speed` | float64 | Desired speed to drive at during the scenario | + +--- +## CarlaScenarioList.msg + +Contains a list a series of test scenarios to run in ScenarioRunner. + +| Field | Type | Description | +| ----------- | ------------------------------------ | ---------------------- | +| `scenarios` | [CarlaScenario](#carlascenariomsg)[] | The list of scenarios. | + +--- +## CarlaScenarioRunnerStatus.msg + +Represents the current state of the ScenarioRunner, that can be managed using an enum definition. + +| Field | Type | Description | +| -------- | ----- | -------------------------------------------------------------------------------------------------------------------------------------------- | +| `status` | uint8 | Current state of the scenario as an enum:
__STOPPED__=0
__STARTING__=1
__RUNNING__=2
__SHUTTINGDOWN__=3
__ERROR__=4 | + --- ## CarlaStatus.msg -Details the current world settings of hte simulation. +Details the current world settings of the simulation. -| Field | Type | Description | -| -------------------------- | ------- | ----------------------------- | -| `frame` | uint64 | Current framen umber. | -| `fixed_delta_seconds` | float32 | Simulation time between last and current step. | -| `synchronous_mode` | bool | If true, synchronous mode is enabled. | +| Field | Type | Description | +| -------------------------- | ------- | ------------------------------------------------------------- | +| `frame` | uint64 | Current frame number. | +| `fixed_delta_seconds` | float32 | Simulation time between last and current step. | +| `synchronous_mode` | bool | If true, synchronous mode is enabled. | | `synchronous_mode_running` | bool | True when the simulation is running. False when it is paused. | --- @@ -153,7 +185,7 @@ Contains a constant definition regarding the state of a traffic light. | Field | Type | Description | | -------------------------- | ------- | ----------------------------------------- | | `id` | uint32 | ID of the traffic light actor. | -| `state` | uint8 | __RED__=0,__YELLOW__=1, __GREEN__=2, __OFF__=3, __UNKNOWN__=4 | +| `state` | uint8 | __RED__=0
__YELLOW__=1
__GREEN__=2
__OFF__=3
__UNKNOWN__=4 | --- ## CarlaTrafficLightStatusList.msg diff --git a/Docs/start_quickstart.md b/Docs/start_quickstart.md index 9f2d20337..756287ada 100644 --- a/Docs/start_quickstart.md +++ b/Docs/start_quickstart.md @@ -36,7 +36,7 @@ Both methods will set CARLA ready to run. First, add the repository to the system: ```sh sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DB53A429E64554FC && -sudo add-apt-repository "deb [trusted=yes] http://34.227.255.250/carla-0.9.7/ bionic main" +sudo add-apt-repository "deb [trusted=yes] http://dist.carla.org/carla-0.9.7/ bionic main" ``` Then, simply install it. CARLA will be in the `/opt/` folder, where other software such as ROS install themselves: ```sh