Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(json-schema): align schema and config file names #5798

Merged
merged 1 commit into from
Dec 27, 2023
Merged

refactor(json-schema): align schema and config file names #5798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...dar_fusion_to_detected_object.schema.json → ...ect_fusion_to_detected_object.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"title": "Parameters for Radar Fusion to Detected Object Node",
"type": "object",
"definitions": {
"radar_fusion_to_detected_object": {
"radar_object_fusion_to_detected_object": {
"type": "object",
"properties": {
"node_params": {
Expand Down Expand Up @@ -104,7 +104,7 @@
"type": "object",
"properties": {
"ros__parameters": {
"$ref": "#/definitions/radar_fusion_to_detected_object"
"$ref": "#/definitions/radar_object_fusion_to_detected_object"
}
},
"required": ["ros__parameters"]
Expand Down
4 changes: 2 additions & 2 deletions .../schema/mission_planner_nodes.schema.json → ...lanner/schema/mission_planner.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"title": "Parameters for Mission Planner nodes",
"type": "object",
"definitions": {
"mission_planner_nodes": {
"mission_planner": {
"type": "object",
"properties": {
"map_frame": {
Expand Down Expand Up @@ -73,7 +73,7 @@
"type": "object",
"properties": {
"ros__parameters": {
"$ref": "#/definitions/mission_planner_nodes"
"$ref": "#/definitions/mission_planner"
}
},
"required": ["ros__parameters"]
Expand Down
4 changes: 2 additions & 2 deletions system/autoware_auto_msgs_adapter/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The `autoware_auto_msgs_adapter` package provides the following capabilities:

## Usage

Customize the adapter configuration by replicating and editing the `adapter_control.param.yaml` file located
Customize the adapter configuration by replicating and editing the `autoware_auto_msgs_adapter_control.param.yaml` file located
in the `autoware_auto_msgs_adapter/config` directory. Example configuration:

```yaml
Expand Down Expand Up @@ -90,7 +90,7 @@ To add a new message pair,
- Add a new entry to the [schema/autoware_auto_msgs_adapter.schema.json](schema/autoware_auto_msgs_adapter.schema.json) file in the `definitions:autoware_auto_msgs_adapter:properties:msg_type_target:enum` section.
- Learn more about JSON schema usage in [here](https://autowarefoundation.github.io/autoware-documentation/main/contributing/coding-guidelines/ros-nodes/parameters/#json-schema).
- Create a new config file by replicating and editing:
- [adapter_control.param.yaml](config/adapter_control.param.yaml)
- [autoware_auto_msgs_adapter_control.param.yaml](config/autoware_auto_msgs_adapter_control.param.yaml)
- Add a new test file by replicating and editing:
- [test_msg_ackermann_control_command.cpp](test/test_msg_ackermann_control_command.cpp)
- No need to edit the `CMakeLists.txt` file as it will automatically detect the new test file.
Expand Down
0 ...adapter/config/adapter_control.param.yaml → ...ware_auto_msgs_adapter_control.param.yaml
View file
Open in desktop
File renamed without changes.
0 ...sgs_adapter/config/adapter_map.param.yaml → ...autoware_auto_msgs_adapter_map.param.yaml
View file
Open in desktop
File renamed without changes.
0 ...pter/config/adapter_perception.param.yaml → ...e_auto_msgs_adapter_perception.param.yaml
View file
Open in desktop
File renamed without changes.
0 ...dapter/config/adapter_planning.param.yaml → ...are_auto_msgs_adapter_planning.param.yaml
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions system/autoware_auto_msgs_adapter/launch/autoware_auto_msgs_adapter.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<launch>
<arg name="control_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/adapter_control.param.yaml"/>
<arg name="map_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/adapter_map.param.yaml"/>
<arg name="perception_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/adapter_perception.param.yaml"/>
<arg name="planning_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/adapter_planning.param.yaml"/>
<arg name="control_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/autoware_auto_msgs_adapter_control.param.yaml"/>
<arg name="map_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/autoware_auto_msgs_adapter_map.param.yaml"/>
<arg name="perception_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/autoware_auto_msgs_adapter_perception.param.yaml"/>
<arg name="planning_param_path" default="$(find-pkg-share autoware_auto_msgs_adapter)/config/autoware_auto_msgs_adapter_planning.param.yaml"/>

<node pkg="autoware_auto_msgs_adapter" exec="autoware_auto_msgs_adapter_exe" name="autoware_auto_msgs_adapter_control" output="screen">
<param from="$(var control_param_path)"/>
Expand Down
Loading