Index: trunk/doc/Flair/classflair_1_1meta_1_1_uav.html
===================================================================
--- trunk/doc/Flair/classflair_1_1meta_1_1_uav.html	(revision 44)
+++ trunk/doc/Flair/classflair_1_1meta_1_1_uav.html	(revision 47)
@@ -113,9 +113,9 @@
 <a href="classflair_1_1meta_1_1_uav-members.html">List of all members</a>  </div>
   <div class="headertitle">
-<div class="title">flair::meta::Uav Class Reference</div>  </div>
+<div class="title">flair::meta::Uav Class Reference<span class="mlabels"><span class="mlabel">abstract</span></span></div>  </div>
 </div><!--header-->
 <div class="contents">
 
-<p>Base class to construct sensors/actuators depending on uav type.  
+<p>Base class to construct sensors/actuators depending on uav type. The Object is created with the FrameworkManager as parent. FrameworkManager must be created before. Only one instance of this class is allowed by program.  
  <a href="classflair_1_1meta_1_1_uav.html#details">More...</a></p>
 
@@ -139,16 +139,10 @@
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:a864ba7aa6033e21b56ef9878a1e48fc2"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a864ba7aa6033e21b56ef9878a1e48fc2"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>Uav</b> (<a class="el" href="classflair_1_1core_1_1_framework_manager.html">core::FrameworkManager</a> *parent, std::string name, <a class="el" href="classflair_1_1filter_1_1_uav_multiplex.html">filter::UavMultiplex</a> *multiplex=NULL)</td></tr>
-<tr class="separator:a864ba7aa6033e21b56ef9878a1e48fc2"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a3530feee2f8194631031c4e78397ab4d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3530feee2f8194631031c4e78397ab4d"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>SetupVRPN</b> (std::string optitrack_address, std::string name)</td></tr>
-<tr class="separator:a3530feee2f8194631031c4e78397ab4d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a0c5cc25c82332bdbf9aba580fb6766bc"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0c5cc25c82332bdbf9aba580fb6766bc"></a>
-virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>SetupVRPNAutoIP</b> (std::string name)</td></tr>
-<tr class="separator:a0c5cc25c82332bdbf9aba580fb6766bc"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:afbf0c60dab8fa921d9e2a2b8bd900c0e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afbf0c60dab8fa921d9e2a2b8bd900c0e"></a>
-virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>StartSensors</b> (void)</td></tr>
-<tr class="separator:afbf0c60dab8fa921d9e2a2b8bd900c0e"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa512f51f51b53bdf92821532727f2db7"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa512f51f51b53bdf92821532727f2db7"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><b>Uav</b> (std::string name, <a class="el" href="classflair_1_1filter_1_1_uav_multiplex.html">filter::UavMultiplex</a> *multiplex=NULL)</td></tr>
+<tr class="separator:aa512f51f51b53bdf92821532727f2db7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a84f35ffaf00d4fc0bd113dcbfb8d140e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a84f35ffaf00d4fc0bd113dcbfb8d140e"></a>
+virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>StartSensors</b> (void)=0</td></tr>
+<tr class="separator:a84f35ffaf00d4fc0bd113dcbfb8d140e"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a6c6738ce289162235fa2942f55900bfe"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6c6738ce289162235fa2942f55900bfe"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>UseDefaultPlot</b> (void)</td></tr>
@@ -175,10 +169,4 @@
 <a class="el" href="classflair_1_1sensor_1_1_battery_monitor.html">sensor::BatteryMonitor</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>GetBatteryMonitor</b> (void) const </td></tr>
 <tr class="separator:af6ace6e08682f12a6702d674fe66ce32"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:af228f3b0b6241abc48d008ff7389c67e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af228f3b0b6241abc48d008ff7389c67e"></a>
-<a class="el" href="classflair_1_1sensor_1_1_vrpn_client.html">sensor::VrpnClient</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>GetVrpnClient</b> (void) const </td></tr>
-<tr class="separator:af228f3b0b6241abc48d008ff7389c67e"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a89122af1ccaa5dd287a2a91999cea470"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a89122af1ccaa5dd287a2a91999cea470"></a>
-<a class="el" href="classflair_1_1meta_1_1_meta_vrpn_object.html">meta::MetaVrpnObject</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>GetVrpnObject</b> (void) const </td></tr>
-<tr class="separator:a89122af1ccaa5dd287a2a91999cea470"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a715d1259e41867078cb9dcf8bebd404e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a715d1259e41867078cb9dcf8bebd404e"></a>
 <a class="el" href="classflair_1_1sensor_1_1_camera.html">sensor::Camera</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>GetVerticalCamera</b> (void) const </td></tr>
@@ -187,4 +175,7 @@
 <a class="el" href="classflair_1_1sensor_1_1_camera.html">sensor::Camera</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>GetHorizontalCamera</b> (void) const </td></tr>
 <tr class="separator:a03fdd9b52f7ffa4da19653ab7a598b29"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a095040838a4078e62d6eddac7eab5f44"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a095040838a4078e62d6eddac7eab5f44"></a>
+virtual std::string&#160;</td><td class="memItemRight" valign="bottom"><b>GetDefaultVrpnAddress</b> (void) const </td></tr>
+<tr class="separator:a095040838a4078e62d6eddac7eab5f44"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pub_methods_classflair_1_1core_1_1_object"><td colspan="2" onclick="javascript:toggleInherit('pub_methods_classflair_1_1core_1_1_object')"><img src="closed.png" alt="-"/>&#160;Public Member Functions inherited from <a class="el" href="classflair_1_1core_1_1_object.html">flair::core::Object</a></td></tr>
 <tr class="memitem:aec92383fd5bf68d9df10414862b7e95c inherit pub_methods_classflair_1_1core_1_1_object"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classflair_1_1core_1_1_object.html#aec92383fd5bf68d9df10414862b7e95c">Object</a> (const <a class="el" href="classflair_1_1core_1_1_object.html">Object</a> *parent=NULL, std::string name=&quot;&quot;, std::string type=&quot;&quot;)</td></tr>
@@ -257,5 +248,5 @@
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<div class="textblock"><p>Base class to construct sensors/actuators depending on uav type. </p>
+<div class="textblock"><p>Base class to construct sensors/actuators depending on uav type. The Object is created with the FrameworkManager as parent. FrameworkManager must be created before. Only one instance of this class is allowed by program. </p>
 </div></div><!-- contents -->
 </div><!-- doc-content -->
@@ -264,5 +255,5 @@
   <ul>
     <li class="navelem"><a class="el" href="namespaceflair.html">flair</a></li><li class="navelem"><a class="el" href="namespaceflair_1_1meta.html">meta</a></li><li class="navelem"><a class="el" href="classflair_1_1meta_1_1_uav.html">Uav</a></li>
-    <li class="footer">Generated on Thu Jan 5 2017 11:01:23 for Flair by
+    <li class="footer">Generated on Tue Jan 17 2017 09:52:31 for Flair by
     <a href="http://www.doxygen.org/index.html">
     <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.9.1 </li>
