Index: trunk/doc/Flair/_emulated_controller_8h_source.html
===================================================================
--- trunk/doc/Flair/_emulated_controller_8h_source.html	(revision 62)
+++ trunk/doc/Flair/_emulated_controller_8h_source.html	(revision 68)
@@ -131,5 +131,5 @@
 <div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceflair.html">flair</a> {</div>
 <div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;    <span class="keyword">namespace </span>core {</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;        <span class="keyword">class </span>cvmatrix;</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;        <span class="keyword">class </span>Matrix;</div>
 <div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;    }</div>
 <div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;    <span class="keyword">namespace </span>gui {</div>
@@ -157,17 +157,17 @@
 <div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;        <span class="keywordtype">bool</span> ProcessMessage(<a class="code" href="classflair_1_1core_1_1_message.html">core::Message</a> *msg);</div>
 <div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;        <span class="keywordtype">bool</span> IsDataFrameReady();</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;        <span class="keywordtype">void</span> AcquireAxisData(<a class="code" href="classflair_1_1core_1_1cvmatrix.html">core::cvmatrix</a> &amp;axis); <span class="comment">//responsible for getting the axis data from the hardware</span></div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;        <span class="keywordtype">void</span> AcquireButtonData(<a class="code" href="classflair_1_1core_1_1cvmatrix.html">core::cvmatrix</a> &amp;button); <span class="comment">//responsible for getting the button data from the hardware</span></div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;        <span class="keywordtype">void</span> AcquireAxisData(<a class="code" href="classflair_1_1core_1_1_matrix.html">core::Matrix</a> &amp;axis); <span class="comment">//responsible for getting the axis data from the hardware</span></div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;        <span class="keywordtype">void</span> AcquireButtonData(<a class="code" href="classflair_1_1core_1_1_matrix.html">core::Matrix</a> &amp;button); <span class="comment">//responsible for getting the button data from the hardware</span></div>
 <div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;        <span class="keywordtype">bool</span> ControllerInitialization();</div>
 <div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;</div>
 <div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    <span class="keyword">private</span>:</div>
 <div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;        <span class="keyword">enum class</span> DataType { axis,button };</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;        <span class="keywordtype">void</span> ComputeControllerData(DataType dataType, <a class="code" href="classflair_1_1core_1_1cvmatrix.html">core::cvmatrix</a> &amp;data);</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;        <span class="keyword">template</span>&lt;<span class="keyword">typename</span> T&gt; <span class="keywordtype">void</span> fillVectorNoMutex(<a class="code" href="classflair_1_1core_1_1cvmatrix.html">core::cvmatrix</a> &amp;vector,T data[],<span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> size);</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;        <span class="keywordtype">void</span> fillVectorNoMutex(<a class="code" href="classflair_1_1core_1_1cvmatrix.html">core::cvmatrix</a> &amp;destination,<a class="code" href="classflair_1_1core_1_1cvmatrix.html">core::cvmatrix</a> &amp;source,<span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> size);</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;        <span class="keywordtype">void</span> ComputeControllerData(DataType dataType, <a class="code" href="classflair_1_1core_1_1_matrix.html">core::Matrix</a> &amp;data);</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;        <span class="keyword">template</span>&lt;<span class="keyword">typename</span> T&gt; <span class="keywordtype">void</span> fillVectorNoMutex(<a class="code" href="classflair_1_1core_1_1_matrix.html">core::Matrix</a> &amp;vector,T data[],<span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> size);</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;        <span class="keywordtype">void</span> fillVectorNoMutex(<a class="code" href="classflair_1_1core_1_1_matrix.html">core::Matrix</a> &amp;destination,<a class="code" href="classflair_1_1core_1_1_matrix.html">core::Matrix</a> &amp;source,<span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> size);</div>
 <div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;        <span class="keyword">struct </span>StepData {</div>
 <div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;            <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> durationMs; <span class="comment">//milliseconds</span></div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;            <a class="code" href="classflair_1_1core_1_1cvmatrix.html">core::cvmatrix</a> *axisData;</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;            <a class="code" href="classflair_1_1core_1_1cvmatrix.html">core::cvmatrix</a> *buttonData;</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;            <a class="code" href="classflair_1_1core_1_1_matrix.html">core::Matrix</a> *axisData;</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;            <a class="code" href="classflair_1_1core_1_1_matrix.html">core::Matrix</a> *buttonData;</div>
 <div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;            std::string description;</div>
 <div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;            <span class="keywordtype">void</span> Print();</div>
@@ -180,8 +180,8 @@
 <div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;<span class="preprocessor">#endif // EMULATEDCONTROLLER_H</span></div>
 <div class="ttc" id="namespaceflair_html"><div class="ttname"><a href="namespaceflair.html">flair</a></div><div class="ttdoc">namespace of the flair Framework </div><div class="ttdef"><b>Definition:</b> Ahrs.h:19</div></div>
-<div class="ttc" id="classflair_1_1core_1_1cvmatrix_html"><div class="ttname"><a href="classflair_1_1core_1_1cvmatrix.html">flair::core::cvmatrix</a></div><div class="ttdoc">Class defining a matrix of kind CvMat. </div><div class="ttdef"><b>Definition:</b> cvmatrix.h:33</div></div>
 <div class="ttc" id="classflair_1_1sensor_1_1_target_controller_html"><div class="ttname"><a href="classflair_1_1sensor_1_1_target_controller.html">flair::sensor::TargetController</a></div><div class="ttdoc">Base Class for target side remote controls. </div><div class="ttdef"><b>Definition:</b> TargetController.h:49</div></div>
 <div class="ttc" id="classflair_1_1sensor_1_1_emulated_controller_html"><div class="ttname"><a href="classflair_1_1sensor_1_1_emulated_controller.html">flair::sensor::EmulatedController</a></div><div class="ttdoc">Emulated remote control. </div><div class="ttdef"><b>Definition:</b> EmulatedController.h:38</div></div>
 <div class="ttc" id="classflair_1_1core_1_1_message_html"><div class="ttname"><a href="classflair_1_1core_1_1_message.html">flair::core::Message</a></div><div class="ttdef"><b>Definition:</b> Object.h:35</div></div>
+<div class="ttc" id="classflair_1_1core_1_1_matrix_html"><div class="ttname"><a href="classflair_1_1core_1_1_matrix.html">flair::core::Matrix</a></div><div class="ttdoc">Class defining a matrix. </div><div class="ttdef"><b>Definition:</b> Matrix.h:31</div></div>
 </div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
@@ -190,5 +190,5 @@
   <ul>
     <li class="navelem"><a class="el" href="dir_33c2ee9b1665499374b4225c427cf176.html">igep</a></li><li class="navelem"><a class="el" href="dir_f1fe274389177bd7e17de7949c4ffada.html">flair-src</a></li><li class="navelem"><a class="el" href="dir_3ef62148cf94871b4b6ee5d6e3a989c1.html">lib</a></li><li class="navelem"><a class="el" href="dir_6e0f9c50eed172896c55a6e61952176b.html">FlairSensorActuator</a></li><li class="navelem"><a class="el" href="dir_c5d95abdcafe7d1171548eb561d7ce37.html">src</a></li><li class="navelem"><b>EmulatedController.h</b></li>
-    <li class="footer">Generated on Mon Dec 4 2017 11:13:44 for Flair by
+    <li class="footer">Generated on Fri Feb 23 2018 11:15:45 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>
