Skip to content

Commit

Permalink
Merge pull request #50 from linas/typo
Browse files Browse the repository at this point in the history
chatbot topic typo
  • Loading branch information
linas committed Jun 6, 2016
2 parents 9f87494 + 18d7ac2 commit 593c2ff
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/ros_commo.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@ def say_text(self, text_to_say):
def language_perceived_text_cb(self, text_heard):
self.puta.perceived_text(text_heard.data)

# The chat_heard message is of type chatbot/ChatMessage
# from chatbot.msg import ChatMessage
def chat_perceived_text_cb(self, chat_heard):
if chat_heard.confidence >= 50:
self.puta.perceived_text(chat_heard.utterance)
Expand Down Expand Up @@ -429,7 +431,8 @@ def __init__(self):

# Tell the TTS subsystem what to vocalize
# self.tts_pub = rospy.Publisher("tts", String, queue_size=1)
self.tts_pub = rospy.Publisher("chatbot_speech", String, queue_size=1)
# self.tts_pub = rospy.Publisher("/robot/chatbot_responses", String, queue_size=1)
self.tts_pub = rospy.Publisher("chatbot_responses", String, queue_size=1)

# Tell the chatbot what sort of affect to apply during
# TTS vocalization. (Huhh???)
Expand All @@ -441,6 +444,7 @@ def __init__(self):
self.language_perceived_text_cb)

# Chat infrastructure text.
# from chatbot.msg import ChatMessage
#rospy.Subscriber("/robot/speech", chatbot/ChatMessage,
#rospy.Subscriber("chatbot_speech", chatbot/ChatMessage,
# self.chat_perceived_text_cb)
Expand Down

0 comments on commit 593c2ff

Please sign in to comment.