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, common/current has been updated to 85cbaae011cfd71d0d3d4ebe0af56a7b3bd7df9d (commit) via 12128ffa54d7a0dddf693024cee6f56c9a267572 (commit) via 9b04d45876bdcf2cebebf75f21e979e52e090ec3 (commit) via c363cda38558de72ddeb6eeff450ffbf017f3a74 (commit) via a0dbfc96017bde9cd7fc858557e3ca4334a428c4 (commit) via 741a09a50e94262dc1ea4b568b21297fc02996c2 (commit) via 54948dd54dcabf586204600e1f0588df2e820acd (commit) via 97303313ecbc4f48812456810f99dcd53884ca80 (commit) via bce042eba38270f6b529902030a9be611884ae12 (commit) via e95b1c12a85903e63f3b230bce8d476c77b58c55 (commit) via a668ba4db9d471fc9988dce6dfa74b9eb7d48fe7 (commit) via 2f76d93e62296b53d0c1855be20fc016a9fa6e88 (commit) via d0f370fad42abf2b347ad0063f3a350ab614dd5f (commit) via 12f8cb3ef5792f13b05cc4ff9f7c889f24a7b901 (commit) via b2924147c1a2e8a586d3bc61bc60c13bc4eef233 (commit) via c2d06a9692adc00943a513351987ed583a74bb59 (commit) via 1f251f0efb16eedc379bafa239ef4a9fb613121c (commit) via 101ff45c9abe507768d38363d1fd54c5fabf9522 (commit) via 773420ae49a35b4fe1d87ed0d84d2ccb89ed2ba8 (commit) via d179e0cefe16450f31c4f9ca3a03fdec1397b35d (commit) via 8d320f2c45688c05cf72889f0b66336120c8b693 (commit) via 088d2a8013662db7c26ce89f9e907ee43b03d0d2 (commit) via 1e0e468699cc4355d81f2e3fc6add90b091c5d84 (commit) via 3c7d954fb0a6911af2dcaf7b7bb6e8f49f1c1020 (commit) via e3b698725b26ccd8d8d0849027166e3b175e85bf (commit) via 6f0fb3f4611733204e2f210499e10ece0e861c10 (commit) via 9c1afea491cf8663ef4cddf06c3a472524b445bc (commit) via 56b226b1606b64c1901056ed84c62d1a5f0dd89d (commit) via c322667d7103034e343a25eb3afaac84aa64e86c (commit) via c620772bdda2d58f90459e6c6d9cb873d90bc673 (commit) via 612bc877d1c1718c6a5f8a89e2f192f6347c8c28 (commit) via 4642e574c96df2ce4387f25690dbd4d3321cf12b (commit) via 4e85a6cfb38ca7068e2cbb48a193aa2ec9d43adb (commit) via 96f23388e3207f0bb788d2f0d6aab11aa626be32 (commit) via b1a813e4a484eccf737f66b8627aa981297f42f6 (commit) via aab726a4f69ead23976ab95fe8fab3e3922a3853 (commit) via 64a035c2810423a891f35604b8734b75be0bb752 (commit) via 36ce979684c185282822c6d9ae89e9cdd966f81e (commit) via ec261757ea98e18799c5ee83f9fddd8d558603c6 (commit) via 6965503955871a46ed5f0beeb65a81a434db800a (commit) via 6e71290df557a20d8b736a56aed7fa3338b2c9fc (commit) via 8a32ddf7d62dde3170763aa2af6376b8edb1826b (commit) via 80e73adca53998c3f5c8f0a234641aaeeb888321 (commit) via da7cca623419f1ea6d869c6d69ec0cf07e1843c6 (commit) via b9cac4245ef5b0657b97724533078f1d1dacc88a (commit) via b3f92d149c7647699c3700be5a7e57916ba792f9 (commit) via a808ad7b8e6f519026c976ceeed62a3a7a491b4b (commit) via a9ee2f8f8c95a5cb235dd1ea59144aacda544b44 (commit) via c7b8192d34d8fb535d6ec50db5e406da0f1dc636 (commit) via 76780e15859e86e68550cfe039e357323b9e6450 (commit) via afd52c4457464958090d7198825ccf8bf0789501 (commit) via 3570aa47e01c4a1ed16cc0f06c77df2702e6d51e (commit) via d11c0d4bf9c8a0c025e925f24b6bc9b34d72de9d (commit) via b543f6488d88900cc38e5d44b979c4c750134637 (commit) via 9707f1e30027b8984281ccb086896154c0d8659c (commit) via 6cc2485eaa99b4f9dc415ea7fe518fbe566668a7 (commit) via ba10c1c2e01dc2ec0f3e1f8cc95760ff21139c0f (commit) via 4cd32979355298cba581ecf71d9e4053d5b4c666 (commit) via 2ff5fcfdbbf796f6cb7ee1aadbca27101e8d510c (commit) via 391895963d721856bab9cb14bca02756fc68d2e9 (commit) via bc228d1d61941105ab50c0c7a3c1254fded95941 (commit) via 09c0997c795dff2c60776a605c720490108fa066 (commit) via 59b5315040c93d625d26a5d41b85c354f63bcd23 (commit) via f61d9f966863c826bce5bd2aafa97e02edef3556 (commit) via 6abab978a244c70f0ead4ea7192e057962988323 (commit) via 988fce9404fea02af92f59485afb11f543ea5a5f (commit) via cf639e9daa3b5b143807cefcc8937b340816ae2b (commit) via e6abc282cfacd4e3693f32bf30a9cc671e8e07e3 (commit) via e9a1f7bb05c3e0090c1e3dab0bc0e04bb1b0b133 (commit) via 772e219264283349413ca2575cb39a127eaeceb0 (commit) via 977f75fc15606ef9053524b8aaaa3405fae7f6c1 (commit) via a101353534db9b614061a67b186cb269d18d06af (commit) via 11ba0a726ec309f0bea577916fc59ae481cb114a (commit) via 95f7d02bd3cb45971ffc4fdef3a85b616c09da9f (commit) via d470615301663f5959e5885c951eb8fa9732adee (commit) via 8718afed0ab67b14fb05589554f09268c35fe93c (commit) via 94a54c95c0e8726a4fa564de0ad1fb408752c46f (commit) via abd62e4b23fdd91f8c89a103c89cbb1c952378a2 (commit) via 913018c8804fa3e20f77ee47f22a2744ae651f76 (commit) via 419cc8cd9045a00765003c2fd42c056639264d5f (commit) via b883ed68b7291b3ba7f8a508706a0f5692c843b5 (commit) via 1c75b1678c5070c8da9dee0a75c2da1fc09514f6 (commit) via 56e7272fa748f68ab1aabde14063d2ce8a36b8e9 (commit) via 0bebad7e6cc977fb9dc43233b626cf4b1cea480f (commit) via c841bbdc88ec92555b62b4b7d2783a734a80a053 (commit) from ef9903f1fd87a285890a1378bea791cc908f9baa (commit) http://git.fawkesrobotics.org/fawkes.git/common/current 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 36ce979684c185282822c6d9ae89e9cdd966f81e Merge: ef9903f ec26175 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Apr 24 18:02:51 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Apr 24 18:02:51 2018 +0200 Merge remote-tracking branch 'origin/timn/clips-executive-wm-robmem-sync' into current http://git.fawkesrobotics.org/fawkes.git/commit/36ce979 http://trac.fawkesrobotics.org/changeset/36ce979 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 64a035c2810423a891f35604b8734b75be0bb752 Merge: 36ce979 ba10c1c Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Apr 24 18:24:56 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Apr 24 18:24:56 2018 +0200 Merge remote-tracking branch 'remotes/origin/timn/yaml-sequence-maps' into current http://git.fawkesrobotics.org/fawkes.git/commit/64a035c http://trac.fawkesrobotics.org/changeset/64a035c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 96f23388e3207f0bb788d2f0d6aab11aa626be32 Merge: 64a035c b1a813e Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Apr 24 20:57:51 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Apr 24 20:57:51 2018 +0200 Merge remote-tracking branch 'origin/timn/clips-executive-wm-robmem-sync' into current http://git.fawkesrobotics.org/fawkes.git/commit/96f2338 http://trac.fawkesrobotics.org/changeset/96f2338 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 6f0fb3f4611733204e2f210499e10ece0e861c10 Merge: 96f2338 56b226b Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Apr 25 12:31:34 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Apr 25 12:31:34 2018 +0200 Merge remote-tracking branch 'origin/timn/clips-executive-wm-robmem-sync' into current http://git.fawkesrobotics.org/fawkes.git/commit/6f0fb3f http://trac.fawkesrobotics.org/changeset/6f0fb3f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit e3b698725b26ccd8d8d0849027166e3b175e85bf Merge: 6f0fb3f 9c1afea Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Apr 25 12:31:44 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Apr 25 12:31:44 2018 +0200 Merge remote-tracking branch 'origin/thofmann/cx-wm-robmem-sync-blackboard-init-fix' into current http://git.fawkesrobotics.org/fawkes.git/commit/e3b6987 http://trac.fawkesrobotics.org/changeset/e3b6987 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 3c7d954fb0a6911af2dcaf7b7bb6e8f49f1c1020 Merge: e3b6987 f61d9f9 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Apr 25 21:03:00 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Apr 25 21:03:00 2018 +0200 Merge remote-tracking branch 'origin/thofmann/laser-calibration' into current http://git.fawkesrobotics.org/fawkes.git/commit/3c7d954 http://trac.fawkesrobotics.org/changeset/3c7d954 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 1e0e468699cc4355d81f2e3fc6add90b091c5d84 Author: Nicolas Limpert <limp...@fh-aachen.de> AuthorDate: Wed Apr 25 21:46:14 2018 +0200 Commit: Nicolas Limpert <limp...@fh-aachen.de> CommitDate: Wed Apr 25 22:19:16 2018 +0200 laser-filter: add Makefile for interfaces subfolder http://git.fawkesrobotics.org/fawkes.git/commit/1e0e468 http://trac.fawkesrobotics.org/changeset/1e0e468 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 088d2a8013662db7c26ce89f9e907ee43b03d0d2 Author: Nicolas Limpert <limp...@fh-aachen.de> AuthorDate: Wed Apr 25 21:47:22 2018 +0200 Commit: Nicolas Limpert <limp...@fh-aachen.de> CommitDate: Wed Apr 25 22:19:16 2018 +0200 laser-filter: add LaserBoxFilterInterface This interface allows plugins to submit new boxes that are to be filtered. http://git.fawkesrobotics.org/fawkes.git/commit/088d2a8 http://trac.fawkesrobotics.org/changeset/088d2a8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 8d320f2c45688c05cf72889f0b66336120c8b693 Author: Nicolas Limpert <limp...@fh-aachen.de> AuthorDate: Wed Apr 25 21:40:37 2018 +0200 Commit: Nicolas Limpert <limp...@fh-aachen.de> CommitDate: Wed Apr 25 22:19:16 2018 +0200 laser-filter: add laser filter to exclude boxes This filter allows to filter boxes with continuous orientations. New boxes are inserted by providing a CreateNewBoxFilterMessage to the LaserBoxFilterInterface. http://git.fawkesrobotics.org/fawkes.git/commit/8d320f2 http://trac.fawkesrobotics.org/changeset/8d320f2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 1f251f0efb16eedc379bafa239ef4a9fb613121c Author: Nicolas Limpert <limp...@fh-aachen.de> AuthorDate: Thu Apr 26 10:41:17 2018 +0200 Commit: Nicolas Limpert <limp...@fh-aachen.de> CommitDate: Thu Apr 26 10:41:17 2018 +0200 laser-filter/Makefile: set interfaces as PRESUBDIRS http://git.fawkesrobotics.org/fawkes.git/commit/1f251f0 http://trac.fawkesrobotics.org/changeset/1f251f0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit c2d06a9692adc00943a513351987ed583a74bb59 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Apr 26 15:24:31 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Apr 26 16:57:58 2018 +0200 clips-executive: cancel the Skiller if its action disappeared Send a StopExecMessage to the Skiller if no corresponding plan action exists, or if that action was retracted. This can happen if we cancel a goal or an action. This fixes an issue where the agent would not execute any other skill if a previous action was failed or canceled while the skill was still running. http://git.fawkesrobotics.org/fawkes.git/commit/c2d06a9 http://trac.fawkesrobotics.org/changeset/c2d06a9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit b2924147c1a2e8a586d3bc61bc60c13bc4eef233 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Apr 26 16:59:13 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Apr 26 17:00:02 2018 +0200 clips-executive: retract stray skill-execinfo If the skiller fails and the corresponding plan action no longer exists, we can just retract the skill-execinfo. http://git.fawkesrobotics.org/fawkes.git/commit/b292414 http://trac.fawkesrobotics.org/changeset/b292414 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 12f8cb3ef5792f13b05cc4ff9f7c889f24a7b901 Merge: 3c7d954 b292414 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Apr 26 17:01:17 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Apr 26 17:01:17 2018 +0200 Merge remote-tracking branch 'origin/thofmann/cx-cancel-skiller-if-action-disappeared' into current http://git.fawkesrobotics.org/fawkes.git/commit/12f8cb3 http://trac.fawkesrobotics.org/changeset/12f8cb3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit d0f370fad42abf2b347ad0063f3a350ab614dd5f Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Mar 23 16:46:33 2018 +0100 Commit: Victor Mataré <mat...@lih.rwth-aachen.de> CommitDate: Thu Apr 26 18:42:43 2018 +0200 robot-memory: fix make config to allow inclusion from other repos Adapt inclusion paths to allow inclusion of robot memory from other repos (e.g., fawkes-robotino). http://git.fawkesrobotics.org/fawkes.git/commit/d0f370f http://trac.fawkesrobotics.org/changeset/d0f370f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 2f76d93e62296b53d0c1855be20fc016a9fa6e88 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Apr 26 19:41:29 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Apr 26 19:47:44 2018 +0200 clips-executive: also create pending effects if action is not waiting We may be interested of pending effects of an action even if the action is not waiting for pending effects. This allows us to check and track the pending effects even after the action was already set to EXECUTION-SUCCEEDED. http://git.fawkesrobotics.org/fawkes.git/commit/2f76d93 http://trac.fawkesrobotics.org/changeset/2f76d93 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit a668ba4db9d471fc9988dce6dfa74b9eb7d48fe7 Merge: d0f370f 1f251f0 Author: Victor Mataré <mat...@lih.rwth-aachen.de> AuthorDate: Thu Apr 26 22:12:42 2018 +0200 Commit: Victor Mataré <mat...@lih.rwth-aachen.de> CommitDate: Thu Apr 26 22:12:42 2018 +0200 Merge remote-tracking branch 'origin/nlimpert/laser_filter_box_filter' into common/current http://git.fawkesrobotics.org/fawkes.git/commit/a668ba4 http://trac.fawkesrobotics.org/changeset/a668ba4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit e95b1c12a85903e63f3b230bce8d476c77b58c55 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Apr 27 08:41:51 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Apr 27 08:41:51 2018 +0200 clips-executive: add missing condition when cancelling skill We need to check that the corresponding skill of the orphan skill-execinfo is not running, not just that there is a skill that is not running. http://git.fawkesrobotics.org/fawkes.git/commit/e95b1c1 http://trac.fawkesrobotics.org/changeset/e95b1c1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit bce042eba38270f6b529902030a9be611884ae12 Merge: a668ba4 e95b1c1 Author: Victor Mataré <mat...@lih.rwth-aachen.de> AuthorDate: Fri Apr 27 08:51:57 2018 +0200 Commit: Victor Mataré <mat...@lih.rwth-aachen.de> CommitDate: Fri Apr 27 08:51:57 2018 +0200 Merge remote-tracking branch 'origin/thofmann/cx-cancel-skiller-if-action-disappeared' into common/current http://git.fawkesrobotics.org/fawkes.git/commit/bce042e http://trac.fawkesrobotics.org/changeset/bce042e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 97303313ecbc4f48812456810f99dcd53884ca80 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Apr 27 09:01:19 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Apr 27 09:01:19 2018 +0200 fixup! clips-executive: add missing condition when cancelling skill http://git.fawkesrobotics.org/fawkes.git/commit/9730331 http://trac.fawkesrobotics.org/changeset/9730331 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 54948dd54dcabf586204600e1f0588df2e820acd Merge: bce042e 9730331 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Apr 27 09:02:09 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Apr 27 09:02:09 2018 +0200 Merge remote-tracking branch 'origin/thofmann/cx-cancel-skiller-if-action-disappeared' into current http://git.fawkesrobotics.org/fawkes.git/commit/54948dd http://trac.fawkesrobotics.org/changeset/54948dd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 9b04d45876bdcf2cebebf75f21e979e52e090ec3 Merge: 54948dd c363cda Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Apr 27 14:47:58 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Apr 27 14:47:58 2018 +0200 Merge remote-tracking branch 'fawkesrobotics/timn/webview-2.0' into current http://git.fawkesrobotics.org/fawkes.git/commit/9b04d45 http://trac.fawkesrobotics.org/changeset/9b04d45 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 12128ffa54d7a0dddf693024cee6f56c9a267572 Merge: 9b04d45 2f76d93 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Apr 27 19:50:27 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Apr 27 19:50:27 2018 +0200 Merge remote-tracking branch 'origin/thofmann/clips-executive-always-check-pending-effects' into current http://git.fawkesrobotics.org/fawkes.git/commit/12128ff http://trac.fawkesrobotics.org/changeset/12128ff - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 85cbaae011cfd71d0d3d4ebe0af56a7b3bd7df9d Author: Mostafa Gomaa <go...@kbsg.rwth-aachen.de> AuthorDate: Sat Apr 28 08:27:18 2018 +0200 Commit: Mostafa Gomaa <go...@kbsg.rwth-aachen.de> CommitDate: Sat Apr 28 08:27:18 2018 +0200 clips-executive: typo in defrule domain-effects-ignore-sensed http://git.fawkesrobotics.org/fawkes.git/commit/85cbaae http://trac.fawkesrobotics.org/changeset/85cbaae - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- cfg/conf.d/clips-executive.yaml | 111 +- src/libs/config/config.mk | 11 +- src/libs/config/memory.cpp | 45 +- src/libs/config/memory.h | 4 +- src/libs/config/yaml.cpp | 1354 +++++++--------- src/libs/config/yaml.h | 36 +- src/libs/config/yaml_node.h | 1739 +++++++++++--------- src/libs/interfaces/.gitignore | 1 + src/libs/tf/transform_listener.cpp | 16 +- src/libs/tf/transform_listener.h | 4 +- src/libs/webview/reply.cpp | 6 +- src/libs/webview/reply.h | 2 +- src/libs/webview/request_dispatcher.cpp | 5 +- .../clips-executive/clips/blackboard-init.clp | 28 +- src/plugins/clips-executive/clips/domain.clp | 6 +- src/plugins/clips-executive/clips/init.clp | 398 +++-- src/plugins/clips-executive/clips/lock-actions.clp | 30 + .../clips-executive/clips/robmem-wait-init.clp | 39 + .../clips-executive/clips/skills-actions.clp | 23 + src/plugins/clips-executive/clips/skills-init.clp | 31 - src/plugins/clips-executive/clips/skills.clp | 11 + .../clips/test-scenario/print-action.clp | 2 +- .../clips/test-scenario/worldmodel-facts.clp | 8 + .../clips-executive/clips/wm-robmem-sync.clp | 342 ++++ .../clips-executive/clips_executive_thread.cpp | 21 +- .../clips-executive/clips_executive_thread.h | 2 - src/plugins/clips-executive/rest-api/api.yaml | 2 +- .../clips_robot_memory_thread.cpp | 289 ++-- .../clips-robot-memory/clips_robot_memory_thread.h | 20 +- src/plugins/clips/clips/path.clp | 73 +- src/plugins/clips/clips/time.clp | 7 + src/plugins/clips/clips/utils.clp | 18 + src/plugins/laser-filter/Makefile | 1 + src/plugins/laser-filter/filter_thread.cpp | 7 + src/plugins/laser-filter/filters/box_filter.cpp | 193 +++ src/plugins/laser-filter/filters/box_filter.h | 78 + .../interfaces/LaserBoxFilterInterface.cpp | 453 +++++ .../interfaces/LaserBoxFilterInterface.h_ext | 117 ++ .../interfaces/LaserBoxFilterInterface.tolua | 101 ++ .../interfaces/LaserBoxFilterInterface.xml | 20 + .../interfaces/Makefile | 0 src/plugins/laser-lines/laser-lines-thread.cpp | 76 +- src/plugins/laser-lines/laser-lines-thread.h | 12 + src/plugins/mongodb/Makefile | 5 +- src/plugins/mongodb/interfaces/.gitignore | 3 + src/plugins/mongodb/interfaces/Makefile | 24 + .../MongoDBManagedReplicaSetInterface.xml | 95 ++ src/plugins/mongodb/mongodb_replicaset_config.cpp | 104 +- src/plugins/mongodb/mongodb_replicaset_config.h | 32 +- src/plugins/mongodb/mongodb_thread.cpp | 8 +- src/plugins/robot-memory/event_trigger.cpp | 19 +- src/plugins/robot-memory/event_trigger.h | 7 +- src/plugins/robot-memory/event_trigger_manager.cpp | 37 +- src/plugins/robot-memory/event_trigger_manager.h | 15 +- src/plugins/robot-memory/robot_memory.cpp | 199 +++ src/plugins/robot-memory/robot_memory.h | 14 +- src/plugins/robot-memory/robot_memory.mk | 4 +- .../components/goal-list.component.ts | 167 ++- .../parts/clips-executive/models/DomainEffect.ts | 5 +- .../src/parts/clips-executive/models/DomainFact.ts | 5 +- .../parts/clips-executive/models/DomainObject.ts | 5 +- .../clips-executive/models/DomainObjectType.ts | 5 +- .../parts/clips-executive/models/DomainOperator.ts | 5 +- .../models/DomainOperatorParameter.ts | 5 +- .../clips-executive/models/DomainPrecondition.ts | 8 +- .../models/DomainPreconditionAtom.ts | 8 +- .../models/DomainPreconditionCompound.ts | 8 +- .../clips-executive/models/DomainPredicate.ts | 5 +- .../src/parts/clips-executive/models/Goal.ts | 5 +- .../src/parts/clips-executive/models/Plan.ts | 5 +- .../src/parts/clips-executive/models/PlanAction.ts | 5 +- .../backend-config/backend-config.service.ts | 7 +- .../update-notifier/update-notifier.service.ts | 5 +- src/tools/Makefile | 2 +- src/tools/laser_calibration/Makefile | 61 + src/tools/laser_calibration/laser_calibration.cpp | 188 +++ src/tools/laser_calibration/laser_calibration.h | 92 + src/tools/laser_calibration/main.cpp | 215 +++ src/tools/laser_calibration/pitch_calibration.cpp | 66 + src/tools/laser_calibration/pitch_calibration.h | 40 + src/tools/laser_calibration/roll_calibration.cpp | 101 ++ src/tools/laser_calibration/roll_calibration.h | 45 + .../laser_calibration/time_offset_calibration.cpp | 148 ++ .../laser_calibration/time_offset_calibration.h | 47 + src/tools/laser_calibration/yaw_calibration.cpp | 121 ++ src/tools/laser_calibration/yaw_calibration.h | 52 + 86 files changed, 5520 insertions(+), 2219 deletions(-) create mode 100644 src/plugins/clips-executive/clips/lock-actions.clp create mode 100644 src/plugins/clips-executive/clips/robmem-wait-init.clp delete mode 100644 src/plugins/clips-executive/clips/skills-init.clp create mode 100644 src/plugins/clips-executive/clips/wm-robmem-sync.clp create mode 100644 src/plugins/laser-filter/filters/box_filter.cpp create mode 100644 src/plugins/laser-filter/filters/box_filter.h create mode 100644 src/plugins/laser-filter/interfaces/LaserBoxFilterInterface.cpp create mode 100644 src/plugins/laser-filter/interfaces/LaserBoxFilterInterface.h_ext create mode 100644 src/plugins/laser-filter/interfaces/LaserBoxFilterInterface.tolua create mode 100644 src/plugins/laser-filter/interfaces/LaserBoxFilterInterface.xml copy src/plugins/{dynamixel => laser-filter}/interfaces/Makefile (100%) create mode 100644 src/plugins/mongodb/interfaces/.gitignore create mode 100644 src/plugins/mongodb/interfaces/Makefile create mode 100644 src/plugins/mongodb/interfaces/MongoDBManagedReplicaSetInterface.xml create mode 100644 src/tools/laser_calibration/Makefile create mode 100644 src/tools/laser_calibration/laser_calibration.cpp create mode 100644 src/tools/laser_calibration/laser_calibration.h create mode 100644 src/tools/laser_calibration/main.cpp create mode 100644 src/tools/laser_calibration/pitch_calibration.cpp create mode 100644 src/tools/laser_calibration/pitch_calibration.h create mode 100644 src/tools/laser_calibration/roll_calibration.cpp create mode 100644 src/tools/laser_calibration/roll_calibration.h create mode 100644 src/tools/laser_calibration/time_offset_calibration.cpp create mode 100644 src/tools/laser_calibration/time_offset_calibration.h create mode 100644 src/tools/laser_calibration/yaw_calibration.cpp create mode 100644 src/tools/laser_calibration/yaw_calibration.h - *Diffs* ------------------------------------------------------------- - *commit* 36ce979684c185282822c6d9ae89e9cdd966f81e - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Apr 24 18:02:51 2018 +0200 Subject: Merge remote-tracking branch 'origin/timn/clips-executive-wm-robmem-sync' into current cfg/conf.d/clips-executive.yaml | 111 ++++-- src/libs/interfaces/.gitignore | 1 + .../clips-executive/clips/blackboard-init.clp | 28 +- src/plugins/clips-executive/clips/init.clp | 398 ++++++++++++-------- .../clips-executive/clips/robmem-wait-init.clp | 39 ++ src/plugins/clips-executive/clips/skills-init.clp | 31 -- src/plugins/clips-executive/clips/skills.clp | 11 + .../clips/test-scenario/worldmodel-facts.clp | 8 + .../clips-executive/clips/wm-robmem-sync.clp | 326 ++++++++++++++++ .../clips-executive/clips_executive_thread.cpp | 21 +- .../clips-executive/clips_executive_thread.h | 2 - .../clips_robot_memory_thread.cpp | 26 ++ .../clips-robot-memory/clips_robot_memory_thread.h | 2 + src/plugins/clips/clips/path.clp | 73 +++- src/plugins/clips/clips/time.clp | 7 + src/plugins/clips/clips/utils.clp | 18 + src/plugins/mongodb/Makefile | 5 +- src/plugins/mongodb/interfaces/.gitignore | 3 + .../{skiller => mongodb}/interfaces/Makefile | 4 +- .../MongoDBManagedReplicaSetInterface.xml | 95 +++++ src/plugins/mongodb/mongodb_replicaset_config.cpp | 102 ++++-- src/plugins/mongodb/mongodb_replicaset_config.h | 32 +- src/plugins/mongodb/mongodb_thread.cpp | 8 +- src/plugins/robot-memory/event_trigger.cpp | 19 +- src/plugins/robot-memory/event_trigger.h | 7 +- src/plugins/robot-memory/event_trigger_manager.cpp | 37 ++- src/plugins/robot-memory/event_trigger_manager.h | 15 +- src/plugins/robot-memory/robot_memory.cpp | 65 ++++ src/plugins/robot-memory/robot_memory.h | 6 +- 29 files changed, 1141 insertions(+), 359 deletions(-) _Diff for modified files_: - *commit* 64a035c2810423a891f35604b8734b75be0bb752 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Apr 24 18:24:56 2018 +0200 Subject: Merge remote-tracking branch 'remotes/origin/timn/yaml-sequence-maps' into current src/libs/config/config.mk | 11 +- src/libs/config/memory.cpp | 45 +- src/libs/config/memory.h | 4 +- src/libs/config/yaml.cpp | 1354 ++++++++++++++-------------------- src/libs/config/yaml.h | 36 +- src/libs/config/yaml_node.h | 1739 +++++++++++++++++++++++-------------------- 6 files changed, 1524 insertions(+), 1665 deletions(-) _Diff for modified files_: - *commit* 96f23388e3207f0bb788d2f0d6aab11aa626be32 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Apr 24 20:57:51 2018 +0200 Subject: Merge remote-tracking branch 'origin/timn/clips-executive-wm-robmem-sync' into current .../clips_robot_memory_thread.cpp | 212 ++++++++++---------- 1 files changed, 104 insertions(+), 108 deletions(-) _Diff for modified files_: - *commit* 6f0fb3f4611733204e2f210499e10ece0e861c10 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Apr 25 12:31:34 2018 +0200 Subject: Merge remote-tracking branch 'origin/timn/clips-executive-wm-robmem-sync' into current src/plugins/clips-executive/clips/lock-actions.clp | 30 +++++ .../clips/test-scenario/print-action.clp | 2 +- .../clips-executive/clips/wm-robmem-sync.clp | 20 +++- .../clips_robot_memory_thread.cpp | 51 ++++++++ .../clips-robot-memory/clips_robot_memory_thread.h | 18 ++- src/plugins/mongodb/mongodb_replicaset_config.cpp | 2 +- src/plugins/robot-memory/robot_memory.cpp | 134 ++++++++++++++++++++ src/plugins/robot-memory/robot_memory.h | 8 ++ 8 files changed, 256 insertions(+), 9 deletions(-) _Diff for modified files_: - *commit* e3b698725b26ccd8d8d0849027166e3b175e85bf - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Apr 25 12:31:44 2018 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/cx-wm-robmem-sync-blackboard-init-fix' into current .../clips-executive/clips/blackboard-init.clp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: - *commit* 3c7d954fb0a6911af2dcaf7b7bb6e8f49f1c1020 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Apr 25 21:03:00 2018 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/laser-calibration' into current src/libs/tf/transform_listener.cpp | 16 ++- src/libs/tf/transform_listener.h | 4 +- src/plugins/laser-lines/laser-lines-thread.cpp | 76 ++++---- src/plugins/laser-lines/laser-lines-thread.h | 12 + src/tools/Makefile | 2 +- src/tools/laser_calibration/Makefile | 61 ++++++ src/tools/laser_calibration/laser_calibration.cpp | 188 +++++++++++++++++ src/tools/laser_calibration/laser_calibration.h | 92 +++++++++ src/tools/laser_calibration/main.cpp | 215 ++++++++++++++++++++ src/tools/laser_calibration/pitch_calibration.cpp | 66 ++++++ src/tools/laser_calibration/pitch_calibration.h | 40 ++++ src/tools/laser_calibration/roll_calibration.cpp | 101 +++++++++ src/tools/laser_calibration/roll_calibration.h | 45 ++++ .../laser_calibration/time_offset_calibration.cpp | 148 ++++++++++++++ .../laser_calibration/time_offset_calibration.h | 47 +++++ src/tools/laser_calibration/yaw_calibration.cpp | 121 +++++++++++ src/tools/laser_calibration/yaw_calibration.h | 52 +++++ 17 files changed, 1246 insertions(+), 40 deletions(-) _Diff for modified files_: diff --cc src/plugins/laser-lines/laser-lines-thread.cpp index 4cba69d,a9ba2aa..32e758f --- a/src/plugins/laser-lines/laser-lines-thread.cpp +++ b/src/plugins/laser-lines/laser-lines-thread.cpp @@@ -61,7 -61,8 +61,8 @@@ using namespace fawkes LaserLinesThread::LaserLinesThread() : Thread("LaserLinesThread", Thread::OPMODE_WAITFORWAKEUP), BlockedTimingAspect(BlockedTimingAspect::WAKEUP_HOOK_SENSOR_PROCESS), + ConfigurationChangeHandler(CFG_PREFIX), - TransformAspect(TransformAspect::BOTH, "laser_lines") + TransformAspect(TransformAspect::BOTH_DEFER_PUBLISHER) { } @@@ -132,7 -101,7 +101,7 @@@ LaserLinesThread::init( //2.2.2: actually opening the interfaces line_ifs_[i] = -- blackboard->open_for_writing<LaserLineInterface>(id.c_str()); ++ blackboard->open_for_writing<LaserLineInterface>(id.c_str()); if(cfg_moving_avg_enabled_) { line_avg_ifs_[i] = diff --cc src/tools/Makefile index 286dac2,749923b..df99477 --- a/src/tools/Makefile +++ b/src/tools/Makefile @@@ -17,7 -17,7 +17,7 @@@ BASEDIR = ../. SUBDIRS = plugin logview config plugin_gui netloggui \ lasergui skillgui battery_monitor ffinfo vision set_pose \ - eclipse_debugger plugin_generator pddl_parser - eclipse_debugger plugin_generator laser_calibration ++ eclipse_debugger plugin_generator pddl_parser laser_calibration include $(BASEDIR)/etc/buildsys/config.mk include $(BUILDSYSDIR)/rules.mk - *commit* 1e0e468699cc4355d81f2e3fc6add90b091c5d84 - - - - - - - - - - Author: Nicolas Limpert <limp...@fh-aachen.de> Date: Wed Apr 25 21:46:14 2018 +0200 Subject: laser-filter: add Makefile for interfaces subfolder src/plugins/laser-filter/Makefile | 2 +- .../interfaces/Makefile | 0 2 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/laser-filter/Makefile b/src/plugins/laser-filter/Makefile index fc09588..0701671 100644 --- a/src/plugins/laser-filter/Makefile +++ b/src/plugins/laser-filter/Makefile @@ -17,7 +17,7 @@ BASEDIR = ../../.. include $(BASEDIR)/etc/buildsys/config.mk include $(BUILDCONFDIR)/tf/tf.mk -SUBDIRS = deadspots +SUBDIRS = deadspots interfaces LIBS_laser_filter = m fawkescore fawkesutils fawkesaspects fawkesblackboard \ fawkesinterface \ - *commit* 088d2a8013662db7c26ce89f9e907ee43b03d0d2 - - - - - - - - - - Author: Nicolas Limpert <limp...@fh-aachen.de> Date: Wed Apr 25 21:47:22 2018 +0200 Subject: laser-filter: add LaserBoxFilterInterface .../interfaces/LaserBoxFilterInterface.cpp | 453 ++++++++++++++++++++ .../interfaces/LaserBoxFilterInterface.h_ext | 117 +++++ .../interfaces/LaserBoxFilterInterface.tolua} | 35 +- .../interfaces/LaserBoxFilterInterface.xml | 20 + 4 files changed, 614 insertions(+), 11 deletions(-) - *commit* 8d320f2c45688c05cf72889f0b66336120c8b693 - - - - - - - - - - Author: Nicolas Limpert <limp...@fh-aachen.de> Date: Wed Apr 25 21:40:37 2018 +0200 Subject: laser-filter: add laser filter to exclude boxes src/plugins/laser-filter/filter_thread.cpp | 7 + .../filters/{map_filter.cpp => box_filter.cpp} | 142 ++++++++++++-------- .../filters/{map_filter.h => box_filter.h} | 36 ++++-- 3 files changed, 117 insertions(+), 68 deletions(-) _Diff for modified files_: diff --git a/src/plugins/laser-filter/filter_thread.cpp b/src/plugins/laser-filter/filter_thread.cpp index e13ed9f..9c649db 100644 --- a/src/plugins/laser-filter/filter_thread.cpp +++ b/src/plugins/laser-filter/filter_thread.cpp @@ -32,6 +32,7 @@ #ifdef HAVE_TF # include "filters/projection.h" #include "filters/map_filter.h" + #include "filters/box_filter.h" #endif #include <core/threading/barrier.h> @@ -504,6 +505,12 @@ LaserFilterThread::create_filter(std::string filter_name, #else throw Exception("Projection filter unavailable, tf missing"); #endif + } else if (filter_type == "box_filter") { +#ifdef HAVE_TF + return new LaserBoxFilterDataFilter(filter_name, in_data_size, inbufs, tf_listener, config, logger, blackboard); +#else + throw Exception("Projection filter unavailable, tf missing"); +#endif } else { throw Exception("Unknown filter type %s", filter_type.c_str()); } - *commit* 1f251f0efb16eedc379bafa239ef4a9fb613121c - - - - - - - - - - Author: Nicolas Limpert <limp...@fh-aachen.de> Date: Thu Apr 26 10:41:17 2018 +0200 Subject: laser-filter/Makefile: set interfaces as PRESUBDIRS src/plugins/laser-filter/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/laser-filter/Makefile b/src/plugins/laser-filter/Makefile index 0701671..ed4e509 100644 --- a/src/plugins/laser-filter/Makefile +++ b/src/plugins/laser-filter/Makefile @@ -17,7 +17,8 @@ BASEDIR = ../../.. include $(BASEDIR)/etc/buildsys/config.mk include $(BUILDCONFDIR)/tf/tf.mk -SUBDIRS = deadspots interfaces +PRESUBDIRS = interfaces +SUBDIRS = deadspots LIBS_laser_filter = m fawkescore fawkesutils fawkesaspects fawkesblackboard \ fawkesinterface \ - *commit* c2d06a9692adc00943a513351987ed583a74bb59 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu Apr 26 15:24:31 2018 +0200 Subject: clips-executive: cancel the Skiller if its action disappeared .../clips-executive/clips/skills-actions.clp | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/skills-actions.clp b/src/plugins/clips-executive/clips/skills-actions.clp index 5f5dc8d..b133e9e 100644 --- a/src/plugins/clips-executive/clips/skills-actions.clp +++ b/src/plugins/clips-executive/clips/skills-actions.clp @@ -85,3 +85,17 @@ (modify ?pa (status EXECUTION-FAILED)) (retract ?sf ?pe) ) + +(defrule skill-action-cancel-if-action-does-not-exist + ?pe <- (skill-action-execinfo (goal-id ?goal-id) (plan-id ?plan-id) + (action-id ?id) (skill-id ?skill-id)) + (skill (id ?skill-id) (status S_RUNNING)) + (not (plan-action (goal-id ?goal-id) (plan-id ?plan-id) (id ?id))) + => + (printout warn + "Cancelling Skill Execution, corresponding action does not exist" crlf) + (bind ?m + (blackboard-create-msg "SkillerInterface::Skiller" "StopExecMessage")) + (blackboard-send-msg ?m) + (retract ?pe) +) - *commit* b2924147c1a2e8a586d3bc61bc60c13bc4eef233 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu Apr 26 16:59:13 2018 +0200 Subject: clips-executive: retract stray skill-execinfo .../clips-executive/clips/skills-actions.clp | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/skills-actions.clp b/src/plugins/clips-executive/clips/skills-actions.clp index b133e9e..9f031a1 100644 --- a/src/plugins/clips-executive/clips/skills-actions.clp +++ b/src/plugins/clips-executive/clips/skills-actions.clp @@ -99,3 +99,12 @@ (blackboard-send-msg ?m) (retract ?pe) ) + +(defrule skill-action-retract-execinfo-without-action + ?pe <- (skill-action-execinfo (goal-id ?goal-id) (plan-id ?plan-id) + (action-id ?id)) + (not (skill (status S_RUNNING))) + (not (plan-action (goal-id ?goal-id) (plan-id ?plan-id) (id ?action-id))) + => + (retract ?pe) +) - *commit* 12f8cb3ef5792f13b05cc4ff9f7c889f24a7b901 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu Apr 26 17:01:17 2018 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/cx-cancel-skiller-if-action-disappeared' into current .../clips-executive/clips/skills-actions.clp | 23 ++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) _Diff for modified files_: - *commit* d0f370fad42abf2b347ad0063f3a350ab614dd5f - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Fri Mar 23 16:46:33 2018 +0100 Subject: robot-memory: fix make config to allow inclusion from other repos src/plugins/robot-memory/robot_memory.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) _Diff for modified files_: diff --git a/src/plugins/robot-memory/robot_memory.mk b/src/plugins/robot-memory/robot_memory.mk index 739dcf7..2739fc8 100644 --- a/src/plugins/robot-memory/robot_memory.mk +++ b/src/plugins/robot-memory/robot_memory.mk @@ -15,8 +15,8 @@ include $(BASEDIR)/etc/buildsys/config.mk include $(BUILDCONFDIR)/tf/tf.mk -include $(BASEDIR)/src/plugins/mongodb/mongodb.mk -include $(BASEDIR)/etc/buildsys/boost.mk +include $(FAWKES_BASEDIR)/src/plugins/mongodb/mongodb.mk +include $(BUILDSYSDIR)/boost.mk REQ_BOOST_LIBS = bind function HAVE_BOOST_LIBS = $(call boost-have-libs,$(REQ_BOOST_LIBS)) - *commit* 2f76d93e62296b53d0c1855be20fc016a9fa6e88 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu Apr 26 19:41:29 2018 +0200 Subject: clips-executive: also create pending effects if action is not waiting src/plugins/clips-executive/clips/domain.clp | 6 +++--- 1 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 6a5cc7c..c0819d0 100644 --- a/src/plugins/clips-executive/clips/domain.clp +++ b/src/plugins/clips-executive/clips/domain.clp @@ -466,7 +466,7 @@ (status EXECUTION-SUCCEEDED) (param-names $?action-param-names) (param-values $?action-param-values)) - (domain-operator (name ?op) (wait-sensed TRUE)) + (domain-operator (name ?op)) => (bind ?next-state SENSED-EFFECTS-HOLD) (do-for-all-facts ((?e domain-effect) (?pred domain-predicate)) @@ -491,8 +491,8 @@ ) (defrule domain-effects-ignore-sensed - "Apply effects of an action after it succeeded." - ?pa <- (plan-action (id ?id) (action-name ?op) (status EXECUTION-SUCCEEDED)) + "Do not wait for sensed effects if the operator is not a waiting operator." + ?pa <- (plan-action (id ?id) (action-name ?op) (status SENSED-EFFECTS-WAIT)) (domain-operator (name ?op) (wait-sensed FALSE)) => (modify ?pa (status SENSED-EFFECTS-HOLD)) - *commit* a668ba4db9d471fc9988dce6dfa74b9eb7d48fe7 - - - - - - - - - - Author: Victor Mataré <mat...@lih.rwth-aachen.de> Date: Thu Apr 26 22:12:42 2018 +0200 Subject: Merge remote-tracking branch 'origin/nlimpert/laser_filter_box_filter' into common/current src/plugins/laser-filter/Makefile | 1 + src/plugins/laser-filter/filter_thread.cpp | 7 + .../filters/{map_filter.cpp => box_filter.cpp} | 142 ++++--- .../filters/{map_filter.h => box_filter.h} | 36 ++- .../interfaces/LaserBoxFilterInterface.cpp | 453 ++++++++++++++++++++ .../interfaces/LaserBoxFilterInterface.h_ext | 117 +++++ .../interfaces/LaserBoxFilterInterface.tolua} | 35 +- .../interfaces/LaserBoxFilterInterface.xml | 20 + .../interfaces/Makefile | 0 9 files changed, 732 insertions(+), 79 deletions(-) _Diff for modified files_: - *commit* e95b1c12a85903e63f3b230bce8d476c77b58c55 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Fri Apr 27 08:41:51 2018 +0200 Subject: clips-executive: add missing condition when cancelling skill .../clips-executive/clips/skills-actions.clp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/skills-actions.clp b/src/plugins/clips-executive/clips/skills-actions.clp index 9f031a1..c8c7646 100644 --- a/src/plugins/clips-executive/clips/skills-actions.clp +++ b/src/plugins/clips-executive/clips/skills-actions.clp @@ -102,8 +102,8 @@ (defrule skill-action-retract-execinfo-without-action ?pe <- (skill-action-execinfo (goal-id ?goal-id) (plan-id ?plan-id) - (action-id ?id)) - (not (skill (status S_RUNNING))) + (action-id ?id) (skill-id ?skill-id)) + (not (skill (status S_RUNNING) (skill-id ?skill-id))) (not (plan-action (goal-id ?goal-id) (plan-id ?plan-id) (id ?action-id))) => (retract ?pe) - *commit* bce042eba38270f6b529902030a9be611884ae12 - - - - - - - - - - Author: Victor Mataré <mat...@lih.rwth-aachen.de> Date: Fri Apr 27 08:51:57 2018 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/cx-cancel-skiller-if-action-disappeared' into common/current .../clips-executive/clips/skills-actions.clp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) _Diff for modified files_: - *commit* 97303313ecbc4f48812456810f99dcd53884ca80 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Fri Apr 27 09:01:19 2018 +0200 Subject: fixup! clips-executive: add missing condition when cancelling skill .../clips-executive/clips/skills-actions.clp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/skills-actions.clp b/src/plugins/clips-executive/clips/skills-actions.clp index c8c7646..a375423 100644 --- a/src/plugins/clips-executive/clips/skills-actions.clp +++ b/src/plugins/clips-executive/clips/skills-actions.clp @@ -103,7 +103,7 @@ (defrule skill-action-retract-execinfo-without-action ?pe <- (skill-action-execinfo (goal-id ?goal-id) (plan-id ?plan-id) (action-id ?id) (skill-id ?skill-id)) - (not (skill (status S_RUNNING) (skill-id ?skill-id))) + (not (skill (status S_RUNNING) (id ?skill-id))) (not (plan-action (goal-id ?goal-id) (plan-id ?plan-id) (id ?action-id))) => (retract ?pe) - *commit* 54948dd54dcabf586204600e1f0588df2e820acd - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Fri Apr 27 09:02:09 2018 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/cx-cancel-skiller-if-action-disappeared' into current .../clips-executive/clips/skills-actions.clp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: - *commit* 9b04d45876bdcf2cebebf75f21e979e52e090ec3 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Fri Apr 27 14:47:58 2018 +0200 Subject: Merge remote-tracking branch 'fawkesrobotics/timn/webview-2.0' into current src/libs/webview/reply.cpp | 6 +- src/libs/webview/reply.h | 2 +- src/libs/webview/request_dispatcher.cpp | 5 +- src/plugins/clips-executive/rest-api/api.yaml | 2 +- .../components/goal-list.component.ts | 167 ++++++++++++++++++- .../parts/clips-executive/models/DomainEffect.ts | 5 +- .../src/parts/clips-executive/models/DomainFact.ts | 5 +- .../parts/clips-executive/models/DomainObject.ts | 5 +- .../clips-executive/models/DomainObjectType.ts | 5 +- .../parts/clips-executive/models/DomainOperator.ts | 5 +- .../models/DomainOperatorParameter.ts | 5 +- .../clips-executive/models/DomainPrecondition.ts | 8 +- .../models/DomainPreconditionAtom.ts | 8 +- .../models/DomainPreconditionCompound.ts | 8 +- .../clips-executive/models/DomainPredicate.ts | 5 +- .../src/parts/clips-executive/models/Goal.ts | 5 +- .../src/parts/clips-executive/models/Plan.ts | 5 +- .../src/parts/clips-executive/models/PlanAction.ts | 5 +- .../backend-config/backend-config.service.ts | 7 +- .../update-notifier/update-notifier.service.ts | 5 +- 20 files changed, 231 insertions(+), 37 deletions(-) _Diff for modified files_: - *commit* 12128ffa54d7a0dddf693024cee6f56c9a267572 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Fri Apr 27 19:50:27 2018 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/clips-executive-always-check-pending-effects' into current src/plugins/clips-executive/clips/domain.clp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) _Diff for modified files_: diff --cc src/plugins/clips-executive/clips/domain.clp index 860c604,c0819d0..fbc3cc4 --- a/src/plugins/clips-executive/clips/domain.clp +++ b/src/plugins/clips-executive/clips/domain.clp @@@ -715,9 -491,8 +715,9 @@@ ) (defrule domain-effects-ignore-sensed - "Apply effects of an action after it succeeded." + (declare (salience ?*SALIENCE-DOMAIN-APPLY*)) - ?pa <- (plan-action (id ?id) (action-name ?op) (status EXECUTION-SUCCEEDED)) + "Do not wait for sensed effects if the operator is not a waiting operator." + ?pa <- (plan-action (id ?id) (action-name ?op) (status SENSED-EFFECTS-WAIT)) (domain-operator (name ?op) (wait-sensed FALSE)) => (modify ?pa (status SENSED-EFFECTS-HOLD)) - *commit* 85cbaae011cfd71d0d3d4ebe0af56a7b3bd7df9d - - - - - - - - - - Author: Mostafa Gomaa <go...@kbsg.rwth-aachen.de> Date: Sat Apr 28 08:27:18 2018 +0200 Subject: clips-executive: typo in defrule domain-effects-ignore-sensed src/plugins/clips-executive/clips/domain.clp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/domain.clp b/src/plugins/clips-executive/clips/domain.clp index fbc3cc4..87e3e5e 100644 --- a/src/plugins/clips-executive/clips/domain.clp +++ b/src/plugins/clips-executive/clips/domain.clp @@ -715,8 +715,8 @@ ) (defrule domain-effects-ignore-sensed - (declare (salience ?*SALIENCE-DOMAIN-APPLY*)) "Do not wait for sensed effects if the operator is not a waiting operator." + (declare (salience ?*SALIENCE-DOMAIN-APPLY*)) ?pa <- (plan-action (id ?id) (action-name ?op) (status SENSED-EFFECTS-WAIT)) (domain-operator (name ?op) (wait-sensed 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
