added back in linear angular velocity

pull/67/head
alanbjohnston 5 years ago committed by GitHub
parent bc58348441
commit 98d6d22040
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -882,7 +882,8 @@ int get_tlm_fox() {
int posXi = 0, negXi = 0, posYi = 0, negYi = 0, posZi = 0, negZi = 0;
int head_offset = 0;
// int xAngularVelocity = (-0.69)*(-10)*(-10) + 45.3 * (-10) + 2078, yAngularVelocity = (-0.69)*(-6)*(-6) + 45.3 * (-6) + 2078, zAngularVelocity = (-0.69)*(6)*(6) + 45.3 * (6) + 2078; // XAxisAngularVelocity
int xAngularVelocity = 2078, yAngularVelocity = 2078, zAngularVelocity = 2078; // XAxisAngularVelocity Y and Z set to 0
// int xAngularVelocity = 2078, yAngularVelocity = 2078, zAngularVelocity = 2078; // XAxisAngularVelocity Y and Z set to 0
int xAngularVelocity = 2048, yAngularVelocity = 2048, zAngularVelocity = 2048; // XAxisAngularVelocity Y and Z set to 0
int RXTemperature = 0;
int xAccel = 2048, yAccel = 2048, zAccel = 2048, temp = 2240, pressure = 1000, altitude = 1000;
@ -1106,9 +1107,13 @@ if (payload == ON)
printf("gyroZ %f \n", gyroZ);
}
xAngularVelocity = (-0.69)*(gyroX)*(gyroX) + 45.3 * (gyroX) + 2078;
yAngularVelocity = (-0.69)*(gyroY)*(gyroY) + 45.3 * (gyroY) + 2078;
zAngularVelocity = (-0.69)*(gyroZ)*(gyroZ) + 45.3 * (gyroZ) + 2078;
// xAngularVelocity = (-0.69)*(gyroX)*(gyroX) + 45.3 * (gyroX) + 2078;
// yAngularVelocity = (-0.69)*(gyroY)*(gyroY) + 45.3 * (gyroY) + 2078;
// zAngularVelocity = (-0.69)*(gyroZ)*(gyroZ) + 45.3 * (gyroZ) + 2078;
xAngularVelocity = 1 * (gyroX) + 2048;
yAngularVelocity = 1 * (gyroY) + 2048;
zAngularVelocity = 1 * (gyroZ) + 2048;
}
encodeA(b, 0 + head_offset, batt_a_v);

Loading…
Cancel
Save

Powered by TurnKey Linux.