X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=parse;h=97344d32a39b0c6240e8917c7276468c23926d32;hb=29172f7ee3b50f719b885ba1b5d759603b095cd6;hp=cd447bbeeacfa9cd7cd89e7ced65b005f1a9073b;hpb=9b0fda7f5bd444b1018f91ea4f59f56083483c17;p=fw%2Ftmflights

diff --git a/parse b/parse
index cd447bb..97344d3 100755
--- a/parse
+++ b/parse
@@ -199,7 +199,8 @@ read_record(file in) {
 	return r;
 }
 
-real g_count = 264.8;
+#real g_count = 264.8;
+real g_count = 262;
 int g_base = 15735;
 
 real
@@ -397,7 +398,7 @@ if (false) {
 	real[size] accelerometer = { [n] = gravity * (count_to_g(accelerometer_value[n]) - 1.0) };
 	real[size] barometer = { [n] = pressure_to_altitude(count_to_kPa(pressure_value[n] / 16) * 1000) };
 	real[size] filtered_accelerometer = kaiser_filter(accelerometer, 8);
-	real[size] filtered_barometer = kaiser_filter(barometer, 128);
+	real[size] filtered_barometer = kaiser_filter(barometer, 32);
 
 	real[...] integrate(real[...] d) {
 		real[dim(d)] ret;
@@ -419,8 +420,18 @@ if (false) {
 	real[size] baro_speed = differentiate(filtered_barometer);
 	real[size] baro_accel = differentiate(baro_speed);
 
+	printf("%7s %12s %12s %12s %12s %12s %12s %12s %12s\n",
+	       "time",
+	       "height(baro)",
+	       "height(accel)",
+	       "speed(baro)",
+	       "speed(accel)",
+	       "accel(baro)",
+	       "accel(accel)",
+	       "raw(baro)",
+	       "raw(accel)");
 	for (int i = 0; i < size; i++)
-		printf("%g %g %g %g %g %g %g %g %g\n",
+		printf("%7.2f %12.6f %12.6f %12.6f %12.6f %12.6f %12.6f %12.6f %12.6f\n",
 		       clock[i] - clock[0],
 		       filtered_barometer[i] - filtered_barometer[0], accel_pos[i],
 		       baro_speed[i], accel_speed[i],