Skip to content

Commit 3ab4106

Browse files
committed
[dialogflow_task_executive] merge dialogflow_intent_client package into dialogflow_task_executive
1 parent d03ed03 commit 3ab4106

File tree

12 files changed

+18
-81
lines changed

12 files changed

+18
-81
lines changed

dialogflow_intent_client/CMakeLists.txt

Lines changed: 0 additions & 46 deletions
This file was deleted.

dialogflow_intent_client/action/RegisterIntent.action

Lines changed: 0 additions & 5 deletions
This file was deleted.

dialogflow_intent_client/package.xml

Lines changed: 0 additions & 23 deletions
This file was deleted.

dialogflow_intent_client/requirements.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

dialogflow_task_executive/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,19 @@ find_package(catkin REQUIRED COMPONENTS
2121
add_message_files(
2222
FILES
2323
DialogResponse.msg
24+
IntentInfo.msg
2425
)
2526

2627
add_action_files(
2728
FILES
2829
DialogText.action
30+
RegisterIntent.action
31+
ListIntent.action
2932
)
3033

3134
generate_messages(
3235
DEPENDENCIES
36+
std_msgs
3337
actionlib_msgs
3438
)
3539

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
std_msgs/Empty request
22
---
3-
dialogflow_intent_client/IntentInfo[] intents
3+
dialogflow_task_executive/IntentInfo[] intents
44
bool done
55
---
66
string status
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dialogflow_task_executive/IntentInfo intent
2+
---
3+
bool done
4+
---
5+
string status

dialogflow_intent_client/launch/dialogflow_intent_client.launch renamed to dialogflow_task_executive/launch/dialogflow_intent_client.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<launch>
33
<arg name="credential" />
44
<node name="dialogflow_intent_client"
5-
pkg="dialogflow_intent_client" type="dialogflow_intent_node.py"
5+
pkg="dialogflow_task_executive" type="dialogflow_intent_node.py"
66
output="screen">
77
<rosparam subst_value="true">
88
google_cloud_credentials_json: $(arg credential)

dialogflow_intent_client/node_scripts/dialogflow_intent_node.py renamed to dialogflow_task_executive/node_scripts/dialogflow_intent_node.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env python
22

33
import actionlib
4-
from dialogflow_intent_client.msg import RegisterIntentAction, RegisterIntentGoal, RegisterIntentResult, RegisterIntentFeedback
5-
from dialogflow_intent_client.msg import ListIntentAction, ListIntentGoal, ListIntentResult, ListIntentFeedback
6-
from dialogflow_intent_client.msg import IntentInfo
4+
from dialogflow_task_executive.msg import RegisterIntentAction, RegisterIntentGoal, RegisterIntentResult, RegisterIntentFeedback
5+
from dialogflow_task_executive.msg import ListIntentAction, ListIntentGoal, ListIntentResult, ListIntentFeedback
6+
from dialogflow_task_executive.msg import IntentInfo
77
import google.cloud.dialogflow as df
88
from google.oauth2.service_account import Credentials
99
import rospy

0 commit comments

Comments
 (0)