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/fetch branch #1765

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
d62207a
[jsk_tools] Add speak warnings node
iory Oct 29, 2018
83644d4
Add warn_stale option
iory May 12, 2022
3750577
Add is_leaf and filter function to jsk_tools'library
iory May 15, 2022
2ff889a
Refactor audible_warning
iory May 15, 2022
dd7ddf6
Add prefix to speaking
iory May 15, 2022
e189677
Refactor AudibleWarning node
iory May 15, 2022
e93e363
[jsk_tools/audible_warning] Use priority queue instead of history
iory May 16, 2022
3e45382
[jsk_tools/audible_warning] Enable run_stop to suppress audible warning
iory May 16, 2022
91ecd31
[jsk_tools/audible_warning] Add seconds_to_start_speaking option for …
iory May 16, 2022
2eb51a2
[jsk_tools/audible_warning] Enable language specification
iory May 16, 2022
aab38ff
[jsk_tools/audible_warning] Fixed namespace of diagnostics
iory May 16, 2022
003b586
[jsk_tools/audible_warning] Fixed typo language to arg2 and set defau…
iory May 16, 2022
03e2c6a
[jsk_tools/audible_warning] Wait until seconds_to_start_speaking the …
iory May 17, 2022
2fe97c2
[jsk_tools/audible_warning] Output error name
iory May 17, 2022
d65bacc
[jsk_tools/audible_warning] Check status is leaf node
iory May 17, 2022
793179b
[jsk_tools/audible_warning] Enable regex for blacklist
iory May 17, 2022
e9550ac
[jsk_tools/audible_warning] Add run_stop blacklist
iory May 17, 2022
917f853
[jsk_tools/audible_warning] Enable blacklist message option
iory May 17, 2022
3f9d7ab
[jsk_tools/audible_warning] Add blacklist messsage option
iory May 17, 2022
1f1e299
[jsk_tools/audible_warning] Add sample
iory May 17, 2022
f0aec04
[jsk_tools/audible_warning] Add test
iory May 17, 2022
9993337
[jsk_tools/diagnostics_utils] Import zip_longest for python2
iory May 17, 2022
27d2fe1
[jsk_tools/audible_warning] Use LooseVersion for python2
iory May 17, 2022
769ccc4
[jsk_tools/audible-warning] Set volume if it has volume property
iory May 17, 2022
9b24b9c
[jsk_tools/audible-warning] Fixed test name
iory May 17, 2022
188c2e8
[jsk_tools/audible_warning] Split sample diagnostics_analyzer
iory May 23, 2022
fb4536c
[jsk_tools] add rossetclient
sktometometo Jun 28, 2022
c6073bc
[audible_warning] Add diagnostics_level_to_str
iory May 28, 2022
012f514
[audible_warning] Add dynamic reconfigure parameters
iory May 28, 2022
7473d07
[audible_warning/sample] Fixed audible_warning node name
iory May 28, 2022
9bf9f1b
[audible_warning] Use dynamic reconfigure params
iory May 28, 2022
024f67b
[audible_warning] Add inflection_utils for camel_to_snake case
iory Jun 3, 2022
1ffabe7
[audible_warning] Add ignore after runstop time
iory May 28, 2022
b16778a
[audible_warning] Ignore if self.run_stop_(disabled|enabled)_time is …
iory Jun 3, 2022
b42daed
[audible_warning] Add docs for dynamic reconfigure's parameters
iory Jun 3, 2022
69757a4
[audible_warning] Move audible_warning.py to node_scripts.
iory Jun 6, 2022
78f3928
[audible_warning] Fixed lint test target path
iory Jun 6, 2022
8e119f6
[audible_warning] Fixed lint
iory Jun 6, 2022
1b10cb3
[audible_warning] Convert multiple space to one
iory Jun 7, 2022
a044fcd
[audible_warning] Convert colon symbol to english text
iory Jun 7, 2022
cf21b2c
[audible_warning] Add publishing text
iory Jun 7, 2022
42332db
[audible_warning] Add AudibleWarningClient for reconfigure
iory Jun 8, 2022
6d3d940
[audible_warning] Make speak_when_runstopped dynamic params
iory Jun 8, 2022
d38121c
[audible_warning] Don't add heap at first
iory Jun 8, 2022
d0c4d4e
[audible_warning] Deserialize image
iory Jun 8, 2022
2998324
[audible_warning] Fixed typo by adding ()
iory Jun 8, 2022
890dbc2
[audible_warning] Add loginfo to display runstop state
iory Jun 8, 2022
99c6aa9
[audible_warning] Add pseudo runstop publisher
iory Jun 8, 2022
5217806
[audible_warning] Add prefix + error name to original text
iory Jun 14, 2022
22c96e1
[jsk_tools/audible_warning] Modified default speak rate to speed up.
iory Jul 6, 2022
688ea1e
[jsk_tools/audible_warning] Add space to published original text.
iory Jul 6, 2022
22972c1
[jsk_tools/audible_warning] Set wait_speak_duration_time to wait acti…
iory Jul 6, 2022
c17036d
catch StopIteration when all images do not have stamp
knorth55 Sep 30, 2022
b302557
Merge pull request #1768 from knorth55/develop/fetch-jsk-rosbag-tools…
knorth55 Mar 20, 2023
deb6654
Merge branch 'master' into develop/fetch
knorth55 Mar 20, 2023
acd431e
auto lambda for c++14
knorth55 Mar 21, 2023
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
[audible_warning] Add publishing text
  • Loading branch information
iory authored and knorth55 committed Sep 30, 2022
commit cf21b2ce42eead490e9f8d29b87b9ca98d279826
11 changes: 11 additions & 0 deletions jsk_tools/node_scripts/audible_warning.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from diagnostic_msgs.msg import DiagnosticArray
from diagnostic_msgs.msg import DiagnosticStatus
from dynamic_reconfigure.server import Server
import std_msgs.msg
import rospy
from sound_play.msg import SoundRequest
from sound_play.msg import SoundRequestAction
Expand Down Expand Up @@ -56,6 +57,13 @@ def __init__(self, rate=1.0, wait=True,
self.speak_flag = True
self.language = language

self.pub_original_text = rospy.Publisher('~output/original_text',
std_msgs.msg.String,
queue_size=1)
self.pub_speak_text = rospy.Publisher('~output/text',
std_msgs.msg.String,
queue_size=1)

self.talk = actionlib.SimpleActionClient(
"/robotsound", SoundRequestAction)
self.talk.wait_for_server()
Expand Down Expand Up @@ -140,6 +148,9 @@ def run(self):
sentence = multiple_whitespace_to_one(sentence)
rospy.loginfo('audible warning error name "{}"'.format(e.name))
rospy.loginfo("audible warning talking: %s" % sentence)
self.pub_original_text.publish(e.message)
self.pub_speak_text.publish(
"audible warning talking: %s" % sentence)

goal = SoundRequestGoal()
goal.sound_request.sound = SoundRequest.SAY
Expand Down