Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, labrpxlr2/rcll has been created at f9054952db2dbd275648119440e211891fccc958 (commit) http://git.fawkesrobotics.org/fawkes.git/labrpxlr2/rcll - *Log* --------------------------------------------------------------- commit f9054952db2dbd275648119440e211891fccc958 Author: Fabian Stein <fabian.st...@rwth-aachen.de> AuthorDate: Fri Apr 13 12:04:30 2018 +0200 Commit: Fabian Stein <fabian.st...@rwth-aachen.de> CommitDate: Fri Apr 13 12:04:30 2018 +0200 excluded send-beacon from operator check added paused states http://git.fawkesrobotics.org/fawkes.git/commit/f905495 http://trac.fawkesrobotics.org/changeset/f905495 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- - *Diffs* ------------------------------------------------------------- - *commit* f9054952db2dbd275648119440e211891fccc958 - - - - - - - - - - Author: Fabian Stein <fabian.st...@rwth-aachen.de> Date: Fri Apr 13 12:04:30 2018 +0200 Subject: excluded send-beacon from operator check added paused states src/plugins/clips-executive/clips/domain.clp | 2 +- src/plugins/clips-executive/clips/plan.clp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/domain.clp b/src/plugins/clips-executive/clips/domain.clp index da005f0..49d5b7d 100644 --- a/src/plugins/clips-executive/clips/domain.clp +++ b/src/plugins/clips-executive/clips/domain.clp @@ -568,7 +568,7 @@ (defrule domain-check-operator-of-action-exists "Make sure that for each action in a plan, the respective operator exists." - (plan-action (action-name ?op)) + (plan-action (action-name ?op& : (neq ?op send-beacon))) (not (domain-operator (name ?op))) => (assert (domain-error (error-type operator-of-action-does-not-exist) diff --git a/src/plugins/clips-executive/clips/plan.clp b/src/plugins/clips-executive/clips/plan.clp index 3036784..4e55060 100644 --- a/src/plugins/clips-executive/clips/plan.clp +++ b/src/plugins/clips-executive/clips/plan.clp @@ -11,7 +11,7 @@ (deftemplate goal (slot id (type SYMBOL)) (slot type (type SYMBOL) (allowed-values ACHIEVE MAINTAIN) (default ACHIEVE)) - (slot mode (type SYMBOL) (allowed-values FORMULATED SELECTED EXPANDED + (slot mode (type SYMBOL) (allowed-values FORMULATED PAUSED SELECTED EXPANDED COMMITTED DISPATCHED COMPLETED FAILED)) (slot parent (type SYMBOL)) ) @@ -30,7 +30,7 @@ (multislot param-values) (slot duration (type FLOAT)) (slot dispatch-time (type FLOAT)) - (slot status (type SYMBOL) (allowed-values FORMULATED PENDING WAITING RUNNING EXECUTION-SUCCEEDED EFFECTS-APPLIED FINAL EXECUTION-FAILED FAILED)) + (slot status (type SYMBOL) (allowed-values FORMULATED PENDING PAUSED WAITING RUNNING EXECUTION-SUCCEEDED EFFECTS-APPLIED FINAL EXECUTION-FAILED FAILED)) (slot executable (type SYMBOL) (allowed-values TRUE FALSE) (default FALSE)) ) -- 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
