Skip to content

Commit 9895031

Browse files
Merge pull request #27 from cwruRobotics/readme-template-update
Readme template update
2 parents e5d4b70 + 11aaabd commit 9895031

File tree

36 files changed

+425
-105
lines changed

36 files changed

+425
-105
lines changed

README.md

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,13 @@ Then create a workspace:
1313

1414
If you're using VSCode, access WSL by opening VSCode, pressing `ctrl`+`` ` `` (below the `esc` key), clicking the dropdown arrow on the right and selecting `Ubuntu (WSL)`. You can also view your WSL files by opening `File Explorer > Linux (bottom left) > Ubuntu > home > your Ubuntu username`.
1515

16-
Run
17-
18-
<!-- ``` bash
19-
mkdir -p rov_23_ws/src
20-
```
21-
22-
```bash
23-
cd rov_23_ws/
24-
``` -->
25-
2616
```bash
2717
git clone --recurse-submodules git@github.com:cwruRobotics/rov-24.git
2818
```
2919

30-
<!-- (the src is important) -->
31-
3220
If you've never contributed to a git repository before, you might receive an error message saying you don't have access. In that case visit [this tutorial](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/about-ssh) to set up SSH for local GitHub access.
3321

34-
If you don't have `ros2_video_streamer` in the new `src` folder, run this:
22+
If you don't have `ros2_video_streamer` in the `src` folder, run this:
3523

3624
```bash
3725
git submodule update --init --recursive
@@ -73,7 +61,7 @@ Make sure you're updated (only on the first build or if something breaks)
7361
rosdep update --rosdistro=$ROS_DISTRO
7462
```
7563

76-
Install dependecies (only on the first build or if something breaks)
64+
Install dependencies (only on the first build or if something breaks)
7765

7866
```bash
7967
rosdep install --from-paths src --ignore-src -r -y

doc/TEMPLATE.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ https://github.com/leggedrobotics/ros_best_practices/blob/main/ros_package_templ
88

99
This is a template: replace, remove, and add where required. Describe here what this package does and what it's meant for in a few sentences.
1010

11-
* **Author: John Doe**
12-
1311
## Installation
1412

1513
Describe any dependencies not install by rosdep

src/interfaces/README.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# interfaces
2+
3+
## Overview
4+
5+
This is the package for all our msg, srv, and action definitions.
6+
7+
## Msg files
8+
9+
[CameraControllerSwitch.msg](msg/CameraControllerSwitch.msg)
10+
11+
Used for toggling through camera feeds in the pilot gui.
12+
13+
[Manip.msg](msg/Manip.msg)
14+
15+
Used for toggling manipulators on and off.
16+
17+
[TaskFeedback.msg](msg/TaskFeedback.msg)
18+
19+
Used for communicating current task.
20+
21+
## Srv files
22+
23+
[TaskRequest.srv](srv/TaskRequest.srv)
24+
25+
Used for communicating current task and receiving response.
26+
27+
## Action files
28+
29+
[BasicTask.action](action/BasicTask.action)
30+
31+
BasicTask responds with a string.
32+
33+
[Example.action](action/Example.action)
34+
35+
An example action.

src/interfaces/package.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>interfaces</name>
5-
<version>0.0.0</version>
5+
<version>1.0.0</version>
66
<description>MATE ROV Custom ROS Interfaces</description>
77
<maintainer email="bwp18@case.edu">Benjamin Poulin</maintainer>
8-
<maintainer email="ery12@case.edu">ericy</maintainer>
8+
<maintainer email="ery12@case.edu">Eric Yarnot</maintainer>
9+
<maintainer email="rmc170@case.edu">Michael Carlstrom</maintainer>
10+
911
<license>Apache License 2.0</license>
1012

1113
<buildtool_depend>ament_cmake</buildtool_depend>

src/pi/camera_streamer/README.md

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
1-
# Camera Streaming
21

3-
## Pi & Pi Compute Module
2+
# camera_streamer
43

5-
IP: `192.168.2.2`
4+
## Overview
65

7-
Username: `rov`
6+
Currently launches our regular cameras.
87

9-
Password: `rov12345`
10-
11-
## Symlinks are auto-generated by V4L2
8+
### Symlinks are auto-generated by V4L2
129

1310
`ls /dev/v4l/by-id` for id based symlinks
1411

1512
`ls /dev/v4l/by-path` for usb slot based symlinks
13+
14+
## Usage
15+
16+
Run the main launch file with
17+
18+
```bash
19+
ros2 launch camera_streamer camera_launch.py
20+
```
21+
22+
## Launch files
23+
24+
* **camera_launch.py:** Launches 2 v4l2_camera_node to manage our cameras.

src/pi/camera_streamer/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>camera_streamer</name>
5-
<version>0.0.0</version>
5+
<version>1.0.0</version>
66
<description>Capture video from usb and pi cameras and send it as MJPEG streams on ROS topics</description>
77
<maintainer email="noah@mollerstuen.com">Noah Mollerstuen</maintainer>
88
<license>Apches License 2.0</license>

src/pi/camera_streamer/setup.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
from setuptools import setup
2-
from glob import glob
31
import os
2+
from glob import glob
3+
4+
from setuptools import setup
45

56
package_name = 'camera_streamer'
67

78
setup(
89
name=package_name,
9-
version='0.0.0',
10+
version='1.0.0',
1011
packages=[package_name],
1112
data_files=[
1213
('share/ament_index/resource_index/packages',
@@ -20,7 +21,7 @@
2021
zip_safe=True,
2122
maintainer='Noah Mollerstuen',
2223
maintainer_email='noah@mollerstuen.com',
23-
description='contains camera information aswell as camera launch files',
24+
description='contains camera information as well as camera launch files',
2425
license='Apaches License 2.0',
2526
tests_require=['pytest'],
2627
entry_points={

src/pi/manipulators/README.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# manipulators
2+
3+
## Overview
4+
5+
This package is used to toggle manipulators plugged into the I2C bus on the motherboard.
6+
7+
## Installation
8+
9+
These should be done for you but, in case something has gone wrong use these command and it should fix your installation.
10+
11+
```bash
12+
git submodule add git@github.com:leloup314/TCA9555.git src/pi/manipulators/TCA9555
13+
```
14+
15+
```bash
16+
pip install wiringpi
17+
```
18+
19+
## Usage
20+
21+
Run the main node with
22+
23+
```bash
24+
ros2 run manipulators manipulator
25+
```
26+
27+
Run the test node with
28+
29+
```bash
30+
ros2 run manipulators test
31+
```
32+
33+
## Launch files
34+
35+
* **manip_launch.py:** Launches the manipulators node.
36+
37+
## Nodes
38+
39+
### manipulator
40+
41+
On receiving a msg it toggles a manipulator on or off.
42+
43+
#### Subscribed Topics
44+
45+
* **`/manipulator_control`** ([msg/Manip])
46+
47+
The control msg for activating manipulators.
48+
49+
### test
50+
51+
Sends on and off signals to the IC2 board to confirm it is working. There is no ROS features being used.
52+
53+
[msg/Manip]:../../interfaces/msg/Manip.msg

src/pi/manipulators/package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>manipulators</name>
5-
<version>0.0.0</version>
5+
<version>1.0.0</version>
66
<description>Code for manipulators.</description>
7+
<maintainer email="gcm49@case.edu">Georgia Martinez</maintainer>
78
<maintainer email="rmc170@case.edu">Michael Carlstrom</maintainer>
89
<license>Apache License, Version 2.0</license>
910

src/pi/manipulators/setup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import os
2-
from glob import glob
3-
from setuptools import setup
42
import sys
3+
from glob import glob
54

5+
from setuptools import setup
66

77
major_num = sys.version_info[0]
88
minor_num = sys.version_info[1]
@@ -11,7 +11,7 @@
1111

1212
setup(
1313
name=package_name,
14-
version='0.0.0',
14+
version='1.0.0',
1515
packages=[package_name],
1616
data_files=[
1717
('share/ament_index/resource_index/packages',
@@ -25,8 +25,8 @@
2525
],
2626
install_requires=['setuptools', 'bitstring', 'wiringpi'],
2727
zip_safe=True,
28-
maintainer='taz',
29-
maintainer_email='tzupfer@gmail.com',
28+
maintainer='Georgia Martinez, Michael Carlstrom',
29+
maintainer_email='gcm49@case.edu, rmc170@case.edu',
3030
description='Code for manipulators',
3131
license='Apache 2.0',
3232
tests_require=['pytest'],

0 commit comments

Comments
 (0)