[Playerstage-commit] SF.net SVN: playerstage:[7231] code/player/trunk

[<th...@us...>]

Revision: 7231
          http://playerstage.svn.sourceforge.net/playerstage/?rev=7231&view=rev
Author:   thjc
Date:     2009-01-04 01:01:31 +0000 (Sun, 04 Jan 2009)

Log Message:
-----------
merge from 2-1 of 6230:
allow eedhcontroller to work with nr joints != 6

Modified Paths:
--------------
    code/player/trunk/server/drivers/limb/eeDHcontroller.cc

Property Changed:
----------------
    code/player/trunk/


Property changes on: code/player/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226
/code/player/trunk:6985
   + /code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230
/code/player/trunk:6985

Modified: code/player/trunk/server/drivers/limb/eeDHcontroller.cc
===================================================================
--- code/player/trunk/server/drivers/limb/eeDHcontroller.cc	2009-01-04 00:59:31 UTC (rev 7230)
+++ code/player/trunk/server/drivers/limb/eeDHcontroller.cc	2009-01-04 01:01:31 UTC (rev 7231)
@@ -243,7 +243,7 @@
   nr_joints = cf->ReadInt (section, "nr_joints", 0);
 
   // Create initial DH parameters model
-  DHMatrixModel = Matrix (6, 23);
+  DHMatrixModel = Matrix (nr_joints, 23);
   DHMatrixModel = 0;
 
   actarray_state = new int[nr_joints];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.