Reduce baro filter size, add titles

diff --git a/PSAS May 31.gnumeric b/PSAS May 31.gnumeric
index d45fcc14e86d8eeb82889ac3894edc75df1bae4e..9b526dcc1e24955240f343d49f3b2560b678f6a9 100644 (file)
Binary files a/PSAS May 31.gnumeric and b/PSAS May 31.gnumeric differ

diff --git a/parse b/parse
index cd447bbeeacfa9cd7cd89e7ced65b005f1a9073b..97344d32a39b0c6240e8917c7276468c23926d32 100755 (executable)
--- 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],