15
15
16
16
using namespace Eigen ;
17
17
18
- #define QUATOSTOOL_VERSION " 150224 .0" // yymmdd.build
18
+ #define QUATOSTOOL_VERSION " 150304 .0" // yymmdd.build
19
19
20
20
#define MAX_DEPTH 16
21
21
#define DEG_TO_RAD (M_PI / 180 .0f )
@@ -759,10 +759,8 @@ void quatosToolCalc(void) {
759
759
}
760
760
761
761
// calc GG offset & J matrix
762
- quatosToolObjCalc ();// Hope this is right!
762
+ quatosToolObjCalc ();
763
763
764
- // quatosData.motorX = quatosData.frameX.transpose() * -1.0;//-1 will be accounted for in MM creation!
765
- // quatosData.motorY = quatosData.frameY.transpose() * +1.0;
766
764
quatosData.motorX = quatosData.frameX .transpose ();
767
765
quatosData.motorY = quatosData.frameY .transpose ();
768
766
@@ -785,7 +783,7 @@ std::cout << "quatosData.motorY: " << quatosData.motorY << std::endl;
785
783
B.resize (3 , 1 );
786
784
787
785
// Roll
788
- A << quatosData.motorX ,// Changed from Y!!
786
+ A << quatosData.motorX ,
789
787
MatrixXd::Ones (1 , quatosData.n ),
790
788
-quatosData.motorY ;
791
789
B << 0 ,
@@ -1012,6 +1010,7 @@ int main(int argc, char **argv) {
1012
1010
fprintf (outFP, " %d," , (int )quatosData.ports (i));
1013
1011
fprintf (outFP, " \n " );
1014
1012
}
1013
+ fprintf (outFP, " Tool_Version=%s\n " , QUATOSTOOL_VERSION);
1015
1014
fprintf (outFP, " Craft=%s\n " , quatosData.craftId );
1016
1015
fprintf (outFP, " Motors=%d\n " , quatosData.n );
1017
1016
fprintf (outFP, " Mass=%f Kg (%d objects)\n " , quatosData.totalMass , quatosData.objectsCount );
0 commit comments