Skip to content
This repository has been archived by the owner on Mar 23, 2024. It is now read-only.

Revert "Global Path Service" #31

Merged
merged 4 commits into from
Dec 5, 2023
Merged

Revert "Global Path Service" #31

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d307122
Revert "Global Path Service (#30)"
SPDonaghy Dec 5, 2023
cfd3d7c
Document mock global path
patrick-5546 Dec 5, 2023
28608a7
Update to latest version of sailbot workspace
patrick-5546 Dec 5, 2023
54bd807
Delete .markdownlint.json
patrick-5546 Dec 5, 2023
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
5 changes: 1 addition & 4 deletions .markdownlint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"default": true,
"MD013": {
"line_length": 120,
"code_blocks": false,
"tables": false
"line_length": 120
},
"MD004": {
"style": "dash"
Expand All @@ -14,7 +12,6 @@
"MD035": {
"style": "---"
},
"MD033": false,
"MD040": false,
"MD041": false,
"MD046": false
Expand Down
2 changes: 0 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ rosidl_generate_interfaces(${PROJECT_NAME}
${simulator_msg}
${simulator_action}

"srv/GlobalPath.srv"

# Add packages that above messages depend on below if needed
DEPENDENCIES std_msgs geometry_msgs
)
Expand Down
38 changes: 19 additions & 19 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ Formatting reminder:
1. Keep 'Type' column organized alphabetically
2. 'mock' version of topic should be after its common counterpart
--->
| Topic | File Name | Publisher | Subscriber(s) |
| ---------------------- | ------------------- | ------------------------------------ | ---------------------------------------------------|
| `ais_ships` | AISShips.msg | CanTrxRosIntf | Local Pathfinding, Local Transceiver |
| `mock_ais_ships` | AISShips.msg | Mock AIS | CanSimIntf |
| `batteries` | Batteries.msg | CanTrxRosIntf | Local Transceiver |
| `boat_sim_input` | CanSimToBoatSim.msg | CanSimIntf | Boat Simulator |
| `desired_heading` | DesiredHeading.msg | Local Pathfinding | CanTrxRosIntf |
| `data_sensors` | GenericSensors.msg | CanTrxRosIntf | Local Transceiver |
| `gps` | GPS.msg | CanTrxRosIntf | Controller, Local Transceiver, Local Pathfinding |
| `mock_gps` | GPS.msg | Boat Simulator | CanSimIntf |
| `local_path_data` | LPathData.msg | Local Pathfinding | Local Transceiver |
| `global_path` | GlobalPath.srv | Local Transceiver, Mock Global Path | Local Pathfinding |
| `sail_cmd` | SailCmd.msg | Controller | CanTrxRosIntf |
| `filtered_wind_sensor` | WindSensor.msg | CanTrxRosIntf | Controller, Local Transceiver, Local Pathfinding |
| `wind_sensors` | WindSensors.msg | CanTrxRosIntf | Local Transceiver |
| `mock_wind_sensors` | WindSensors.msg | Boat Simulator | CanSimIntf |
| Topic | Type | Publisher | Subscriber(s) |
| ---------------------- | -------------- | ------------------------------------ | -------------------------------------------------- |
| `ais_ships` | AISShips | CanTrxRosIntf | Local Pathfinding, Local Transceiver |
| `mock_ais_ships` | AISShips | Mock AIS | CanSimIntf |
| `batteries` | Batteries | CanTrxRosIntf | Local Transceiver |
| `boat_sim_input` | CanSimToBoatSim | CanSimIntf | Boat Simulator |
| `desired_heading` | DesiredHeading | Local Pathfinding | CanTrxRosIntf |
| `data_sensors` | GenericSensors | CanTrxRosIntf | Local Transceiver |
| `gps` | GPS | CanTrxRosIntf | Controller, Local Transceiver, Local Pathfinding |
| `mock_gps` | GPS | Boat Simulator | CanSimIntf |
| `local_path_data` | LPathData | Local Pathfinding | Local Transceiver |
| `global_path` | Path | Local Transceiver, Mock Global Path | Local Pathfinding |
| `sail_cmd` | SailCmd | Controller | CanTrxRosIntf |
| `filtered_wind_sensor` | WindSensor | CanTrxRosIntf | Controller, Local Transceiver, Local Pathfinding |
| `wind_sensors` | WindSensors | CanTrxRosIntf | Local Transceiver |
| `mock_wind_sensors` | WindSensors | Boat Simulator | CanSimIntf |

### Project-wide Internal Interfaces

Expand All @@ -55,9 +55,9 @@ ROS messages and services used in our [boat simulator](https://github.com/UBCSai

### Boat Simulator External Interfaces

| Topic | File Name | Publisher | Subscriber(s) |
| ---------------------- | ------------------ | ------------------------ | ------------------------------------------- |
| `mock_kinematics` | SimWorldState.msg | Simulator Physics Engine | Simulator Visualizer |
| Topic | Type | Publisher | Subscriber(s) |
| ---------------------- | -------------- | ------------------------ | ------------------------------------------- |
| `mock_kinematics` | SimWorldState | Simulator Physics Engine | Simulator Visualizer |

### Boat Simulator Actions

Expand Down
3 changes: 0 additions & 3 deletions srv/GlobalPath.srv
View file
Open in desktop

This file was deleted.

Loading