Skip to content
Snippets Groups Projects
Commit 285c2ce4 authored by Sergi Hernandez's avatar Sergi Hernandez
Browse files

Added a package with watchdog an timeout tools. Experimental.

parents
No related branches found
No related tags found
No related merge requests found
cmake_minimum_required(VERSION 2.8.3)
project(iri_ros_tools)
## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
find_package(catkin REQUIRED)
## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system)
## Uncomment this if the package has a setup.py. This macro ensures
## modules and global scripts declared therein get installed
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
# catkin_python_setup()
################################################
## Declare ROS messages, services and actions ##
################################################
## To declare and build messages, services or actions from within this
## package, follow these steps:
## * Let MSG_DEP_SET be the set of packages whose message types you use in
## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
## * In the file package.xml:
## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET
## * If MSG_DEP_SET isn't empty the following dependencies might have been
## pulled in transitively but can be declared for certainty nonetheless:
## * add a build_depend tag for "message_generation"
## * add a run_depend tag for "message_runtime"
## * In this file (CMakeLists.txt):
## * add "message_generation" and every package in MSG_DEP_SET to
## find_package(catkin REQUIRED COMPONENTS ...)
## * add "message_runtime" and every package in MSG_DEP_SET to
## catkin_package(CATKIN_DEPENDS ...)
## * uncomment the add_*_files sections below as needed
## and list every .msg/.srv/.action file to be processed
## * uncomment the generate_messages entry below
## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
## Generate messages in the 'msg' folder
# add_message_files(
# FILES
# Message1.msg
# Message2.msg
# )
## Generate services in the 'srv' folder
# add_service_files(
# FILES
# Service1.srv
# Service2.srv
# )
## Generate actions in the 'action' folder
# add_action_files(
# FILES
# Action1.action
# Action2.action
# )
## Generate added messages and services with any dependencies listed here
# generate_messages(
# DEPENDENCIES
# std_msgs # Or other packages containing msgs
# )
###################################
## catkin specific configuration ##
###################################
## The catkin_package macro generates cmake config files for your package
## Declare things to be passed to dependent projects
## INCLUDE_DIRS: uncomment this if you package contains header files
## LIBRARIES: libraries you create in this project that dependent projects also need
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
INCLUDE_DIRS include
# LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS roscpp
# DEPENDS system_lib
)
###########
## Build ##
###########
## Specify additional locations of header files
## Your package locations should be listed before other locations
include_directories(include)
## Declare a cpp library
# add_library(iri_ros_tool
# src/${PROJECT_NAME}/iri_ros_tool.cpp
# )
add_library(${PROJECT_NAME} src/timeout.cpp src/watchdog.cpp)
## Declare a cpp executable
# add_executable(iri_ros_tool_node src/iri_ros_tool_node.cpp)
## Add cmake target dependencies of the executable/library
## as an example, message headers may need to be generated before nodes
# add_dependencies(iri_ros_tool_node iri_ros_tool_generate_messages_cpp)
## Specify libraries to link a library or executable target against
# target_link_libraries(iri_ros_tool_node
# ${catkin_LIBRARIES}
# )
#############
## Install ##
#############
# all install targets should use catkin DESTINATION variables
# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
## Mark executable scripts (Python etc.) for installation
## in contrast to setup.py, you can choose the destination
# install(PROGRAMS
# scripts/my_python_script
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# )
## Mark executables and/or libraries for installation
# install(TARGETS iri_ros_tool iri_ros_tool_node
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# )
## Mark cpp header files for installation
# install(DIRECTORY include/${PROJECT_NAME}/
# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
# FILES_MATCHING PATTERN "*.h"
# PATTERN ".svn" EXCLUDE
# )
## Mark other files for installation (e.g. launch and bag files, etc.)
# install(FILES
# # myfile1
# # myfile2
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
# )
#############
## Testing ##
#############
## Add gtest based cpp test target and link libraries
# catkin_add_gtest(${PROJECT_NAME}-test test/test_iri_ros_tool.cpp)
# if(TARGET ${PROJECT_NAME}-test)
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
# endif()
## Add folders to be run by python nosetests
# catkin_add_nosetests(test)
#ifndef _TIMEOUT_H
#define _TIMEOUT_H
#include <ros/ros.h>
class CROSTimeout
{
private:
bool active;
ros::Time start_time;
ros::Duration time_period;
// mutex
pthread_mutex_t access_;
public:
CROSTimeout();
void start(ros::Duration &time);
void stop(void);
bool timed_out(void);
~CROSTimeout();
};
#endif
#ifndef _WATCHDOG_H
#define _WATCHDOF_H
#include <ros/ros.h>
class CROSWatchdog
{
private:
ros::Duration max_time;
pthread_mutex_t access_;
public:
CROSWatchdog();
void reset(ros::Duration time);
void update(void);
bool is_active(void);
~CROSWatchdog();
};
#endif
<?xml version="1.0"?>
<package>
<name>iri_ros_tools</name>
<version>0.0.0</version>
<description>The iri_ros_tools package</description>
<!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- Example: -->
<!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
<maintainer email="shernand@todo.todo">shernand</maintainer>
<!-- One license tag required, multiple allowed, one license per tag -->
<!-- Commonly used license strings: -->
<!-- BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
<license>TODO</license>
<!-- Url tags are optional, but mutiple are allowed, one per tag -->
<!-- Optional attribute type can be: website, bugtracker, or repository -->
<!-- Example: -->
<!-- <url type="website">http://wiki.ros.org/iri_ros_tool</url> -->
<!-- Author tags are optional, mutiple are allowed, one per tag -->
<!-- Authors do not have to be maintianers, but could be -->
<!-- Example: -->
<!-- <author email="jane.doe@example.com">Jane Doe</author> -->
<!-- The *_depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies -->
<!-- Examples: -->
<!-- Use build_depend for packages you need at compile time: -->
<!-- <build_depend>message_generation</build_depend> -->
<build_depend>roscpp</build_depend>
<!-- Use buildtool_depend for build tool packages: -->
<!-- <buildtool_depend>catkin</buildtool_depend> -->
<!-- Use run_depend for packages you need at runtime: -->
<!-- <run_depend>message_runtime</run_depend> -->
<run_depend>roscpp</run_depend>
<!-- Use test_depend for packages you need only for testing: -->
<!-- <test_depend>gtest</test_depend> -->
<buildtool_depend>catkin</buildtool_depend>
<!-- The export tag contains other, unspecified, tags -->
<export>
<!-- Other tools can request additional information be placed here -->
</export>
</package>
#include "timeout.h"
CROSTimeout::CROSTimeout()
{
// initialize mutex
pthread_mutex_init(&this->access_,NULL);
this->time_period=ros::Duration(0);
this->start_time=ros::Time::now();
this->active=false;
}
void CROSTimeout::start(ros::Duration &time)
{
pthread_mutex_lock(&this->access_);
this->time_period = time;
this->start_time=ros::Time::now();
this->active=true;
pthread_mutex_unlock(&this->access_);
}
void CROSTimeout::stop(void)
{
pthread_mutex_lock(&this->access_);
this->active=false;
pthread_mutex_unlock(&this->access_);
}
bool CROSTimeout::timed_out(void)
{
ros::Time new_time=ros::Time::now();
if(this->active)
{
pthread_mutex_lock(&this->access_);
if((new_time-this->start_time)>this->time_period)
{
pthread_mutex_unlock(&this->access_);
this->active=false;
return true;
}
else
{
pthread_mutex_unlock(&this->access_);
return false;
}
}
}
CROSTimeout::~CROSTimeout()
{
// destray mutex
pthread_mutex_destroy(&this->access_);
}
#include "watchdog.h"
CROSWatchdog::CROSWatchdog()
{
pthread_mutex_init(&this->access_,NULL);
this->max_time=ros::Duration(0);
}
void CROSWatchdog::reset(ros::Duration time)
{
pthread_mutex_lock(&this->access_);
this->max_time=time;
pthread_mutex_unlock(&this->access_);
}
void CROSWatchdog::update(void)
{
static ros::Time start_time=ros::Time::now();
ros::Time current_time=ros::Time::now();
pthread_mutex_lock(&this->access_);
this->max_time-=(current_time-start_time);
start_time=current_time;
pthread_mutex_unlock(&this->access_);
}
bool CROSWatchdog::is_active(void)
{
pthread_mutex_lock(&this->access_);
if(this->max_time.toSec()<=0.0)
{
pthread_mutex_unlock(&this->access_);
return true;
}
else
{
pthread_mutex_unlock(&this->access_);
return false;
}
}
CROSWatchdog::~CROSWatchdog()
{
pthread_mutex_destroy(&this->access_);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment