[Fawkes Git] branch/master: 12 revs updated. (0.5.0-3080-ga95c0e2)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Mon Jan 11 11:17:21 CET 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, master has been updated
        to  a95c0e28a3ee76a4e3b946199fe14b74a1494e5f (commit)
       via  b90747e6065b00e08cf69dacac71dd508fc3cd28 (commit)
       via  6eb2b9a49c1eac2460284e3ceef0db22f67b9a0e (commit)
       via  89af27634082f8c434b3a814d93be68ad2d85677 (commit)
       via  28a5fce8ba2b4fb8eb37b59be5e23e75f83755ab (commit)
       via  b836efea761380879a25db35638efef96a4c835f (commit)
       via  7ad884aadb71b230426c01907da42fd6c282dac5 (commit)
       via  b858a46ca9d8656b3e17a7103cff9d1b1fe03360 (commit)
       via  2efe170dfea3930e4d9008cff2404200a7b87c89 (commit)
       via  95e4889740591f47a96124be5a238b8983f3531b (commit)
       via  a2e3dbeb0639974afdd5b609ea15e11f138b13f2 (commit)
       via  03965f294b70cd50a1e0bbb744c0a9e691a85b58 (commit)
      from  0627fb6ba1d5e3808f09c81e0634ff7b5d013e69 (commit)

http://git.fawkesrobotics.org/fawkes.git/master

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- *Log* ---------------------------------------------------------------
commit 89af27634082f8c434b3a814d93be68ad2d85677
Merge: 0627fb6 b836efe
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Jan 11 09:51:28 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Jan 11 09:51:28 2016 +0100

    Merge remote-tracking branch 'origin/common/frame-rename'

http://git.fawkesrobotics.org/fawkes.git/commit/89af276
http://trac.fawkesrobotics.org/changeset/89af276

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 6eb2b9a49c1eac2460284e3ceef0db22f67b9a0e
Merge: 89af276 2efe170
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Jan 11 09:52:36 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Jan 11 09:52:36 2016 +0100

    Merge remote-tracking branch 'origin/bahram/openrave_Wno-deprecated-declarations'

http://git.fawkesrobotics.org/fawkes.git/commit/6eb2b9a
http://trac.fawkesrobotics.org/changeset/6eb2b9a

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit b90747e6065b00e08cf69dacac71dd508fc3cd28
Merge: 6eb2b9a 95e4889
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Jan 11 09:56:05 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Jan 11 09:56:05 2016 +0100

    Merge remote-tracking branch 'origin/bahram/luaagent_fixes'

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit a95c0e28a3ee76a4e3b946199fe14b74a1494e5f
Merge: b90747e 28a5fce
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Jan 11 09:57:44 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Jan 11 09:57:44 2016 +0100

    Merge remote-tracking branch 'origin/bahram/skilljumpstate_inheritance'

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

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


- *Summary* -----------------------------------------------------------
 cfg/conf.d/openni.yaml                             |    7 +++
 src/lua/fawkes/fsm/skill_jumpstate.lua             |   42 ++++++++++++++++++++
 src/lua/luaagent/agentenv.lua                      |   25 +++++++-----
 src/lua/luaagent/agenthsm.lua                      |    5 ++
 src/lua/luaagent/jumpstates.lua                    |   16 ++++---
 src/lua/skiller/skillhsm.lua                       |    7 ++-
 ...{skill_jumpstate.lua => subskill_jumpstate.lua} |   42 ++++++++++----------
 src/lua/skills/generic/goto.lua                    |    6 +-
 src/lua/skills/generic/katana_rel.lua              |    4 +-
 src/plugins/openni/pcl_frombuf_thread.cpp          |    2 +-
 src/plugins/openni/pointcloud_thread.cpp           |   14 +++---
 src/plugins/openni/pointcloud_thread.h             |    3 +
 src/plugins/openrave/openrave.mk                   |    5 +-
 13 files changed, 123 insertions(+), 55 deletions(-)
 create mode 100644 src/lua/fawkes/fsm/skill_jumpstate.lua
 rename src/lua/skiller/{skill_jumpstate.lua => subskill_jumpstate.lua} (91%)


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

- *commit* 89af27634082f8c434b3a814d93be68ad2d85677 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Jan 11 09:51:28 2016 +0100
Subject: Merge remote-tracking branch 'origin/common/frame-rename'

 cfg/conf.d/openni.yaml                    |    7 +++++++
 src/lua/skills/generic/goto.lua           |    6 +++---
 src/lua/skills/generic/katana_rel.lua     |    4 ++--
 src/plugins/openni/pcl_frombuf_thread.cpp |    2 +-
 src/plugins/openni/pointcloud_thread.cpp  |   14 +++++++-------
 src/plugins/openni/pointcloud_thread.h    |    3 +++
 6 files changed, 23 insertions(+), 13 deletions(-)

_Diff for modified files_:

- *commit* 6eb2b9a49c1eac2460284e3ceef0db22f67b9a0e - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Jan 11 09:52:36 2016 +0100
Subject: Merge remote-tracking branch 'origin/bahram/openrave_Wno-deprecated-declarations'

 src/plugins/openrave/openrave.mk |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

_Diff for modified files_:

- *commit* b90747e6065b00e08cf69dacac71dd508fc3cd28 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Jan 11 09:56:05 2016 +0100
Subject: Merge remote-tracking branch 'origin/bahram/luaagent_fixes'

 src/lua/luaagent/agentenv.lua   |   18 +++++++++---------
 src/lua/luaagent/agenthsm.lua   |    5 +++++
 src/lua/luaagent/jumpstates.lua |    4 +++-
 3 files changed, 17 insertions(+), 10 deletions(-)

_Diff for modified files_:

- *commit* a95c0e28a3ee76a4e3b946199fe14b74a1494e5f - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Jan 11 09:57:44 2016 +0100
Subject: Merge remote-tracking branch 'origin/bahram/skilljumpstate_inheritance'

 src/lua/fawkes/fsm/skill_jumpstate.lua             |   42 ++++++++++++++++++++
 src/lua/luaagent/agentenv.lua                      |    7 +++-
 src/lua/luaagent/jumpstates.lua                    |   12 +++---
 src/lua/skiller/skillhsm.lua                       |    7 ++-
 ...{skill_jumpstate.lua => subskill_jumpstate.lua} |   42 ++++++++++----------
 5 files changed, 80 insertions(+), 30 deletions(-)

_Diff for modified files_:
diff --cc src/lua/luaagent/agentenv.lua
index bc3ce5e,fbb85b7..861797b
--- a/src/lua/luaagent/agentenv.lua
+++ b/src/lua/luaagent/agentenv.lua
@@@ -24,15 -24,16 +24,16 @@@ require("fawkes.modinit"
  module(..., fawkes.modinit.register_all)
  require("fawkes.logprint")
  local skillstati = require("skiller.skillstati")
 -local hsmmod = require("luaagent.agenthsm")
 -local skqmod = require("luaagent.skillqueue")
 +local hsmmod   = require("luaagent.agenthsm")
 +local skqmod   = require("luaagent.skillqueue")
  local agjsmod  = require("luaagent.jumpstates")
 -local fsmjsmod = require("fawkes.fsm.jumpstate")
 -local shsmmod  = require("fawkes.fsm.subfsmjumpstate")
 +local fsmjsmod  = require("fawkes.fsm.jumpstate")
 +local subfjsmod = require("fawkes.fsm.subfsmjumpstate")
+ local sjsmmod  = require("fawkes.fsm.skill_jumpstate")
 -local fsmstmod = require("fawkes.fsm.state")
 -local skillenv = require("skiller.skillenv")
 -local predlib  = require("fawkes.predlib")
 -local grapher  = require("fawkes.fsm.grapher")
 +local fsmstmod  = require("fawkes.fsm.state")
 +local skillenv  = require("skiller.skillenv")
 +local predlib   = require("fawkes.predlib")
 +local grapher   = require("fawkes.fsm.grapher")
  
  local agent = nil
  
@@@ -41,9 -45,10 +45,10 @@@ SkillJumpState:implemented_by(agjsmod.A
  local module_exports = {
     AgentHSM                = hsmmod.AgentHSM,
     AgentSkillExecJumpState = agjsmod.AgentSkillExecJumpState,
+    SkillJumpState          = SkillJumpState,
     SkillQueue              = skqmod.SkillQueue,
     JumpState               = fsmjsmod.JumpState,
 -   SubFSMJumpState         = shsmmod.SubFSMJumpState,
 +   SubFSMJumpState         = subfjsmod.SubFSMJumpState,
     config                  = config
  }
  




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


More information about the fawkes-commits mailing list