Skip to content

Commit 56d2896

Browse files
committed
Add quatosTool version to its output.
1 parent 1517a00 commit 56d2896

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

quatosTool.cc

+4-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
using namespace Eigen;
1717

18-
#define QUATOSTOOL_VERSION "150224.0" // yymmdd.build
18+
#define QUATOSTOOL_VERSION "150304.0" // yymmdd.build
1919

2020
#define MAX_DEPTH 16
2121
#define DEG_TO_RAD (M_PI / 180.0f)
@@ -759,10 +759,8 @@ void quatosToolCalc(void) {
759759
}
760760

761761
// calc GG offset & J matrix
762-
quatosToolObjCalc();//Hope this is right!
762+
quatosToolObjCalc();
763763

764-
//quatosData.motorX = quatosData.frameX.transpose() * -1.0;//-1 will be accounted for in MM creation!
765-
//quatosData.motorY = quatosData.frameY.transpose() * +1.0;
766764
quatosData.motorX = quatosData.frameX.transpose();
767765
quatosData.motorY = quatosData.frameY.transpose();
768766

@@ -785,7 +783,7 @@ std::cout << "quatosData.motorY: " << quatosData.motorY << std::endl;
785783
B.resize(3, 1);
786784

787785
// Roll
788-
A << quatosData.motorX,//Changed from Y!!
786+
A << quatosData.motorX,
789787
MatrixXd::Ones(1, quatosData.n),
790788
-quatosData.motorY;
791789
B << 0,
@@ -1012,6 +1010,7 @@ int main(int argc, char **argv) {
10121010
fprintf(outFP, "%d,", (int)quatosData.ports(i));
10131011
fprintf(outFP, "\n");
10141012
}
1013+
fprintf(outFP, "Tool_Version=%s\n", QUATOSTOOL_VERSION);
10151014
fprintf(outFP, "Craft=%s\n", quatosData.craftId);
10161015
fprintf(outFP, "Motors=%d\n", quatosData.n);
10171016
fprintf(outFP, "Mass=%f Kg (%d objects)\n", quatosData.totalMass, quatosData.objectsCount);

0 commit comments

Comments
 (0)