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

Commit

Permalink
Updated readme & Added new .msg for CAN transceiver / Simulation Inte…
Browse files Browse the repository at this point in the history
…rface (#28)

* - Updated ais_ships, added mock_ais_ships
- Added sim_cmd, boat_cmd
- Updated readme for above and CAN transceiver

* Added md comment for formatting

* Update table with new subscribers

* Add Can to boat simulator topic

---------

Co-authored-by: Devon Friend <devon.fri.2000@gmail.com>
  • Loading branch information
colinli02 and DFriend01 authored Nov 25, 2023
1 parent f693350 commit 9820731
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 14 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ set(common_msg
# external
"msg/AISShips.msg"
"msg/Batteries.msg"
"msg/CanSimToBoatSim.msg"
"msg/DesiredHeading.msg"
"msg/GenericSensors.msg"
"msg/GPS.msg"
"msg/LPathData.msg"
"msg/Path.msg"
"msg/SailCmd.msg"
"msg/WindSensor.msg"
"msg/WindSensors.msg"

Expand Down
35 changes: 21 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,27 @@ documented in the `.msg` or `.srv` file associated with that interface.
ROS messages and services used across many ROS packages in the project.

### Project-wide External Interfaces

| Topic | Type | Publisher | Subscriber(s) |
| ---------------------- | -------------- | ------------------------ | ------------------------------------------- |
| `ais_ships` | AISShips | AIS Receiver | Local Pathfinding |
| `batteries` | Batteries | CAN Transceiver | Local Transceiver |
| `desired_heading` | DesiredHeading | Local Pathfinding | Controller, Boat Simulator |
| `data_sensors` | GenericSensors | CAN Transceiver | Local Transceiver |
| `global_path` | Path | Local Transceiver | Local Pathfinding |
| `gps` | GPS | CAN Transceiver | Local Transceiver, Local Pathfinding |
| `local_path_data` | LPathData | Local Pathfinding | Local Transceiver |
| `mock_gps` | GPS | Boat Simulator | CAN Transceiver |
| `filtered_wind_sensor` | WindSensor | CAN Transceiver | Local Transceiver, Local Pathfinding |
| `mock_wind_sensors` | WindSensors | Boat Simulator | CAN Transceiver |
| `wind_sensors` | WindSensors | CAN Transceiver | Local Transceiver |
<!---
Formatting reminder:
1. Keep 'Type' column organized alphabetically
2. 'mock' version of topic should be after its common counterpart
--->
| 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 | 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 Down
5 changes: 5 additions & 0 deletions msg/CanSimToBoatSim.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Data from the topic /desired_heading
DesiredHeading heading

# Data from the topic /sail_cmd
SailCmd sail_cmd
4 changes: 4 additions & 0 deletions msg/SailCmd.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Angle to rotate the trim tab relative to the mailsail
# Unit: degrees, 0° is the neutral position, Increases CW
# Range: -40° <= angle <= 40°
float32 trim_tab_angle_degrees

0 comments on commit 9820731

Please sign in to comment.