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 1ab437313c142e9b41a19a348ddfc9e2664cf956 (commit) via 49e8c076d137ef2631c23ceafe9c04b7c5b57a8d (commit) from a86c1a41059fed987473f1ac39bf8f1f93cc0686 (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 49e8c076d137ef2631c23ceafe9c04b7c5b57a8d Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Jun 3 18:06:19 2013 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Mon Jun 3 18:06:19 2013 +0200 skiller: add logger, config, and clock to skill modules Currently, the mentioned global variables are added to the execution sandbox. But they would be useful if available at initialization time in the skill modules, e.g. to set global constants. Therefore, add the variables to the skill module meta table. http://git.fawkesrobotics.org/fawkes.git/commit/49e8c07 http://trac.fawkesrobotics.org/changeset/49e8c07 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 1ab437313c142e9b41a19a348ddfc9e2664cf956 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Jun 3 18:33:23 2013 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Mon Jun 3 18:33:23 2013 +0200 FSM Grapher: print warning if gv not available Support operation without graphviz-lua (and hence the gv Lua module) installed. Print a warning in that case. http://git.fawkesrobotics.org/fawkes.git/commit/1ab4373 http://trac.fawkesrobotics.org/changeset/1ab4373 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/lua/fawkes/fsm/grapher.lua | 7 ++++++- src/lua/skiller/skillenv.lua | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 49e8c076d137ef2631c23ceafe9c04b7c5b57a8d - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Jun 3 18:06:19 2013 +0200 Subject: skiller: add logger, config, and clock to skill modules src/lua/skiller/skillenv.lua | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/lua/skiller/skillenv.lua b/src/lua/skiller/skillenv.lua index 6804dce..c0bc179 100644 --- a/src/lua/skiller/skillenv.lua +++ b/src/lua/skiller/skillenv.lua @@ -698,7 +698,12 @@ function skill_module(module_name) assert(mt.__call == nil, "Module metatable already has an __call function/table.") end - local indextable = {} + local indextable = { + -- Skiller related stuff + logger = logger, + config = config, + clock = clock + } for k,v in pairs(skillstati) do if string.match(k, "^S_([%a_]+)$") then indextable[k] = v end - *commit* 1ab437313c142e9b41a19a348ddfc9e2664cf956 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Jun 3 18:33:23 2013 +0200 Subject: FSM Grapher: print warning if gv not available src/lua/fawkes/fsm/grapher.lua | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/lua/fawkes/fsm/grapher.lua b/src/lua/fawkes/fsm/grapher.lua index 99d24d1..c9e6296 100644 --- a/src/lua/fawkes/fsm/grapher.lua +++ b/src/lua/fawkes/fsm/grapher.lua @@ -21,7 +21,8 @@ -- Read the full text in the LICENSE.GPL file in the doc directory. require("fawkes.modinit") -require("gv") +local gv_warned = false +local gv_ok, gv = pcall(require, "gv") --- Module to create DOT graphs. -- @author Tim Niemueller @@ -389,6 +390,10 @@ local function generate_dotgraph(fsm, g, subgraph_name) end local function layout_dotgraph(graph) + if not gv_ok or not gv and not gv_warned then + print_warn("Module gv not found, is graphviz-lua installed?") + gv_warned = true + end graph_handle = gv.readstring(graph) gv.layout(graph_handle, "dot") return gv.renderdata(graph_handle, "dot") -- Fawkes Robotics Framework http://www.fawkesrobotics.org _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
