[Fawkes Git] branch/thofmann/skills-interface-ids: created (0.5.0-3330-gfe8b7ff)

Till Hofmann hofmann at kbsg.rwth-aachen.de
Mon Sep 5 15:54:13 CEST 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, thofmann/skills-interface-ids has been created
        at  fe8b7ff8f5bf1439f0c162d06fd727f55dda2bab (commit)

http://git.fawkesrobotics.org/fawkes.git/thofmann/skills-interface-ids

- *Log* ---------------------------------------------------------------
commit fe8b7ff8f5bf1439f0c162d06fd727f55dda2bab
Author:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 15:51:45 2016 +0200
Commit:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 15:51:45 2016 +0200

    skills: add interface IDs to the interface dependencies in all skills
    
    The interface ID must now be specified as part of the interface
    dependencies.

http://git.fawkesrobotics.org/fawkes.git/commit/fe8b7ff
http://trac.fawkesrobotics.org/changeset/fe8b7ff

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------


- *Diffs* -------------------------------------------------------------

- *commit* fe8b7ff8f5bf1439f0c162d06fd727f55dda2bab - - - - - - - - - -
Author:  Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 15:51:45 2016 +0200
Subject: skills: add interface IDs to the interface dependencies in all skills

 src/lua/skills/generic/advanced/katana_grab.lua    |    2 +-
 .../skills/generic/advanced/katana_grab_any.lua    |    2 +-
 src/lua/skills/generic/advanced/katana_put.lua     |    2 +-
 src/lua/skills/generic/goto.lua                    |    4 ++--
 src/lua/skills/generic/jaco.lua                    |    6 +++---
 src/lua/skills/generic/jaco_bimanual.lua           |    2 +-
 src/lua/skills/generic/katana.lua                  |    2 +-
 src/lua/skills/generic/katana_approach.lua         |    2 +-
 src/lua/skills/generic/katana_rel.lua              |    2 +-
 src/lua/skills/generic/ppgoto.lua                  |    2 +-
 src/lua/skills/generic/relgoto.lua                 |    2 +-
 src/lua/skills/generic/transrot.lua                |    2 +-
 src/lua/skills/generic/turn.lua                    |    2 +-
 src/lua/skills/nao/getup.lua                       |    2 +-
 src/lua/skills/nao/led.lua                         |    4 ++--
 src/lua/skills/nao/naorelgoto.lua                  |    4 ++--
 src/lua/skills/nao/naostrafe.lua                   |    2 +-
 src/lua/skills/nao/park.lua                        |    4 ++--
 src/lua/skills/nao/servo.lua                       |    6 +++---
 src/lua/skills/nao/soccer/kick.lua                 |    2 +-
 src/lua/skills/nao/standup.lua                     |    2 +-
 src/lua/skills/nao/stop.lua                        |    2 +-
 src/lua/skills/nao/walk.lua                        |    2 +-
 23 files changed, 31 insertions(+), 31 deletions(-)

_Diff for modified files_:
diff --git a/src/lua/skills/generic/advanced/katana_grab.lua b/src/lua/skills/generic/advanced/katana_grab.lua
index e14efc9..373397f 100644
--- a/src/lua/skills/generic/advanced/katana_grab.lua
+++ b/src/lua/skills/generic/advanced/katana_grab.lua
@@ -27,7 +27,7 @@ name               = "katana_grab"
 fsm                = SkillHSM:new{name=name, start="INIT", debug=false}
 depends_skills     = {"katana", "katana_rel", "or_object"}
 depends_interfaces = {
-   {v = "katanaarm", type = "KatanaInterface"}
+   {v = "katanaarm", id = "Katana", type = "KatanaInterface"}
 }
 
 documentation      = [==[Katana grabbing skill
diff --git a/src/lua/skills/generic/advanced/katana_grab_any.lua b/src/lua/skills/generic/advanced/katana_grab_any.lua
index 99c7f51..84007f2 100644
--- a/src/lua/skills/generic/advanced/katana_grab_any.lua
+++ b/src/lua/skills/generic/advanced/katana_grab_any.lua
@@ -27,7 +27,7 @@ name               = "katana_grab_any"
 fsm                = SkillHSM:new{name=name, start="INIT", debug=true}
 depends_skills     = {"katana", "katana_rel", "katana_approach", "or_object", "say"}
 depends_interfaces = {
-   {v = "katanaarm", type = "KatanaInterface"}
+   {v = "katanaarm", id = "Katana", type = "KatanaInterface"}
 }
 
 documentation      = [==[Katana grabbing skill
diff --git a/src/lua/skills/generic/advanced/katana_put.lua b/src/lua/skills/generic/advanced/katana_put.lua
index 5d27714..eab530e 100644
--- a/src/lua/skills/generic/advanced/katana_put.lua
+++ b/src/lua/skills/generic/advanced/katana_put.lua
@@ -27,7 +27,7 @@ name               = "katana_put"
 fsm                = SkillHSM:new{name=name, start="INIT"}
 depends_skills     = {"katana", "or_object"}
 depends_interfaces = {
-   {v = "katanaarm", type = "KatanaInterface"}
+   {v = "katanaarm", id = "Katana", type = "KatanaInterface"}
 }
 
 documentation      = [==[Katana putting skill
diff --git a/src/lua/skills/generic/goto.lua b/src/lua/skills/generic/goto.lua
index 6d78cae..bed5fdc 100644
--- a/src/lua/skills/generic/goto.lua
+++ b/src/lua/skills/generic/goto.lua
@@ -27,8 +27,8 @@ name               = "goto"
 fsm                = SkillHSM:new{name=name, start="GOTO"}
 depends_skills     = {"relgoto"}
 depends_interfaces = {
-   {v = "pose", type = "Position3DInterface"},
-   {v = "navigator", type = "NavigatorInterface"}
+   {v = "pose", id = "Pose", type = "Position3DInterface"},
+   {v = "navigator", id = "Navigator", type = "NavigatorInterface"}
 }
 
 documentation      = [==[Global goto skill.
diff --git a/src/lua/skills/generic/jaco.lua b/src/lua/skills/generic/jaco.lua
index d09f4ac..ded8f54 100644
--- a/src/lua/skills/generic/jaco.lua
+++ b/src/lua/skills/generic/jaco.lua
@@ -33,9 +33,9 @@ function use_skill(skill_name, iface_name)
    M.depends_skills     = nil
    M.depends_interfaces = {
       --{v = iface_name, type = "JacoInterface"},
-      {v = "jacoarm", type = "JacoInterface"},
-      {v = "jacoarm_left", type = "JacoInterface"},
-      {v = "jacoarm_right", type = "JacoInterface"}
+      {v = "jacoarm", id = "JacoArm", type = "JacoInterface"},
+      {v = "jacoarm_left", id = "JacoArm Left", type = "JacoInterface"},
+      {v = "jacoarm_right", id = "JacoArm Right" type = "JacoInterface"}
    }
 
    M.documentation      = [==[Kinova Jaco arm skill.
diff --git a/src/lua/skills/generic/jaco_bimanual.lua b/src/lua/skills/generic/jaco_bimanual.lua
index 31eca9c..fde5d33 100644
--- a/src/lua/skills/generic/jaco_bimanual.lua
+++ b/src/lua/skills/generic/jaco_bimanual.lua
@@ -27,7 +27,7 @@ name               = "jaco_bimanual"
 fsm                = SkillHSM:new{name=name, start="INIT", debug=true}
 depends_skills     = nil
 depends_interfaces = {
-   {v = "jaco_bi", type = "JacoBimanualInterface"}
+   {v = "jaco_bi", id = "JacoArm Bimanual", type = "JacoBimanualInterface"}
 }
 
 documentation      = [==[
diff --git a/src/lua/skills/generic/katana.lua b/src/lua/skills/generic/katana.lua
index 906b648..12bcb89 100644
--- a/src/lua/skills/generic/katana.lua
+++ b/src/lua/skills/generic/katana.lua
@@ -27,7 +27,7 @@ name               = "katana"
 fsm                = SkillHSM:new{name=name, start="DECIDE_MODE"}
 depends_skills     = nil
 depends_interfaces = {
-   {v = "katanaarm", type = "KatanaInterface"}
+   {v = "katanaarm", id = "Katana", type = "KatanaInterface"}
 }
 
 documentation      = [==[Katana skill.
diff --git a/src/lua/skills/generic/katana_approach.lua b/src/lua/skills/generic/katana_approach.lua
index f97aeb4..930163f 100644
--- a/src/lua/skills/generic/katana_approach.lua
+++ b/src/lua/skills/generic/katana_approach.lua
@@ -27,7 +27,7 @@ name               = "katana_approach"
 fsm                = SkillHSM:new{name=name, start="INIT"}
 depends_skills     = {"katana_rel"}
 depends_interfaces = {
-   {v = "katanaarm", type = "KatanaInterface"}
+   {v = "katanaarm", id = "Katana", type = "KatanaInterface"}
 }
 
 documentation      = [==[Katana approaching
diff --git a/src/lua/skills/generic/katana_rel.lua b/src/lua/skills/generic/katana_rel.lua
index 505fb02..9cc5bad 100644
--- a/src/lua/skills/generic/katana_rel.lua
+++ b/src/lua/skills/generic/katana_rel.lua
@@ -27,7 +27,7 @@ name               = "katana_rel"
 fsm                = SkillHSM:new{name=name, start="INIT"}
 depends_skills     = {"katana"}
 depends_interfaces = {
-   {v = "katanaarm", type = "KatanaInterface"}
+   {v = "katanaarm", id = "Katana", type = "KatanaInterface"}
 }
 
 documentation      = [==[Katana straight movement skill
diff --git a/src/lua/skills/generic/ppgoto.lua b/src/lua/skills/generic/ppgoto.lua
index 1b30683..264d025 100644
--- a/src/lua/skills/generic/ppgoto.lua
+++ b/src/lua/skills/generic/ppgoto.lua
@@ -27,7 +27,7 @@ name               = "ppgoto"
 fsm                = SkillHSM:new{name=name, start="PPGOTO", debug=true}
 depends_skills     = nil
 depends_interfaces = {
-   {v = "ppnavi", type = "NavigatorInterface"}
+   {v = "ppnavi", id = "Pathplan", type = "NavigatorInterface"}
 }
 
 documentation      = [==[Pathplan goto skill.
diff --git a/src/lua/skills/generic/relgoto.lua b/src/lua/skills/generic/relgoto.lua
index 68b15e8..656147e 100644
--- a/src/lua/skills/generic/relgoto.lua
+++ b/src/lua/skills/generic/relgoto.lua
@@ -27,7 +27,7 @@ name               = "relgoto"
 fsm                = SkillHSM:new{name=name, start="INIT", debug=false}
 depends_skills     = nil
 depends_interfaces = {
-   {v = "navigator", type = "NavigatorInterface"}
+   {v = "navigator", id = "Navigator", type = "NavigatorInterface"}
 }
 
 documentation      = [==[Relative goto skill.
diff --git a/src/lua/skills/generic/transrot.lua b/src/lua/skills/generic/transrot.lua
index 8072c62..3ee2e07 100644
--- a/src/lua/skills/generic/transrot.lua
+++ b/src/lua/skills/generic/transrot.lua
@@ -27,7 +27,7 @@ name               = "transrot"
 fsm                = SkillHSM:new{name=name, start="TRANSROT", debug=false}
 depends_skills     = nil
 depends_interfaces = {
-   {v = "motor", type = "MotorInterface"}
+   {v = "motor", id = "Motor", type = "MotorInterface"}
 }
 
 documentation      = [==[Trans/rot via MotorInterface.
diff --git a/src/lua/skills/generic/turn.lua b/src/lua/skills/generic/turn.lua
index a28125f..228e8cb 100644
--- a/src/lua/skills/generic/turn.lua
+++ b/src/lua/skills/generic/turn.lua
@@ -27,7 +27,7 @@ name               = "turn"
 fsm                = SkillHSM:new{name=name, start="TURN"}
 depends_skills     = nil
 depends_interfaces = {
-   {v = "navigator", type = "NavigatorInterface"}
+   {v = "navigator", type = "NavigatorInterface", id = "Navigator"}
 }
 
 documentation      = [==[Turn on the spot.
diff --git a/src/lua/skills/nao/getup.lua b/src/lua/skills/nao/getup.lua
index 1b8da21..4fac445 100644
--- a/src/lua/skills/nao/getup.lua
+++ b/src/lua/skills/nao/getup.lua
@@ -27,7 +27,7 @@ name               = "getup"
 fsm                = SkillHSM:new{name=name, start="GETUP"}
 depends_skills     = nil
 depends_interfaces = {
-   {v = "naomotion", type = "HumanoidMotionInterface"}
+   {v = "naomotion", id = "NaoQi Motion", type = "HumanoidMotionInterface"}
 }
 
 documentation      = [==[Get the robot up to standing position.
diff --git a/src/lua/skills/nao/led.lua b/src/lua/skills/nao/led.lua
index e773e4f..a494e36 100644
--- a/src/lua/skills/nao/led.lua
+++ b/src/lua/skills/nao/led.lua
@@ -35,8 +35,8 @@ depends_interfaces = {
    { v = "rfootled_red", id = "Nao LED RFoot/Red", type = "LedInterface" },
    { v = "rfootled_green", id = "Nao LED RFoot/Green", type = "LedInterface" },
    { v = "rfootled_blue", id = "Nao LED RFoot/Blue", type = "LedInterface" },
-   { v = "ear_leds", type = "LedInterface" },
-   { v = "face_leds", type = "LedInterface" }
+   { v = "ear_leds", id = "Nao LED Ears", type = "LedInterface" },
+   { v = "face_leds", id = "Nao LED Face", type = "LedInterface" }
 }
 
 documentation      = [==[Nao LED setting skill.
diff --git a/src/lua/skills/nao/naorelgoto.lua b/src/lua/skills/nao/naorelgoto.lua
index 5394290..edc81f4 100644
--- a/src/lua/skills/nao/naorelgoto.lua
+++ b/src/lua/skills/nao/naorelgoto.lua
@@ -27,8 +27,8 @@ name               = "relgoto"
 fsm                = SkillHSM:new{name=name, start="RELGOTO", debug=true}
 depends_skills     = {"servo"}
 depends_interfaces = {
-   {v = "naomotion", type = "HumanoidMotionInterface"},
-   {v = "navigator", type = "NavigatorInterface"}
+   {v = "naomotion", id = "NaoQi Motion", type = "HumanoidMotionInterface"},
+   {v = "navigator", id = "Navigator", type = "NavigatorInterface"}
 }
 
 local p = require("predicates.soccer.general")
diff --git a/src/lua/skills/nao/naostrafe.lua b/src/lua/skills/nao/naostrafe.lua
index ba1dea5..28ddae5 100755
--- a/src/lua/skills/nao/naostrafe.lua
+++ b/src/lua/skills/nao/naostrafe.lua
@@ -30,7 +30,7 @@ name               = "naostrafe"
 fsm                = SkillHSM:new{name=name, start="STRAFE"}
 depends_skills     = nil
 depends_interfaces = {
-   {v = "naomotion", type = "HumanoidMotionInterface"}
+   {v = "naomotion", id = "NaoQi Motion", type = "HumanoidMotionInterface"}
 }
 
 documentation      = [==[Straves and tries to keep the ball in sight
diff --git a/src/lua/skills/nao/park.lua b/src/lua/skills/nao/park.lua
index 5160ccc..576095a 100644
--- a/src/lua/skills/nao/park.lua
+++ b/src/lua/skills/nao/park.lua
@@ -27,8 +27,8 @@ name               = "park"
 fsm                = SkillHSM:new{name=name, start="PARK"}
 depends_skills     = nil
 depends_interfaces = {
-   {v = "naomotion", type = "HumanoidMotionInterface"},
-   {v = "naostiffness", type = "NaoJointStiffnessInterface"}
+   {v = "naomotion", id = "NaoQi Motion", type = "HumanoidMotionInterface"},
+   {v = "naostiffness", id = "Nao Joint Stiffness", type = "NaoJointStiffnessInterface"}
 }
 
 documentation      = [==[Park the robot.
diff --git a/src/lua/skills/nao/servo.lua b/src/lua/skills/nao/servo.lua
index a0d7169..bb72044 100644
--- a/src/lua/skills/nao/servo.lua
+++ b/src/lua/skills/nao/servo.lua
@@ -27,9 +27,9 @@ name               = "servo"
 fsm                = SkillHSM:new{name=name, start="SERVO"}
 depends_skills     = nil
 depends_interfaces = {
-   {v = "naojoints", type = "NaoJointPositionInterface"},
-   {v = "naostiffness", type = "NaoJointStiffnessInterface"},
-   {v = "naomotion", type = "HumanoidMotionInterface"}
+   {v = "naojoints", type = "NaoJointPositionInterface", id = "Nao Joint Positions"},
+   {v = "naostiffness", type = "NaoJointStiffnessInterface", id = "Nao Joint Stiffness"},
+   {v = "naomotion", type = "HumanoidMotionInterface", id = "NaoQi Motion"}
 }
 
 documentation = [==[Servo control for the Nao.
diff --git a/src/lua/skills/nao/soccer/kick.lua b/src/lua/skills/nao/soccer/kick.lua
index 18665ce..6cac157 100644
--- a/src/lua/skills/nao/soccer/kick.lua
+++ b/src/lua/skills/nao/soccer/kick.lua
@@ -27,7 +27,7 @@ name               = "kick"
 fsm                = SkillHSM:new{name=name, start="KICK"}
 depends_skills     = nil
 depends_interfaces = {
-   {v = "naomotion", type = "HumanoidMotionInterface"}
+   {v = "naomotion", id = "NaoQi Motion", type = "HumanoidMotionInterface"}
 }
 
 documentation      = [==[Kick the ball.
diff --git a/src/lua/skills/nao/standup.lua b/src/lua/skills/nao/standup.lua
index 1d0cf82..1f56c58 100644
--- a/src/lua/skills/nao/standup.lua
+++ b/src/lua/skills/nao/standup.lua
@@ -27,7 +27,7 @@ name               = "standup"
 fsm                = SkillHSM:new{name=name, start="TURNON"}
 depends_skills     = {"servo", "getup"}
 depends_interfaces = {
-   {v = "naomotion", type = "HumanoidMotionInterface"}
+   {v = "naomotion", id = "NaoQi Motion", type = "HumanoidMotionInterface"}
 }
 
 documentation      = [==[Make the robot standup.]==]
diff --git a/src/lua/skills/nao/stop.lua b/src/lua/skills/nao/stop.lua
index 0ec1f0a..f3e30c3 100644
--- a/src/lua/skills/nao/stop.lua
+++ b/src/lua/skills/nao/stop.lua
@@ -27,7 +27,7 @@ name               = "stop"
 fsm                = SkillHSM:new{name=name, start="STOP"}
 depends_skills     = nil
 depends_interfaces = {
-   {v = "naomotion", type = "HumanoidMotionInterface"}
+   {v = "naomotion", type = "HumanoidMotionInterface", id = "NaoQi Motion"}
 }
 
 documentation      = [==[Stop any motion.
diff --git a/src/lua/skills/nao/walk.lua b/src/lua/skills/nao/walk.lua
index 40853da..4c2bf45 100644
--- a/src/lua/skills/nao/walk.lua
+++ b/src/lua/skills/nao/walk.lua
@@ -25,7 +25,7 @@ module(..., skillenv.module_init)
 -- Crucial skill information
 name               = "walk"
 depends_interfaces = {
-   {v = "naomotion", type = "HumanoidMotionInterface"}
+   {v = "naomotion", id = "NaoQi Motion", type = "HumanoidMotionInterface"}
 }
 
 documentation      = [==[Start or stop walk]==]




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list