altos: Simplify tracker logic, removing boost detect
[fw/altos] / src / kernel / ao_tracker.c
index b207c56204d866fae30eb33e53b5c263223f46ab..fb9e75d06d376db77b850ca66e907c44d7c72fd4 100644 (file)
 
 #include <ao.h>
 #include <ao_flight.h>
+#include <ao_log.h>
+#include <ao_log_gps.h>
 #include <ao_distance.h>
+#include <ao_tracker.h>
 #include <ao_exti.h>
 
-enum ao_flight_state   ao_flight_state;
-
-/* Speeds for the various modes, 2m/s seems reasonable for 'not moving' */
-#define AO_TRACKER_NOT_MOVING  200
-
-static uint8_t ao_tracker_force_telem;
-static uint8_t ao_tracker_force_launch;
+static uint8_t         ao_tracker_force_telem;
 
 #if HAS_USB_CONNECT
 static inline uint8_t
@@ -38,47 +35,22 @@ ao_usb_connected(void)
 #define ao_usb_connected()     1
 #endif
 
-#define STARTUP_AVERAGE        5
-
-static void
-ao_tracker_start_flight(void)
-{
-       struct ao_log_mega log;
-       ao_log_start();
-       log.type = AO_LOG_FLIGHT;
-       log.tick = ao_time();
-#if HAS_ACCEL
-       log.u.flight.ground_accel = ao_ground_accel;
-#endif
-#if HAS_GYRO
-       log.u.flight.ground_accel_along = ao_ground_accel_along;
-       log.u.flight.ground_accel_across = ao_ground_accel_across;
-       log.u.flight.ground_accel_through = ao_ground_accel_through;
-       log.u.flight.ground_roll = ao_ground_roll;
-       log.u.flight.ground_pitch = ao_ground_pitch;
-       log.u.flight.ground_yaw = ao_ground_yaw;
-#endif
-#if HAS_FLIGHT
-       log.u.flight.ground_pres = ao_ground_pres;
-#endif
-       log.u.flight.flight = ao_flight_number;
-       ao_log_mega(&log);
-}
+static int32_t last_log_latitude, last_log_longitude;
+static int16_t last_log_altitude;
+static uint8_t unmoving;
+static uint8_t log_started;
+static struct ao_telemetry_location gps_data;
+static uint8_t tracker_running;
+static uint16_t tracker_interval;
 
 static void
 ao_tracker(void)
 {
-       uint16_t        telem_rate = AO_SEC_TO_TICKS(1), new_telem_rate;
-       uint8_t         gps_rate = 1, new_gps_rate;
-       uint8_t         telem_enabled = 0, new_telem_enabled;
-       int32_t         start_latitude = 0, start_longitude = 0;
-       int16_t         start_altitude = 0;
-       uint32_t        ground_distance;
-       int16_t         height;
-       uint16_t        speed;
-       int64_t         lat_sum = 0, lon_sum = 0;
-       int32_t         alt_sum = 0;
-       int             nsamples = 0;
+       uint8_t new;
+       int32_t ground_distance;
+       int16_t height;
+       uint16_t gps_tick;
+       uint8_t new_tracker_running;
 
 #if HAS_ADC
        ao_timer_set_adc_interval(100);
@@ -87,97 +59,82 @@ ao_tracker(void)
 #if !HAS_USB_CONNECT
        ao_tracker_force_telem = 1;
 #endif
-
        ao_log_scan();
+       ao_log_start();
 
        ao_rdf_set(1);
 
-       ao_telemetry_set_interval(0);
+       tracker_interval = ao_config.tracker_interval;
+       ao_gps_set_rate(tracker_interval);
 
-       ao_flight_state = ao_flight_startup;
        for (;;) {
-               ao_sleep(&ao_gps_new);
 
-               new_gps_rate = gps_rate;
-               new_telem_rate = telem_rate;
+               /** Wait for new GPS data
+                */
+               while (!(new = ao_gps_new))
+                       ao_sleep(&ao_gps_new);
+               ao_mutex_get(&ao_gps_mutex);
+               gps_data = ao_gps_data;
+               gps_tick = ao_gps_tick;
+               ao_gps_new = 0;
+               ao_mutex_put(&ao_gps_mutex);
 
-               new_telem_enabled = ao_tracker_force_telem || !ao_usb_connected();
+               new_tracker_running = ao_tracker_force_telem || !ao_usb_connected();
 
-               ao_mutex_get(&ao_gps_mutex);
+               if (ao_config.tracker_interval != tracker_interval) {
+                       tracker_interval = ao_config.tracker_interval;
+                       ao_gps_set_rate(tracker_interval);
 
-               /* Don't change anything if GPS isn't locked */
-               if ((ao_gps_data.flags & (AO_GPS_VALID|AO_GPS_COURSE_VALID)) ==
-                   (AO_GPS_VALID|AO_GPS_COURSE_VALID))
-               {
-                       switch (ao_flight_state) {
-                       case ao_flight_startup:
-                               /* startup to pad when GPS locks */
-
-                               lat_sum += ao_gps_data.latitude;
-                               lon_sum += ao_gps_data.longitude;
-                               alt_sum += ao_gps_data.altitude;
-
-                               if (++nsamples >= STARTUP_AVERAGE) {
-                                       ao_flight_state = ao_flight_pad;
-                                       ao_wakeup(&ao_flight_state);
-                                       start_latitude = lat_sum / nsamples;
-                                       start_longitude = lon_sum / nsamples;
-                                       start_altitude = alt_sum / nsamples;
-                               }
-                               break;
-                       case ao_flight_pad:
-                               ground_distance = ao_distance(ao_gps_data.latitude,
-                                                             ao_gps_data.longitude,
-                                                             start_latitude,
-                                                             start_longitude);
-                               height = ao_gps_data.altitude - start_altitude;
-                               if (height < 0)
-                                       height = -height;
-
-                               if (ground_distance >= ao_config.tracker_start_horiz ||
-                                   height >= ao_config.tracker_start_vert ||
-                                   ao_tracker_force_launch)
-                               {
-                                       ao_flight_state = ao_flight_drogue;
-                                       ao_wakeup(&ao_flight_state);
-                                       ao_log_start();
-                                       ao_tracker_start_flight();
-                               }
-                               break;
-                       case ao_flight_drogue:
-                               /* Modulate data rates based on speed (in cm/s) */
-                               if (ao_gps_data.climb_rate < 0)
-                                       speed = -ao_gps_data.climb_rate;
-                               else
-                                       speed = ao_gps_data.climb_rate;
-                               speed += ao_gps_data.ground_speed;
-
-                               if (speed < AO_TRACKER_NOT_MOVING) {
-                                       new_telem_rate = AO_SEC_TO_TICKS(10);
-                                       new_gps_rate = 10;
-                               } else {
-                                       new_telem_rate = AO_SEC_TO_TICKS(1);
-                                       new_gps_rate = 1;
-                               }
-                               break;
-                       default:
-                               break;
-                       }
+                       /* force telemetry interval to be reset */
+                       tracker_running = 0;
                }
-               ao_mutex_put(&ao_gps_mutex);
 
-               if (new_telem_rate != telem_rate || new_telem_enabled != telem_enabled) {
-                       if (new_telem_enabled)
-                               ao_telemetry_set_interval(new_telem_rate);
-                       else
-                               ao_telemetry_set_interval(0);
-                       telem_rate = new_telem_rate;
-                       telem_enabled = new_telem_enabled;
+               if (new_tracker_running && !tracker_running) {
+                       ao_telemetry_set_interval(AO_SEC_TO_TICKS(tracker_interval));
+               } else if (!new_tracker_running && tracker_running) {
+                       ao_telemetry_set_interval(0);
                }
 
-               if (new_gps_rate != gps_rate) {
-                       ao_gps_set_rate(new_gps_rate);
-                       gps_rate = new_gps_rate;
+               tracker_running = new_tracker_running;
+
+               if (!tracker_running)
+                       continue;
+
+               if (new & AO_GPS_NEW_DATA) {
+                       if ((gps_data.flags & (AO_GPS_VALID|AO_GPS_COURSE_VALID)) ==
+                           (AO_GPS_VALID|AO_GPS_COURSE_VALID))
+                       {
+                               if (log_started) {
+                                       ground_distance = ao_distance(gps_data.latitude, gps_data.longitude,
+                                                                     last_log_latitude, last_log_longitude);
+                                       height = last_log_altitude - gps_data.altitude;
+                                       if (height < 0)
+                                               height = -height;
+                                       if (ground_distance <= ao_config.tracker_motion &&
+                                           height <= ao_config.tracker_motion)
+                                       {
+                                               if (unmoving < AO_TRACKER_MOTION_COUNT)
+                                                       unmoving++;
+                                       } else
+                                               unmoving = 0;
+                               }
+                       } else {
+                               if (!log_started)
+                                       continue;
+                               if (unmoving < AO_TRACKER_MOTION_COUNT)
+                                       unmoving++;
+                       }
+
+                       if (unmoving < AO_TRACKER_MOTION_COUNT) {
+                               if (!log_started) {
+                                       ao_log_gps_flight();
+                                       log_started = 1;
+                               }
+                               ao_log_gps_data(gps_tick, &gps_data);
+                               last_log_latitude = gps_data.latitude;
+                               last_log_longitude = gps_data.longitude;
+                               last_log_altitude = gps_data.altitude;
+                       }
                }
        }
 }
@@ -187,13 +144,23 @@ static struct ao_task ao_tracker_task;
 static void
 ao_tracker_set_telem(void)
 {
+       uint8_t telem;
        ao_cmd_hex();
-       if (ao_cmd_status == ao_cmd_success) {
-               ao_tracker_force_telem = (ao_cmd_lex_i & 1) != 0;
-               ao_tracker_force_launch = (ao_cmd_lex_i & 2) != 0;
-       }
-       printf ("flight %d force telem %d force launch %d\n",
-               ao_flight_number, ao_tracker_force_telem, ao_tracker_force_launch);
+       telem = ao_cmd_lex_i;
+       if (ao_cmd_status == ao_cmd_success)
+               ao_tracker_force_telem = telem;
+       ao_cmd_status = ao_cmd_success;
+       printf ("flight: %d\n", ao_flight_number);
+       printf ("force_telem: %d\n", ao_tracker_force_telem);
+       printf ("log_started: %d\n", log_started);
+       printf ("unmoving: %d\n", unmoving);
+       printf ("latitude: %ld\n", (long) gps_data.latitude);
+       printf ("longitude: %ld\n", (long) gps_data.longitude);
+       printf ("altitude: %d\n", gps_data.altitude);
+       printf ("log_running: %d\n", ao_log_running);
+       printf ("log_start_pos: %ld\n", (long) ao_log_start_pos);
+       printf ("log_cur_pos: %ld\n", (long) ao_log_current_pos);
+       printf ("log_end_pos: %ld\n", (long) ao_log_end_pos);
 }
 
 static const struct ao_cmds ao_tracker_cmds[] = {