Skip to content

Commit

Permalink
official concert comms imported from the yujin repo.
Browse files Browse the repository at this point in the history
  • Loading branch information
stonier committed Mar 29, 2012
1 parent 03bd015 commit 9e40ea6
Show file tree
Hide file tree
Showing 13 changed files with 280 additions and 0 deletions.
55 changes: 55 additions & 0 deletions concert_comms/.cproject
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?>

<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.949795087">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.949795087" moduleId="org.eclipse.cdt.core.settings" name="Default">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.949795087" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="cdt.managedbuild.toolchain.gnu.base.949795087.1630158306" name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.base.145326965" name="cdt.managedbuild.toolchain.gnu.base" superClass="cdt.managedbuild.toolchain.gnu.base">
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.1813516941" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
<builder id="cdt.managedbuild.target.gnu.builder.base.1656470906" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.1496712516" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1639749174" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1068591787" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.2059272215" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1025597115" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.c.linker.base.856829160" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.766569220" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1249076438" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType>
</tool>
<tool id="cdt.managedbuild.tool.gnu.assembler.base.132606056" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1546949964" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
</toolChain>
</folderInfo>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="rocon_app_manager_comms.null.104830379" name="rocon_app_manager_comms"/>
</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</storageModule>
<storageModule moduleId="refreshScope"/>
</cproject>
5 changes: 5 additions & 0 deletions concert_comms/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/bin
/build
/src
/msg_gen
/srv_gen
79 changes: 79 additions & 0 deletions concert_comms/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>concert_comms</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
<value>all</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
<value>clean</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
<value>all</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
</natures>
</projectDescription>
17 changes: 17 additions & 0 deletions concert_comms/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
cmake_minimum_required(VERSION 2.4.6)
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)

rosbuild_init()
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)

rosbuild_genmsg()
rosbuild_gensrv()

#rosbuild_find_ros_package(yujin_comms_headers)
#add_custom_command(TARGET rospack_genmsg_all
# POST_BUILD
# COMMAND cp -r ${PROJECT_SOURCE_DIR}/msg_gen/cpp/include/* ${yujin_comms_headers_PACKAGE_PATH}/include/
# WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
# COMMENT "Installing headers to ${yujin_comms_headers_PACKAGE_PATH}/include/"
#)
2 changes: 2 additions & 0 deletions concert_comms/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include $(shell rospack find mk)/cmake.mk

26 changes: 26 additions & 0 deletions concert_comms/mainpage.dox
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/**
\mainpage
\htmlinclude manifest.html

\b rocon_app_manager_comms is ...

<!--
Provide an overview of your package.
-->


\section codeapi Code API

<!--
Provide links to specific auto-generated API documentation within your
package that is of particular interest to a reader. Doxygen will
document pretty much every part of your code, so do your best here to
point the reader to the actual API.

If your codebase is fairly large or has different sets of APIs, you
should use the doxygen 'group' tag to keep these APIs together. For
example, the roscpp documentation has 'libros' group.
-->


*/
16 changes: 16 additions & 0 deletions concert_comms/manifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<package>
<description brief="Standard communications for concert framework">

Shared communication types for the concert framework.

</description>
<author>Daniel Stonier</author>
<license>BSD</license>
<review status="experimental" notes=""/>
<url>http://ros.org/wiki/rocon_concert_framework</url>

<depend package="zeroconf_comms"/>

</package>


14 changes: 14 additions & 0 deletions concert_comms/msg/ConcertClient.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Provides information and status of a concert client.

zeroconf_comms/DiscoveredService zeroconf
# The platform id triple
string platform
string system
string robot
# Unique Id
string suggested_name
string unique_name
string key
string app_manager_uri
bool is_connected
time last_connection_timestamp
1 change: 1 addition & 0 deletions concert_comms/msg/ConcertClients.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
concert_comms/ConcertClient[] clients
28 changes: 28 additions & 0 deletions concert_comms/msg/Device.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Provides details about the device/robot
#
# Using strings is nicer here as its easier to
# introspect the system quickly when its human
# readable (we're not throwing them around alot
# anyway, so no big speed loss is incurred).

string PLATFORM_ANY=*
string PLATFORM_LINUX=linux
string PLATFORM_WINDOZE=windows
string PLATFORM_ANDROID=android

string SYSTEM_ANY=*
string SYSTEM_CUSTOM=custom
string SYSTEM_ROS=ros
string SYSTEM_OPROS=opros

# Valid robot types. This is not
# official, and we aren't relying
# on it.
string ROBOT_PC="pc"
string ROBOT_ROBOSEM="robosem"
string ROBOT_KOBUKIBOT="kobukibot"

# Configured by the app manager
string platform
string system
string robot
7 changes: 7 additions & 0 deletions concert_comms/msg/DeviceConfiguration.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This provides information about the device/robot
# configuration (depends on the app that is being
# called to run on the robot).

concert_comms/Device device
string app

23 changes: 23 additions & 0 deletions concert_comms/msg/PlatformInfo.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Provides platform details from the app manager.

int16 PLATFORM_LINUX=0
int16 PLATFORM_WINDOZE=1
int16 PLATFORM_ANDROID=2

int16 SYSTEM_CUSTOM=0
int16 SYSTEM_ROS=1
int16 SYSTEM_OPROS=2

# Valid robot types, though this is totally not
# official, and we aren't relying on it.
string ROBOT_PC="pc"
string ROBOT_ROBOSEM="robosem"

# Configured by the app manager
int16 platform
int16 system
string robot
string key
string suggested_name
# Configured after contacted by the concert
string unique_name
7 changes: 7 additions & 0 deletions concert_comms/srv/Implementation.srv
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
# A list of 'named' nodes, e.g. linux.ros.robosem.rocon_teleop

string name
#concert_comms/DeviceConfiguration[] nodes
string[] nodes
string link_graph

0 comments on commit 9e40ea6

Please sign in to comment.