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.

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

[WIP] Merge develop/pr2 branch #1591

Open
wants to merge 74 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
bb4a370
add diagnos_ether_listener.py
Kanazawanaoaki Dec 16, 2021
b664e15
remove unwanted hoge
Kanazawanaoaki Dec 19, 2021
869d40e
rename file to diagnostics_ethercat_summarizer
Kanazawanaoaki Dec 19, 2021
a59731f
Update jsk_pr2_robot/jsk_pr2_startup/jsk_pr2_warning/diagnostics_ethe…
Kanazawanaoaki Apr 26, 2022
d1d03b5
Update jsk_pr2_robot/jsk_pr2_startup/jsk_pr2_warning/diagnostics_ethe…
Kanazawanaoaki Apr 26, 2022
7f405aa
Remove white space
Kanazawanaoaki Apr 26, 2022
0cfe745
tweet coral human pose estimator output
knorth55 Oct 8, 2019
3603778
add tweet_image_server for non-euslisp users
knorth55 May 18, 2021
d7c3bf1
enable monitor driver for pr2 kinect
May 11, 2022
40e48ee
refactor to check None in check_openni_node
May 11, 2022
a17a46a
check openni with raw image
May 11, 2022
fd59c9b
[jsk_pr2_startup] Add audible warning and sanity diagnostics
iory May 19, 2022
7be0309
[jsk_pr2_startup/warning] Add warning_blacklist.yaml
iory May 20, 2022
e6abab2
[jsk_pr2_startup/warning] Check compressed topics for data reduction …
iory May 24, 2022
5dbbce1
[jsk_pr2_startup/warning] Check audio topic for sanity diagnostics
iory May 24, 2022
860fd67
[jsk_pr2_startup] Fix joy node name in diagnostics analyzer
iory May 27, 2022
358d943
[jsk_pr2_startup] Ignore calibration stuck because PR2 speaks this er…
iory May 27, 2022
89341c1
[jsk_pr2_startup/warning] Ignore uncalibrated error
iory May 27, 2022
68cda26
Add roseus_resume interrupt and resume apps
Affonso-Gui Jun 7, 2022
a585d06
avoid dweet error in battery_logger
Jul 4, 2022
0315f2e
[jsk_pr2_startup/audible_warning] Add ignore time after runstop is en…
iory Jun 8, 2022
e493925
[jsk_pr2_startup/audible_warning] Tweet audible warning with image
iory Jun 8, 2022
33f6188
[jsk_pr2_startup/audible_warning] Fixed blacklist format at run_stop …
iory Jul 6, 2022
431f578
[jsk_pr2_startup] Run email_topic.py and smach_to_mail.py by default
tkmtnt7000 Aug 26, 2022
66add5b
[jsk_pr2_startup] Update node name of smach_to_mail to clarify
tkmtnt7000 Aug 31, 2022
ffe5602
[jsk_fetch_startup] catkin clean libcmt before build in daily update_…
708yamaguchi Jan 6, 2022
53657e9
[jsk_fetch_startup] update workspace script
sktometometo Apr 15, 2022
2029993
[jsk_fetch_startup] remove redundant section
sktometometo Apr 16, 2022
a3cbbfd
[jsk_fetch_startup] parameterize workspace path and make it as argument
sktometometo Apr 18, 2022
06a44c1
[jsk_fetch_startup] update update_workspace.sh
sktometometo Apr 18, 2022
38893d6
[jsk_fetch_startup] update workspace script
sktometometo Apr 19, 2022
06b462b
[jsk_fetch_startup] fix default workspace path
sktometometo Apr 20, 2022
a11e0e4
[jsk_fetch_startup] rename update_workspace.sh to update_workspace_ma…
sktometometo Apr 27, 2022
6d59d79
[jsk_fetch_startup] remove /tmp/update_workspace.sh after updating
sktometometo Jul 4, 2022
58ca236
[jsk_fetch_startup] fix mailbody in update_workspace script
sktometometo Sep 15, 2022
18d91bb
[jsk_fetch_startup] fix mailbody in update_workspace script
sktometometo Sep 15, 2022
e556301
[jsk_fetch_startup] Fix email body topic by jsk_robot_startup/EmailBody
tkmtnt7000 Sep 15, 2022
c458f0e
[jsk_fetch_startup] add comment to update_workspace_main.sh
sktometometo Sep 18, 2022
3793320
[jsk_fetch_startup, jsk_robot_startup] move update_workspace_main.sh …
knorth55 Sep 30, 2022
7bfdcd5
[jsk_pr2_startup] add update_workspace.sh for pr2
knorth55 Sep 30, 2022
f87f3a4
[jsk_robot_startup] add option to disable rosdep install
knorth55 Sep 30, 2022
b08e72f
[jsk_pr2_startup] do not run rosdep in pr2
knorth55 Sep 30, 2022
9323403
Apply suggestions from code review
knorth55 Sep 30, 2022
723c6e2
[jsk_robot_startup] fix typo in update_workspace_main.sh
knorth55 Sep 30, 2022
116ae95
use run instead of launch for app_manager
knorth55 Oct 12, 2022
6b50fe7
set allow_parallel false for personal use app
knorth55 Oct 12, 2022
1005496
use run for jsk_pr2_startup/tweet app
knorth55 Oct 12, 2022
c2b1de0
add smach_image_publisher in pr2.launch
knorth55 Oct 14, 2022
1d95242
update jsk_startup.rviz
knorth55 Oct 14, 2022
bd611d6
Add diagnostics_rx_error_summarizer.py
Kanazawanaoaki Oct 15, 2022
bd63e63
disable mongodb and dialogflow in pr2 gazebo
knorth55 Oct 18, 2022
64b398f
add pr2_gazebo_empty_world.launch
knorth55 Oct 18, 2022
3ff0bc6
Changed to show all devices with errors instead of max
Kanazawanaoaki Oct 18, 2022
6855b85
set imu_used false in pr2_bringup.launch because drifting
knorth55 Oct 19, 2022
bc900c3
change smach_to_mail rospara load
Oct 20, 2022
6f23659
smach_to_mail remap smach topic
knorth55 Oct 21, 2022
3cc8132
change node name to smach_to_mail
knorth55 Oct 21, 2022
0b1aa09
[jsk_robot_startup] Add timeout for smach notification
tkmtnt7000 Oct 11, 2022
e141259
[jsk_robot_startup] Fix sending notification every times if demo stuck
tkmtnt7000 Oct 13, 2022
aa68f94
[jsk_robot_startup] Refactor _stop_timer_cb
tkmtnt7000 Oct 13, 2022
4a036b0
[jsk_robot_startup] Add docstring to _stop_timer_cb
tkmtnt7000 Oct 13, 2022
47ba8ee
use latest smach_viewer
Oct 22, 2022
e85fe17
use pr2_mechanism_controllers 1.10.18
iory Nov 10, 2022
a438e71
update rosinstall to use jsk_pr2eus origin/master
knorth55 Nov 21, 2022
dd4ee88
Add nodes to adjust the volume of the speaking
Kanazawanaoaki Nov 3, 2022
8083cc3
Add volume adjust apps
Kanazawanaoaki Nov 13, 2022
8e85e5e
use enable and speak_enable for volume control
knorth55 Dec 5, 2022
b624679
launch app_scheduler in pr2.launch
knorth55 Dec 5, 2022
51eb96f
ad volume key in tweet-string func
knorth55 Nov 11, 2022
0c43b46
control volume by dynamic reconfigure
knorth55 Nov 11, 2022
87367ab
add enable and speak-enable dynamic reconfigure
knorth55 Nov 18, 2022
06ee694
camera sound only when speak is t
knorth55 Nov 18, 2022
47b15a0
set volume for play-sound
knorth55 Nov 18, 2022
3f9bc26
[jsk_robot_startup] Fix variable name; *speak* -> *speak-enable*
tkmtnt7000 Dec 2, 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
Prev Previous commit
Next Next commit
[jsk_robot_startup] add option to disable rosdep install
  • Loading branch information
knorth55 committed Feb 10, 2023
commit f87f3a49cc0b76f3b91d72479c8aa6b33b9adafe
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@

function usage()
{
echo "Usage: $0 [-w workspace_directory] [-r rosinstall_path] [-t robot_type] [-s skip keys] [-h] [-l]
echo "Usage: $0 [-w workspace_directory] [-r rosinstall_path] [-t robot_type] [-s skip keys] [-h] [-u] [-l]

optional arguments:
-h show this help
-w WORKSPACE_PATH specify target workspace
-r ROSINTALL_PATH rosinstall path
-t ROBOT robot type
-s SKIP_KEYS rosdep install skip keys
-u do not run apt-get upgrade and rosdep install
-l do not send a mail
"
}
Expand All @@ -19,10 +20,11 @@ function get_full_path()
echo "$(cd $(dirname $1) && pwd)/$(basename $1)"
}

ROSDEP_INSTALL=true
SEND_MAIL=true
WORKSPACE=$(get_full_path $HOME/ros/$ROS_DISTRO)

while getopts w:r:t:s:lh OPT
while getopts w:r:t:s:ulh OPT
do
case $OPT in
w)
Expand All @@ -37,6 +39,9 @@ do
s)
SKIP_KEYS=$OPTARG
;;
u)
ROSDEP_INSTALL=false
;;
l)
SEND_MAIL=false
;;
Expand Down Expand Up @@ -85,10 +90,14 @@ wstool foreach -t $WORKSPACE/src --git --shell 'branchname=$(git rev-parse --abb
wstool update -t $WORKSPACE/src
WSTOOL_UPDATE_RESULT=$?
# Rosdep Install
sudo apt-get update -y
rosdep update
rosdep install --from-paths $WORKSPACE/src --ignore-src -y -r --skip-keys $SKIP_KEYS
ROSDEP_INSTALL_RESULT=$?
if [ "${ROSDEP_INSTALL}" == "true" ]; then
sudo apt-get update -y;
rosdep update;
rosdep install --from-paths $WORKSPACE/src --ignore-src -y -r --skip-keys $SKIP_KEYS;
ROSDEP_INSTALL_RESULT=$?;
else
ROSDEP_INSTALL_RESULT=0;
fi
# Build workspace
cd $WORKSPACE
catkin clean aques_talk collada_urdf_jsk_patch libcmt -y
Expand Down