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

Commit

Permalink
Revert "Global Path Service" (#31)
Browse files Browse the repository at this point in the history 
* Revert "Global Path Service (#30)"

This reverts commit 3885add.

* Document mock global path

* Update to latest version of sailbot workspace

* Delete .markdownlint.json

---------

Co-authored-by: Patrick Creighton <[email protected]>
  • Loading branch information
@SPDonaghy @patrick-5546
SPDonaghy and patrick-5546 authored Dec 5, 2023
1 parent 3885add commit b52d212
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
test-definitions:
# sailbot_workspace: use locally-defined file
# other repositories: set to UBCSailbot/sailbot_workspace/.github/workflows/test_definitions.yml@<release>
uses: UBCSailbot/sailbot_workspace/.github/workflows/test_definitions.yml@v1.5.1
uses: UBCSailbot/sailbot_workspace/.github/workflows/test_definitions.yml@v1.6.0
# see https://github.com/UBCSailbot/sailbot_workspace/blob/main/.github/workflows/test_definitions.yml
# for documentation on the inputs and secrets below
with:
Expand Down
21 changes: 0 additions & 21 deletions .markdownlint.json
View file

This file was deleted.

2 changes: 0 additions & 2 deletions CMakeLists.txt
View file
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
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

This file was deleted.

0 comments on commit b52d212

Please sign in to comment.