OldProjects/homeos_ws
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
matzman
2015-05-21 02:05:38 +02:00
parent 37ebf68d6b
commit 19cb6e5cbe
49 changed files with 21669 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hos_cosgi_ruleengine/CMakeLists.txt
+3 -4
View File
@@ -6,11 +6,10 @@ project(hos_cosgi_ruleengine)
## is used, also find other catkin packages
find_package(catkin REQUIRED COMPONENTS
hos_celix
hos_cosgi_common
hos_cosgi_devicerepository
hos_cosgi_launcher
hos_cosgi_core
hos_cosgi_scripting
hos_cpp_common
hos_cpp_utils
hos_libvariant
roscpp
hos_cpp_cron
@@ -91,7 +90,7 @@ find_package(Boost REQUIRED)
catkin_package(
INCLUDE_DIRS include/${PROJECT_NAME}/
# LIBRARIES hos_cosgi_ruleengine
CATKIN_DEPENDS hos_celix hos_cosgi_common hos_cosgi_devicerepository hos_cosgi_launcher hos_cpp_common hos_libvariant roscpp hos_cpp_cron hos_cosgi_scripting
CATKIN_DEPENDS hos_celix hos_cosgi_devicerepository hos_cosgi_core hos_cpp_utils hos_libvariant roscpp hos_cpp_cron hos_cosgi_scripting
# DEPENDS system_lib
)
src/hos_cosgi_ruleengine/include/hos_cosgi_ruleengine/hos/cosgi/service/ruleengine/ruleengine_service.h
+2 -2
View File
@@ -9,8 +9,8 @@
#define INCLUDE_HOS_COSGI_RULEENGINE_HOS_COSGI_SERVICE_RULEENGINE_RULEENGINE_SERVICE_H_
#include <hos/common/observable.h>
#include <hos/cosgi/service/interface.h>
#include <hos/cosgi/service/Interface.h>
#include <hos/utils/observable.h>
#include <memory>
#include <Variant/Variant.h>
src/hos_cosgi_ruleengine/launch/cosgi_ruleengine.launch
+2 -2
View File
@@ -2,7 +2,7 @@
<group ns="/hos/rules/ruleengine0">
<param name="rulepkg01" textfile="$(find hos_cosgi_ruleengine)/test/rulepkg01.json"/>
</group>
<node name="cosgi_ruleengine" pkg="hos_cosgi_launcher" type="hos_cosgi_launcher" output="screen">
<param name="autostart_bundles" value="$(find hos_cosgi_launcher)/../../build_isolated/hos_cosgi_devicerepository/hos_cosgi_devicerepository.zip $(find hos_cosgi_launcher)/../../build_isolated/hos_cosgi_ruleengine/hos_cosgi_rulesngine.zip $(find hos_cosgi_launcher)/../../devel_isolated/hos_celix/share/celix/bundles/shell.zip $(find hos_cosgi_launcher)/../../devel_isolated/hos_celix/share/celix/bundles/shell_tui.zip $(find hos_cosgi_launcher)/../../devel_isolated/hos_celix/share/celix/bundles/log_service.zip $(find hos_cosgi_launcher)/../../devel_isolated/hos_celix/share/celix/bundles/log_writer.zip $(find hos_cosgi_launcher)/../../devel_isolated/hos_celix/share/celix/bundles/log_writer_syslog.zip"/>
<node name="cosgi_ruleengine" pkg="hos_cosgi_core" type="hos_cosgi_launcher" output="screen">
<param name="autostart_bundles" value="$(find hos_cosgi_core)/../../build_isolated/hos_cosgi_devicerepository/hos_cosgi_devicerepository.zip $(find hos_cosgi_core)/../../build_isolated/hos_cosgi_ruleengine/hos_cosgi_rulesngine.zip $(find hos_cosgi_core)/../../devel_isolated/hos_celix/share/celix/bundles/shell.zip $(find hos_cosgi_core)/../../devel_isolated/hos_celix/share/celix/bundles/shell_tui.zip $(find hos_cosgi_core)/../../devel_isolated/hos_celix/share/celix/bundles/log_service.zip $(find hos_cosgi_core)/../../devel_isolated/hos_celix/share/celix/bundles/log_writer.zip $(find hos_cosgi_core)/../../devel_isolated/hos_celix/share/celix/bundles/log_writer_syslog.zip"/>
</node>
</launch>
src/hos_cosgi_ruleengine/package.xml
+4 -6
View File
@@ -41,19 +41,17 @@
<!-- <test_depend>gtest</test_depend> -->
<buildtool_depend>catkin</buildtool_depend>
<build_depend>hos_celix</build_depend>
<build_depend>hos_cosgi_common</build_depend>
<build_depend>hos_cosgi_devicerepository</build_depend>
<build_depend>hos_cosgi_launcher</build_depend>
<build_depend>hos_cosgi_core</build_depend>
<build_depend>hos_cosgi_scripting</build_depend>
<build_depend>hos_cpp_common</build_depend>
<build_depend>hos_cpp_utils</build_depend>
<build_depend>hos_libvariant</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>hos_cpp_cron</build_depend>
<run_depend>hos_celix</run_depend>
<run_depend>hos_cosgi_common</run_depend>
<run_depend>hos_cosgi_devicerepository</run_depend>
<run_depend>hos_cosgi_launcher</run_depend>
<run_depend>hos_cpp_common</run_depend>
<run_depend>hos_cosgi_core</run_depend>
<run_depend>hos_cpp_utils</run_depend>
<run_depend>hos_libvariant</run_depend>
<run_depend>roscpp</run_depend>
<run_depend>hos_cpp_cron</run_depend>
src/hos_cosgi_ruleengine/src/bundle_activator.cpp
+1 -1
View File
@@ -20,7 +20,7 @@ extern "C" {
#include "celix/constants.h"
}
#include <hos/cosgi/service/core/core_service.h>
#include <hos/cosgi/service/core/CoreService.h>
#include "hos/cosgi/service/ruleengine/ruleengine_serviceimpl.h"
#include <memory>
#include <mutex>
src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/ruleengine_serviceimpl.cpp
+2 -2
View File
@@ -12,7 +12,7 @@
#include <unordered_set>
#include <Variant/Variant.h>
#include <celix/bundle_context.h>
#include <hos/cosgi/service/core/core_service.h>
#include <hos/cosgi/service/core/CoreService.h>
#include <hos/cosgi/service/devicerepository/devicerepository_service.h>
#include <Variant/Variant.h>
@@ -35,7 +35,7 @@ template<> const int implementation::ServiceInfo<RuleEngineServiceImpl>::minor =
void RuleEngineServiceImpl::setCoreService(service::core::CoreService* coreService) {
if (coreService && !this->coreService) {
this->coreService = coreService;
this->nodehandle = coreService->getPrivateNodeHandle();
this->nodehandle = &coreService->getPrivateNodeHandle();
int major = 0, minor = 0;
coreService->getServiceVersion(major, minor);
ROS_INFO_STREAM("RuleEngineService: Found HOSCoreService Version " << major << "." << minor);
src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/ruleengine_serviceimpl.h
+1 -1
View File
@@ -8,7 +8,6 @@
#ifndef INCLUDE_HOS_COSGI_RULEENGINE_HOS_RULEENGINE_SERVICE_IMPL_H_
#define INCLUDE_HOS_COSGI_RULEENGINE_HOS_RULEENGINE_SERVICE_IMPL_H_
#include <hos/cosgi/service/implementation.h>
#include <mutex>
#include <map>
#include <set>
@@ -19,6 +18,7 @@
#include <hos/cosgi/service/ruleengine/ruleengine_service.h>
#include <hos/cosgi/service/scripting/scripting_service.h>
#include <hos/cosgi/service/devicerepository/devicerepository_service.h>
#include <hos/cosgi/service/Implementation.h>
#include <ros/ros.h>
#include <memory>
#include <string>