Skip to content

Commit

Permalink
Merge branch 'main' into AutoDig-Improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Isopod00 committed Oct 25, 2024
2 parents 48fe448 + e81de02 commit 847ba94
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
[submodule "src/realsense-ros"]
path = src/realsense-ros
url = https://github.com/IntelRealSense/realsense-ros.git
branch = ros2-master
branch = 4.56.1
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,37 +213,36 @@ Follow [this](https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_apriltag/blob/main/d

Follow [these](https://docs.nvidia.com/jetson/archives/r36.4/DeveloperGuide/HR/ControllerAreaNetworkCan.html) instructions to enable CAN communication on Nvidia Jetson Orin.

1: Put the following in a .conf file in /modules-load.d/
1: Put the following in the `modules.conf` file in `/etc/modules-load.d/`

```
#Setting up the CAN bus
# Load the CAN bus kernel modules
can
can_raw
mttcan
#eof
```

2: Find the file /etc/modprobe.d/denylist-mttcan.conf and either delete it or comment out the one line in it (The filename might be .../blacklist-mttcan.conf)
2: Find the file `/etc/modprobe.d/denylist-mttcan.conf` and delete it if it exists (The filename might also be `/etc/modprobe.d/blacklist-mttcan.conf`)

3: Make a script called "can_startup.sh" in the root directory for the system, with the following contents:
3: Make a script called "can_startup.sh" in the `/root` directory of the system, with the following contents:
```
#! /usr/bin/sh
sudo ip link set can0 up type can bitrate 500000
sudo ip link set can1 up type can bitrate 500000
```

4: Run the command "sudo crontab -e" and put this line in the file that appears:
4: Run the command "sudo crontab -e" and add this line to the bottom of the file that appears:

```
@reboot sleep 5 && echo 'robot' | sudo -S sh /
can_startup.sh 2>&1 | logger -t mycmd
@reboot sleep 5 && echo 'robot' | sudo -S sh can_startup.sh 2>&1 | logger -t mycmd
```

And that should work. If it doesn't and you need to read the output of the crontab, use this command:
And that should work! If it doesn't and you need to read the log output of the crontab, use this command:

```
sudo grep 'mycmd' /var/log/syslog
sudo grep -a 'mycmd' /var/log/syslog
```
</details>

Expand Down
2 changes: 1 addition & 1 deletion src/realsense-ros
Submodule realsense-ros updated 36 files
+1 −1 .github/ISSUE_TEMPLATE.md
+37 −12 .github/workflows/main.yml
+98 −14 README.md
+16 −0 realsense2_camera/CHANGELOG.rst
+5 −3 realsense2_camera/CMakeLists.txt
+45 −0 realsense2_camera/examples/d500_tables/calib_config_example.json
+22 −1 realsense2_camera/include/base_realsense_node.h
+2 −1 realsense2_camera/include/constants.h
+1 −1 realsense2_camera/include/ros_utils.h
+2 −0 realsense2_camera/launch/rs_launch.py
+83 −0 realsense2_camera/launch/rs_multi_camera_launch_sync.py
+1 −1 realsense2_camera/package.xml
+133 −0 realsense2_camera/src/actions.cpp
+1 −0 realsense2_camera/src/realsense_node_factory.cpp
+13 −0 realsense2_camera/src/ros_utils.cpp
+59 −0 realsense2_camera/src/rs_node_setup.cpp
+10 −7 realsense2_camera/test/README.md
+2 −2 realsense2_camera/test/live_camera/test_camera_aligned_tests.py
+1 −1 realsense2_camera/test/live_camera/test_camera_all_profile_tests.py
+2 −3 realsense2_camera/test/live_camera/test_camera_fps_tests.py
+1 −1 realsense2_camera/test/live_camera/test_camera_imu_tests.py
+1 −1 realsense2_camera/test/live_camera/test_camera_point_cloud_tests.py
+73 −0 realsense2_camera/test/live_camera/test_camera_service_call.py
+2 −2 realsense2_camera/test/live_camera/test_camera_tf_tests.py
+1 −1 realsense2_camera/test/live_camera/test_d415_basic_tests.py
+2 −2 realsense2_camera/test/live_camera/test_d455_basic_tests.py
+2 −4 realsense2_camera/test/utils/pytest_live_camera_utils.py
+34 −7 realsense2_camera/test/utils/pytest_rs_utils.py
+8 −0 realsense2_camera_msgs/CHANGELOG.rst
+7 −0 realsense2_camera_msgs/CMakeLists.txt
+11 −0 realsense2_camera_msgs/action/TriggeredCalibration.action
+1 −1 realsense2_camera_msgs/package.xml
+4 −0 realsense2_camera_msgs/srv/CalibConfigRead.srv
+4 −0 realsense2_camera_msgs/srv/CalibConfigWrite.srv
+3 −0 realsense2_description/CHANGELOG.rst
+1 −1 realsense2_description/package.xml
2 changes: 1 addition & 1 deletion src/ros2socketcan_bridge
Submodule ros2socketcan_bridge updated 1 files
+17 −12 README.md

0 comments on commit 847ba94

Please sign in to comment.