-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #304 from tue-robotics/feature/set-a-table
Feature/set a table
- Loading branch information
Showing
8 changed files
with
96 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
cmake_minimum_required(VERSION 2.8.3) | ||
project(challenge_set_a_table) | ||
|
||
find_package(catkin REQUIRED COMPONENTS | ||
) | ||
|
||
catkin_python_setup() | ||
|
||
catkin_package() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
# Responsible: Sam | ||
|
||
## Testing | ||
|
||
Launch procedure: | ||
``` | ||
amigo-start | ||
amigo-free-mode | ||
rosrun challenge_set_a_table challenge_set_a_table.py amigo | ||
``` | ||
|
||
## DONE | ||
|
||
- | ||
|
||
## TODO | ||
|
||
1. Plan - what is possible for execution | ||
2. Make scaffold with dummy functions | ||
3. Check for ready available functions and implement them | ||
4. Make / ask someone for missing functions |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
<?xml version="1.0"?> | ||
<package> | ||
<name>challenge_set_a_table</name> | ||
<version>1.0.0</version> | ||
<description>Set a table challenge from Robocup 2017 rulebook</description> | ||
|
||
<maintainer email="alexandrov.samuil@gmail.com">Sam Alexandrov</maintainer> | ||
|
||
<license>TODO</license> | ||
|
||
<buildtool_depend>catkin</buildtool_depend> | ||
<build_depend>robot_skills</build_depend> | ||
<build_depend>robot_smach_states</build_depend> | ||
<build_depend>rospy</build_depend> | ||
|
||
<run_depend>robot_skills</run_depend> | ||
<run_depend>robot_smach_states</run_depend> | ||
<run_depend>rospy</run_depend> | ||
</package> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
from distutils.core import setup | ||
from catkin_pkg.python_setup import generate_distutils_setup | ||
|
||
d = generate_distutils_setup( | ||
packages=['challenge_set_a_table'], | ||
package_dir={'': 'src'} | ||
) | ||
|
||
setup(**d) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
#! /usr/bin/env python | ||
|
||
import rospy | ||
import smach | ||
import time | ||
import os | ||
import datetime | ||
import math | ||
|
||
from robot_smach_states import Initialize, Say, WaitTime | ||
from robot_smach_states.util.startup import startup | ||
import robot_smach_states.util.designators as ds | ||
|
||
#from challenge_set_a_table_states import detect | ||
|
||
|
||
class ChallengeSetATable(smach.StateMachine): | ||
def __init__(self, robot): | ||
smach.StateMachine.__init__(self, outcomes=['Done','Aborted']) | ||
|
||
with self: | ||
smach.StateMachine.add('INITIALIZE', | ||
Initialize(robot), | ||
transitions={'initialized': 'END_CHALLENGE', | ||
'abort': 'Aborted'}) | ||
|
||
# End | ||
smach.StateMachine.add('END_CHALLENGE', | ||
Say(robot, "My work here is done, goodbye!"), | ||
transitions={'spoken': 'Done'}) | ||
|
||
ds.analyse_designators(self, "set_a_table") | ||
|
||
if __name__ == "__main__": | ||
rospy.init_node('set_a_table_exec') | ||
|
||
startup(ChallengeSetATable, challenge_name="challenge_set_a_table") |
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters