Skip to content

Serial done better #187

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.

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

Merged
merged 33 commits into from
Feb 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
2c8efaa
Achille's modified launch file
Achllle Feb 16, 2024
f43129e
Merge branch 'type_not_set_fix'
Achllle Feb 17, 2024
9fa4715
Merge branch 'ina260'
Achllle Feb 17, 2024
259e3f3
Merge branch 'ina260'
Achllle Feb 17, 2024
d7b1075
Add ina260 launch to mod launch file
Achllle Feb 17, 2024
86cd97f
Track commands and battery state in rosbag
Achllle Feb 17, 2024
7490bab
Merge branch 'duty_mode'
Achllle Feb 24, 2024
c91252f
Merge remote-tracking branch 'origin/determine_ros_version_systemd2'
Achllle Feb 24, 2024
fe17afb
Merge branch 'custom_joy_node'
Achllle Feb 25, 2024
5d6fedf
duty mode button and angular scale
Achllle Feb 25, 2024
32744b8
Merge branch 'systemd_readme_fix'
Achllle Mar 25, 2024
9beaf7f
Simplified instructions for serial comms setup and switch to using pr…
Achllle Mar 31, 2024
7fb930d
Add more logs on connecting to roboclaws
Achllle Apr 21, 2024
c7f6f33
Merge branch 'nasa-jpl:master' into master
Achllle Feb 16, 2025
add291d
Update centered_pulse_widths
Achllle Feb 16, 2025
8d1de34
Merge branch 'master' of github.com:nasa-jpl/osr-rover-code into seri…
Achllle Feb 16, 2025
8b0ef2e
Update rpi.md
Achllle Feb 16, 2025
b02aa7d
Update RPI.md for ubuntu24
Achllle Feb 16, 2025
8395a45
Remove the LED screen package
Achllle Feb 16, 2025
5c93185
Update osr_gazebo dependencies, COLCON_IGNORE by default
Achllle Feb 16, 2025
4924a80
Fix deprecation warnings
Achllle Feb 16, 2025
81a3d0c
minor cleanup
Achllle Feb 16, 2025
0fcf8ed
Simplified instructions for serial comms setup and switch to using pr…
Achllle Mar 31, 2024
958511c
Update rpi.md
Achllle Feb 16, 2025
1b72883
Update RPI.md for ubuntu24
Achllle Feb 16, 2025
33f6f98
Merge branch 'serial_reorg' of github.com:Achllle/osr-rover-code into…
Achllle Feb 16, 2025
dc2a776
remove arduino markdown file used for led screen
Achllle Feb 16, 2025
a091af5
Add serial device rules
Achllle Feb 16, 2025
b3a544d
Update and improve instructions for RPi setup
Achllle Feb 16, 2025
4fad038
Add dependency for teleop_twist_joy back in
Achllle Feb 16, 2025
a901792
remove smbus dep since doesn't work, remove teleop twist joy dep sinc…
Achllle Feb 17, 2025
a8bc532
Documentation improvements and clarifications
Achllle Feb 17, 2025
2b3353e
Delete ROS/osr_bringup/launch/osr_mod_launch.py
Achllle Feb 17, 2025
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
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ Please refer to README files associated with each folder for insight in how comp
This is also the place to look when you have modifications on your rover that require the code or parameters to be
changed.

* The [ROS overview](ROS/README.md) gives an overview of the setup related to ROS and links to specific implementations
such as how the drive and corner commands are being calculated
* The [ROS overview](ROS/README.md) gives an overview of the setup related to ROS and links to specific implementations such as how the drive and corner commands are being calculated

## Setup

Expand Down
10 changes: 3 additions & 7 deletions ROS/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# ROS related code

## Catkin Packages
## Colcon Packages

There are 4 catkin packages contained in this repo. Each of these packages performs a specific purpose in the ROS
There are 4 colcon packages contained in this repo. Each of these packages performs a specific purpose in the ROS
structure, which are covered below

* `osr_control`: core code that talks to motor drivers and listens to commands
* `osr_interfaces`: custom message definitions
* `osr_bringup`: configuration and launch files for starting the rover
* ~~`led_screen`: code to communicate to the Arduino Uno to run the LED screen~~

Please refer to the docstrings wihin each file to gain understanding of the internals as that is the most
up-to-date and complete source of information.
Expand All @@ -26,14 +25,11 @@ up-to-date and complete source of information.
Note that a positive angular twist corresponds to a positive turning radius and turning left while driving forward.

### osr_interfaces

Contains custom message definitions used for the rover. Please refer to the message definitions for details
and units.

### osr_bringup

The osr_bringup package contains the launch file necessary to start all the ROS nodes,
as well as the operating parameters for the robot.

### led_screen

ROS nodes for interfacing with the screen.
198 changes: 0 additions & 198 deletions ROS/led_screen/CMakeLists.txt

This file was deleted.

19 changes: 0 additions & 19 deletions ROS/led_screen/package.xml

This file was deleted.

25 changes: 0 additions & 25 deletions ROS/led_screen/src/arduino_comm.py

This file was deleted.

Loading