[gentlenav] r3675 committed - Branch MatrixPilot_wjp_helicalTurns: Flight Analyzer: Add Column for F...

[gent...@googlecode.com]

Revision: 3675
Author: peter.h...@gmail.com
Date: Mon Aug 3 20:20:37 2015 UTC
Log: Branch MatrixPilot_wjp_helicalTurns: Flight Analyzer: Add Column
for Flags in Hex (as well as in Decimal) to csv output file
https://code.google.com/p/gentlenav/source/detail?r=3675

Modified:
/branches/MatrixPilot_wjp_helicalTurns/Tools/flight_analyzer/flan.pyw

=======================================
--- /branches/MatrixPilot_wjp_helicalTurns/Tools/flight_analyzer/flan.pyw
Fri Apr 10 18:06:57 2015 UTC
+++ /branches/MatrixPilot_wjp_helicalTurns/Tools/flight_analyzer/flan.pyw
Mon Aug 3 20:20:37 2015 UTC
@@ -2300,7 +2300,7 @@
print >> f_csv, "IN5,IN6,IN7,IN8,OUT1,OUT2,OUT3,OUT4,",
print >> f_csv, "OUT5,OUT6,OUT7,OUT8,LEX,LEY,LEZ,IMU X,IMU Y,IMU Z,MAG
W,MAG N,MAG Z,",
print >> f_csv, "Waypoint
X,WaypointY,WaypointZ,IMUvelocityX,IMUvelocityY,IMUvelocityZ,",
- print >> f_csv, "Flags,Sonar Dst,ALT_SONAR, Aero X, Aero Y, Aero Z,
AoI,Wing Load, AoA Pitch"
+ print >> f_csv, "Flags Dec,Flags Hex,Sonar Dst,ALT_SONAR, Aero X, Aero
Y, Aero Z, AoI,Wing Load, AoA Pitch"

counter = 0
total = 0
@@ -2385,7 +2385,7 @@
int(entry.earth_mag_vec_E), "," ,
int(entry.earth_mag_vec_N), "," , int(entry.earth_mag_vec_Z), "," , \
entry.inline_waypoint_x, ",", entry.inline_waypoint_y, ",",
entry.inline_waypoint_z, ",", \
entry.IMUvelocityx, ",", entry.IMUvelocityy, ",",
entry.IMUvelocityz, ",", \
- entry.flags, ",", entry.sonar_direct, ",",
entry.alt_sonar, ",", \
+ entry.flags, ",",hex(entry.flags),",",
entry.sonar_direct, ",", entry.alt_sonar, ",", \
entry.aero_force_x, ",", entry.aero_force_y, ",",
entry.aero_force_z,",","{0:.2f}".format(incidence), \
",","{0:.4f}".format(relative_wing_loading),",","{0:.2f}".format(aoa_using_pitch)