Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Ros1 update #22

Merged
merged 8 commits into from
Jun 28, 2022
Merged

Ros1 update #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0358b80
Update playbooks.json
RoverRoboticsProduction Jun 23, 2022
0e91673
Remove unused ROS1 variants
RoverRoboticsProduction Jun 23, 2022
d3e1f39
Remove unused ROS1 variants
RoverRoboticsProduction Jun 23, 2022
63808b6
Update tool_version.json
RoverRoboticsProduction Jun 23, 2022
54771e7
Remove unused ROS1 variants
RoverRoboticsProduction Jun 23, 2022
458cc09
Update to remove unused variants and tool ver.
RoverRoboticsProduction Jun 23, 2022
20946f3
Update start.sh
RoverRoboticsProduction Jun 28, 2022
bb5a7df
Update shellscripts.json
RoverRoboticsProduction Jun 28, 2022
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
8 changes: 1 addition & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The first time you run rover tools run these commands to install necessary depen

```
cd ~/
git clone https://github.com/roverrobotics/rover_tools -b 1.1.1
git clone https://github.com/roverrobotics/rover_tools -b 1.1.3
cd ~/rover_tools
./install.sh
```
Expand All @@ -27,8 +27,6 @@ cd ~/rover_tools
<ol>
<li>pro_ros1</li>
<li>zero2_ros1</li>
<li>mini_ros1</li>
<li>pro2_ros1</li>
<li>Return to Rover Tools</li>
</ol>
</li>
Expand All @@ -38,8 +36,6 @@ cd ~/rover_tools
<li>pro_4WD_ros1</li>
<li>zero2_2WD_ros1</li>
<li>zero2_4WD_ros1</li>
<li>pro2_2WD_ros1</li>
<li>mini_2WD_ros1</li>
<li>Return to Rover Tools</li>
</ol>
</li>
Expand All @@ -49,8 +45,6 @@ cd ~/rover_tools
<li>pro_4WD_ros1</li>
<li>zero2_2WD_ros1</li>
<li>zero2_4WD_ros1</li>
<li>pro2_2WD_ros1</li>
<li>mini_2WD_ros1</li>
<li>Return to Rover Tools</li>
</ol>
</li>
Expand Down
30 changes: 1 addition & 29 deletions install/playbooks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,33 +26,5 @@
"rover_startup_script",
"setup_launch_zero2",
"start_rover_ros1_services"
],
"mini_ros1": [
"uninstall_scripts",
"prereq",
"rover_ros_subsystem_files",
"ds4",
"roverrobotics_ros1",
"can_service",
"rpilidar_repo",
"rover_test_repo",
"catkin_make",
"rover_startup_script",
"setup_launch_mini",
"start_rover_ros1_services"
],
"pro2_ros1": [
"uninstall_scripts",
"prereq",
"rover_ros_subsystem_files",
"ds4",
"roverrobotics_ros1",
"can_service",
"rpilidar_repo",
"rover_test_repo",
"catkin_make",
"rover_startup_script",
"setup_launch_mini",
"start_rover_ros1_services"
]
}
}
29 changes: 1 addition & 28 deletions install/shellscripts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,33 +262,6 @@
]
}
],
"setup_launch_pro2": [
{
"replace_launch_file": [
"sudo sed -i 's/placeholder/$KEY_PRO2_LAUNCH/g' /usr/sbin/roverrobotics",
"if grep \"$KEY_PRO2_LAUNCH\" /usr/sbin/roverrobotics",
"then",
" echo \"replace_launch_file: Success\" >> $KEY_VERIFICATION_FILE",
"else",
" echo \"replace_launch_file: Failure\" >> $KEY_VERIFICATION_FILE",
"fi"
]
}
],
"setup_launch_mini": [
{
"replace_launch_file": [
"sudo sed -i 's/placeholder/$KEY_MINI_LAUNCH/g' /usr/sbin/roverrobotics",
"if grep \"$KEY_MINI_LAUNCH\" /usr/sbin/roverrobotics",
"then",
" echo \"replace_launch_file: Success\" >> $KEY_VERIFICATION_FILE",
"else",
" echo \"replace_launch_file: Failure\" >> $KEY_VERIFICATION_FILE",
"fi"

]
}
],
"setup_launch_zero2": [
{
"replace_launch_file": [
Expand Down Expand Up @@ -374,7 +347,7 @@
"sudo rm -rf ~/.local/bin/ds4drv",
"sudo rm -rf /etc/udev/rules.d/50-ds4drv.rules #ps4 udev",
"sudo rm -rf /etc/udev/rules.d/55-roverrobotics.rules #rover udev",
"sudo rm -rf ~/rover_tools/testing/$KEYV_ROVER_TESTS #robot test",
"sudo rm -rf ~/rover_tools_ros1/testing/$KEYV_ROVER_TESTS #robot test",
"sudo rm -rf /etc/roverrobotics #env",
"sudo rm -rf /usr/sbin/roverrobotics #selector",
"sudo rm -rf /etc/systemd/system/roscore.service #ros service",
Expand Down
2 changes: 0 additions & 2 deletions install/variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
"$KEY_DS4_ROS": "https://github.com/naoki-mizuno/ds4_driver -b melodic-devel",
"$KEYV_DS4_ROS": "ds4_driver",
"$KEY_PRO_LAUNCH": "roverrobotics_driver pro_teleop.launch",
"$KEY_PRO2_LAUNCH": "roverrobotics_driver pro2_teleop.launch",
"$KEY_MINI_LAUNCH": "roverrobotics_driver mini_teleop.launch",
"$KEY_ZERO2_LAUNCH": "roverrobotics_driver zero2_teleop.launch",
"$KEY_VERIFICATION_FILE": "~/rr-install-verification.file"

Expand Down
2 changes: 1 addition & 1 deletion menu/tool_version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ToolVersion":"1.1.2"
"ToolVersion":"1.1.3"
}
35 changes: 1 addition & 34 deletions mfg_setup/setup_shellscripts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,37 +61,4 @@
"sudo systemctl start roverrobotics"
]
}
,
"pro2_ros1":
{
"mfg_mode": [
"sudo systemctl stop roverrobotics",
"killall roslaunch",
"source ~/catkin_ws/devel/setup.bash",
"screen -dm bash -c \"roslaunch roverrobotics_driver mfg_pro2.launch\""
],
"normal_mode": [
"killall roslaunch",
"killall screen",
"sudo systemctl start roscore",
"sudo systemctl start roverrobotics"
]
}
,
"mini_ros1":
{
"mfg_mode": [
"sudo systemctl stop roverrobotics",
"killall roslaunch",
"source ~/catkin_ws/devel/setup.bash",
"screen -dm bash -c \"roslaunch roverrobotics_driver mfg_mini.launch\""
],
"normal_mode": [
"killall roslaunch",
"killall screen",
"sudo systemctl start roscore",
"sudo systemctl start roverrobotics"
]
}

}
}
2 changes: 1 addition & 1 deletion start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pip3 install console-menu
pip3 install boto3
pip3 install pexpect
pip install six
cp -rf ../rover_tools ~/
cp -rf ../rover_tools_ros1 ~/
git clone https://github.com/roverrobotics/robottests ~/rover_tools/testing/robottests/
cwd=$(pwd)
cf="${cwd}/../credentials.json"
Expand Down