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/skiller-msgid has been updated discards 623ba8fa43a4cce717f5461c3f1e900bf577ce80 (commit) discards 0055602ca6a4f773a1a5fc2e79c6141c51a8be3c (commit) to 34ed5046a921e8e5e32ad49a12781e5a0ed8013f (commit) via 369257caa1ef4f3ece58a3f5c989f6f525a9395b (commit) via d746d321b15fd72e7924ffdba8df9ca1c2c6c107 (commit) via 9a5810a6596cab0a07722c9a21af70aa27b0718a (commit) via 3fd1947ed0623b3f796ac39d281ebe7d38895a9b (commit) via f355be2f09de7497ac63ca80b1a69d455c464475 (commit) via 0e3556b8b9100331e7408069c9fc9f13b987c7fc (commit) via 596aa8c67302f8d02537b1355bf78c6ad1168ea8 (commit) via 346c4d1749ab888d2d461ab75c8539c39da941a8 (commit) via 0457df01e18263090371d9c2d1279bd8564df4ea (commit) via 1c2aa0b2a9afe51572aaae5bbb882bad6bb70353 (commit) via 4ecfcc89359346977202c2bc0886dc420d761b08 (commit) via 59e39515a6f6f72661e86ed32efec7c9087ddb37 (commit) via e4ef942cd36f0e066333d329f5c7a2ae66dd132a (commit) via 6672abd3e7270bd6dcdbe5f4e7eb3656b6fa2f31 (commit) via dc185bf3d55c21985d0737f0be7390552d661c6b (commit) via 3070c16a52fbee6695f55b9a6635812a654447cc (commit) via 06c3304a582b9468b5fd93104f307fad2babb9be (commit) via 331b6ab57ac917f884e20c00606fe28a3b9a3b12 (commit) via 908dd57120eb68d3971d8c4ea329da01e708010e (commit) via e6981f7799774379b58ce61cc4d852c450d5f976 (commit) via 979a57ba0cbaea1e54581c858b9b52d85f9e96e1 (commit) via da854f8f791517caee85f16390da5f6134fbe761 (commit) via 24f7cc3edac9988885d6898489af0efd2d2eae4b (commit) via 2e229f31c2df3f678d0f2817d6ae53fce01a0933 (commit) via 65ed2c774d788e89da0a95827dfe21bb7bc5b1bd (commit) via 9704fe5171d1c817a34e984a87d3b013e945947f (commit) via 003f3c457b468ee0c1b953676a99c31a99b91aa8 (commit) via 81b7ff25c94ff2e63771621bab45d96190dc2ad3 (commit) via bc9abd45daabeb2a04fa668ba5c53f78e14833d0 (commit) via 008d620444890d5c46e2f93102846e2d9dc5947e (commit) via 783aae9bc2918d9476df40d0e31a9373f4dd718f (commit) via 40cac8f6aa2aef2e75eca6461cd6e0afabefdc15 (commit) via cf6b0873e6bfe37d640f009a928699d5872400d8 (commit) via 104f9bfeb4ef3a55f775959f65df096c59442831 (commit) via 3e59dfba8512a70f6d6ba7e39c0a40993a4ae183 (commit) via aafaf8b2d656682f4106bbe3b5c6a2e1a1368f42 (commit) via 27f93c275c77025f184e3fbf9e5c9f473a9e43d7 (commit) via 1f1a99458641380bd656fcf658b0dc42c9d787f4 (commit) via 2aa4004dd6330e414fb2231f0918bfdf9de9d0da (commit) via f2a8cd1c3c03e58459deb0592528cab87e72d33c (commit) via 91d371dd30d4be14dc2c7c14e55fcb69d5472213 (commit) via 95cceb892c9c930cbddaeb2a4036871b2e3992ff (commit) via 9bb9d740b583679f904bc9bdedd91a085d3b4d5f (commit) via cc5ab712f7dd6aa8431856db06f21bca3185ea0d (commit) via 0de564e67e4fb88862c91978cb7e4ce4130f51b7 (commit) via fc400f52e02b59dac702209cc9458650e90acb16 (commit) via 335e93bbcdf91c3545f215e710cb38c24848c4e8 (commit) via ec777a7f649d1a0cebfc1c36b168c2981335d87d (commit) via 3374f78c13e5b0d29f5985ea3e108b4c364c0a98 (commit) via 54b57bb867e21970470fdd06e055f64d4cbb69fa (commit) via 8e75fcc2de0023a288bf7fbe0ab7b60dff06782b (commit) via 55f8fbb46475574843a04a61fc734470ecf4f4d9 (commit) via 1fa6aed827d2bb5db2e10f8dc6543bf9410a8f55 (commit) via 7d457ed533b1d4214b96d57c7acc0f5faa02e16f (commit) via 9be764782ef64cb8458825ef07dba4a66210989a (commit) via 7681f8292ff44747e30aacf79df8e6f2b51f6cc9 (commit) via ef6c1f197be8819a0978002eb4d400fb85da4130 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (623ba8fa43a4cce717f5461c3f1e900bf577ce80) \ N -- N -- N (34ed5046a921e8e5e32ad49a12781e5a0ed8013f) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/thofmann/skiller-msgid 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 369257caa1ef4f3ece58a3f5c989f6f525a9395b Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Aug 19 17:48:45 2014 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Oct 9 15:36:56 2014 +0200 interfaces: add msgid field to the SkillerInterface The msgid is the ID of the last ExecSkill or ExecSkillContinuous message which has been processed. This way, a controller can easily check whether its skill message has already been processed. In particular, this avoids timing problems where a controller sends a skill message and then reads the skiller status immediately, reading the status for the wrong skill. http://git.fawkesrobotics.org/fawkes.git/commit/369257c http://trac.fawkesrobotics.org/changeset/369257c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 34ed5046a921e8e5e32ad49a12781e5a0ed8013f Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Aug 19 17:53:53 2014 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Oct 9 15:40:26 2014 +0200 skiller: set the msgid field if a new skill message is received The msgid is the ID of the last ExecSkill or ExecSkillContinuous message which has been processed. http://git.fawkesrobotics.org/fawkes.git/commit/34ed504 http://trac.fawkesrobotics.org/changeset/34ed504 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- cfg/conf.d/skiller.yaml | 8 + etc/buildsys/btypes/config_fawkes.mk | 2 +- etc/buildsys/clang.mk | 8 + etc/buildsys/config.mk | 5 + etc/buildsys/gcc.mk | 28 ++++ etc/buildsys/lua.mk | 9 +- etc/buildsys/protobuf.mk | 4 +- res/guis/skillgui/skillgui.ui | 100 ++++---------- src/libs/baseapp/run.cpp | 21 +++ src/libs/baseapp/run.h | 3 + src/libs/config/net_handler.h | 2 +- src/libs/config/sqlite.cpp | 15 +-- src/libs/core/threading/thread.cpp | 2 + src/libs/fvcams/v4l2.cpp | 1 - .../relative_position/position_to_pixel.cpp | 72 ++++++--- .../fvmodels/relative_position/position_to_pixel.h | 5 +- src/libs/fvutils/base/roi.cpp | 2 +- src/libs/interfaces/SkillerInterface.cpp | 151 +------------------- src/libs/interfaces/SkillerInterface.h | 37 ----- src/libs/interfaces/SkillerInterface.tolua | 14 -- src/libs/interfaces/SkillerInterface.xml | 15 +-- src/libs/protobuf_clips/communicator.h | 3 +- src/libs/protobuf_comm/client.cpp | 8 + src/libs/protobuf_comm/message_register.cpp | 10 ++ src/libs/protobuf_comm/message_register.h | 10 ++ src/libs/protobuf_comm/server.cpp | 3 + src/libs/protobuf_comm/server.h | 9 +- src/libs/tf/tf.mk | 2 +- src/libs/webview/request.cpp | 1 + src/lua/fawkes/mathext.lua | 22 +-- src/lua/fawkes/modinit.lua | 6 + src/lua/luaagent/skillqueue.lua | 2 +- src/lua/skiller/skillenv.lua | 3 + src/plugins/Makefile | 3 + src/plugins/amcl/Makefile | 4 +- src/plugins/amcl/amcl_thread.cpp | 33 +++-- src/plugins/amcl/map_lasergen_thread.cpp | 5 +- src/plugins/clips-agent/clips_agent_thread.cpp | 4 +- src/plugins/colli/Makefile | 3 +- src/plugins/colli/colli_thread.cpp | 20 ++- src/plugins/colli/colli_thread.h | 5 - .../colli/drive_modes/select_drive_mode.cpp | 32 ++-- src/plugins/colli/visualization_thread.h | 6 +- src/plugins/gossip/gossip/gossip_group.cpp | 31 ++++ src/plugins/gossip/gossip/gossip_group.h | 6 + src/plugins/gossip/gossip/gossip_group_manager.cpp | 45 +++++- src/plugins/gossip/gossip/gossip_group_manager.h | 6 +- src/plugins/gossip/gossip_thread.cpp | 29 +++- src/plugins/laser-cluster/Makefile | 4 +- src/plugins/laser-cluster/laser-cluster-thread.cpp | 7 +- src/plugins/laser-lines/Makefile | 4 +- src/plugins/laser-lines/laser-lines-thread.cpp | 7 +- src/plugins/laser/Makefile | 2 +- src/plugins/laser/sick_tim55x_common_aqt.cpp | 7 +- src/plugins/laser/sick_tim55x_ethernet_aqt.h | 1 - src/plugins/laser/sick_tim55x_usb_aqt.h | 1 - src/plugins/perception/pcl-db/Makefile | 3 +- src/plugins/perception/tabletop-objects/Makefile | 1 + src/plugins/ros/Makefile | 3 +- src/plugins/skiller/Makefile | 1 + src/plugins/skiller/consoletool/skillet.cpp | 23 +--- src/plugins/skiller/consoletool/skillet.txt | 13 +-- src/plugins/skiller/exec_thread.cpp | 137 ++++++++---------- src/plugins/skiller/exec_thread.h | 14 ++- src/plugins/skiller/skiller_feature.cpp | 47 ++++++ .../skiller_feature.h} | 38 +++--- src/plugins/skiller/skiller_navgraph_feature.cpp | 81 +++++++++++ .../skiller_navgraph_feature.h} | 47 +++---- src/plugins/skiller/skiller_plugin.cpp | 16 ++- src/tools/skillgui/skillgui.cpp | 26 +--- src/tools/skillgui/skillgui.h | 3 - 71 files changed, 690 insertions(+), 611 deletions(-) create mode 100644 src/plugins/skiller/skiller_feature.cpp copy src/plugins/{ros/move_base_plugin.cpp => skiller/skiller_feature.h} (59%) create mode 100644 src/plugins/skiller/skiller_navgraph_feature.cpp copy src/plugins/{ros/odometry_thread.h => skiller/skiller_navgraph_feature.h} (59%) - *Diffs* ------------------------------------------------------------- - *commit* 369257caa1ef4f3ece58a3f5c989f6f525a9395b - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Aug 19 17:48:45 2014 +0200 Subject: interfaces: add msgid field to the SkillerInterface src/libs/interfaces/SkillerInterface.cpp | 42 +++++++++++++++++++++++++++- src/libs/interfaces/SkillerInterface.h | 8 +++++ src/libs/interfaces/SkillerInterface.tolua | 3 ++ src/libs/interfaces/SkillerInterface.xml | 5 +++ 4 files changed, 57 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/libs/interfaces/SkillerInterface.cpp b/src/libs/interfaces/SkillerInterface.cpp index 6d5c4c8..8808d01 100644 --- a/src/libs/interfaces/SkillerInterface.cpp +++ b/src/libs/interfaces/SkillerInterface.cpp @@ -55,12 +55,13 @@ SkillerInterface::SkillerInterface() : Interface() add_fieldinfo(IFT_STRING, "error", 128, data->error); add_fieldinfo(IFT_UINT32, "exclusive_controller", 1, &data->exclusive_controller); add_fieldinfo(IFT_ENUM, "status", 1, &data->status, "SkillStatusEnum"); + add_fieldinfo(IFT_UINT32, "msgid", 1, &data->msgid); add_messageinfo("ExecSkillMessage"); add_messageinfo("RestartInterpreterMessage"); add_messageinfo("StopExecMessage"); add_messageinfo("AcquireControlMessage"); add_messageinfo("ReleaseControlMessage"); - unsigned char tmp_hash[] = {0x85, 0xe6, 0xef, 0x71, 0xff, 0x6b, 0xe2, 0x3a, 0xdc, 0xb4, 0xca, 0xd9, 0xc4, 0xfe, 0xe4, 0x18}; + unsigned char tmp_hash[] = {0xd3, 0x40, 0x95, 0xe3, 0xd7, 0x9b, 0xd0, 0xd3, 0xe0, 0x1e, 0xa1, 0xfa, 0xfd, 0x92, 0x50, 0x27}; set_hash(tmp_hash); } @@ -231,6 +232,45 @@ SkillerInterface::set_status(const SkillStatusEnum new_status) data_changed = true; } +/** Get msgid value. + * + The ID of the ExecSkill or ExecSkillContinuous message that is currently + being processed, or the ID of the last processed message if no skill is being + executed. + + * @return msgid value + */ +uint32_t +SkillerInterface::msgid() const +{ + return data->msgid; +} + +/** Get maximum length of msgid value. + * @return length of msgid value, can be length of the array or number of + * maximum number of characters for a string + */ +size_t +SkillerInterface::maxlenof_msgid() const +{ + return 1; +} + +/** Set msgid value. + * + The ID of the ExecSkill or ExecSkillContinuous message that is currently + being processed, or the ID of the last processed message if no skill is being + executed. + + * @param new_msgid new msgid value + */ +void +SkillerInterface::set_msgid(const uint32_t new_msgid) +{ + data->msgid = new_msgid; + data_changed = true; +} + /* =========== message create =========== */ Message * SkillerInterface::create_message(const char *type) const diff --git a/src/libs/interfaces/SkillerInterface.h b/src/libs/interfaces/SkillerInterface.h index bb052eb..8d02654 100644 --- a/src/libs/interfaces/SkillerInterface.h +++ b/src/libs/interfaces/SkillerInterface.h @@ -70,6 +70,11 @@ class SkillerInterface : public Interface int32_t status; /**< The status of the current skill execution. */ + uint32_t msgid; /**< + The ID of the ExecSkill or ExecSkillContinuous message that is currently + being processed, or the ID of the last processed message if no skill is being + executed. + */ } SkillerInterface_data_t; #pragma pack(pop) @@ -224,6 +229,9 @@ class SkillerInterface : public Interface SkillStatusEnum status() const; void set_status(const SkillStatusEnum new_status); size_t maxlenof_status() const; + uint32_t msgid() const; + void set_msgid(const uint32_t new_msgid); + size_t maxlenof_msgid() const; virtual Message * create_message(const char *type) const; virtual void copy_values(const Interface *other); diff --git a/src/libs/interfaces/SkillerInterface.tolua b/src/libs/interfaces/SkillerInterface.tolua index 84a6379..69432d9 100644 --- a/src/libs/interfaces/SkillerInterface.tolua +++ b/src/libs/interfaces/SkillerInterface.tolua @@ -68,6 +68,9 @@ class SkillerInterface : public Interface SkillStatusEnum status(); void set_status(const SkillStatusEnum new_status); int maxlenof_status() const; + unsigned int msgid(); + void set_msgid(const unsigned int new_msgid); + int maxlenof_msgid() const; bool oftype(const char *interface_type) const; const void * datachunk() const; unsigned int datasize() const; diff --git a/src/libs/interfaces/SkillerInterface.xml b/src/libs/interfaces/SkillerInterface.xml index 74e8b01..21aca17 100644 --- a/src/libs/interfaces/SkillerInterface.xml +++ b/src/libs/interfaces/SkillerInterface.xml @@ -34,6 +34,11 @@ <field type="SkillStatusEnum" name="status"> The status of the current skill execution. </field> + <field type="uint32" name="msgid"> + The ID of the ExecSkill or ExecSkillContinuous message that is currently + being processed, or the ID of the last processed message if no skill is being + executed. + </field> </data> <message name="ExecSkill"> <comment> - *commit* 34ed5046a921e8e5e32ad49a12781e5a0ed8013f - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Aug 19 17:53:53 2014 +0200 Subject: skiller: set the msgid field if a new skill message is received src/plugins/skiller/exec_thread.cpp | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/skiller/exec_thread.cpp b/src/plugins/skiller/exec_thread.cpp index 06db2a5..e1c5da9 100644 --- a/src/plugins/skiller/exec_thread.cpp +++ b/src/plugins/skiller/exec_thread.cpp @@ -514,6 +514,8 @@ SkillerExecutionThread::loop() skill_enqueued = true; curss = m->skill_string(); + __skiller_if->set_msgid(m->id()); + write_skiller_if = true; __continuous_reset = true; } } else { -- 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
