- if (ao_flight_state != ao_log_tiny_state) {
- ao_log_tiny_data(ao_flight_state | 0x8000);
- ao_log_tiny_state = ao_flight_state;
- ao_log_tiny_interval = AO_LOG_TINY_INTERVAL_DEFAULT;
- if (ao_log_tiny_state <= ao_flight_coast)
- ao_log_tiny_interval = AO_LOG_TINY_INTERVAL_ASCENT;
+
+ /*
+ * Add in pending sample data
+ */
+ ao_sleep(DATA_TO_XDATA(&ao_sample_adc));
+ while (ao_log_adc != ao_sample_adc) {
+ sum += ao_adc_ring[ao_log_adc].pres;
+ count++;
+ ao_log_adc = ao_adc_ring_next(ao_log_adc);
+ }
+ if (ao_log_running) {
+ if (!ao_log_started) {
+ ao_log_tiny_start();
+ ao_log_started = 1;
+ }
+ if (ao_flight_state != ao_log_tiny_state) {
+ ao_log_tiny_data(ao_flight_state | 0x8000);
+ ao_log_tiny_state = ao_flight_state;
+ ao_log_tiny_interval = AO_LOG_TINY_INTERVAL_DEFAULT;
+#if AO_LOG_TINY_INTERVAL_ASCENT != AO_LOG_TINY_INTERVAL_DEFAULT
+ if (ao_log_tiny_state <= ao_flight_coast)
+ ao_log_tiny_interval = AO_LOG_TINY_INTERVAL_ASCENT;
+#endif
+ if (ao_log_tiny_state == ao_flight_landed)
+ ao_log_stop();
+ }
+ }
+
+ /* Stop logging when told to */
+ if (!ao_log_running && ao_log_started)
+ ao_exit();
+
+ /*
+ * Write out the sample when finished
+ */
+ now = ao_time();
+ if ((int16_t) (now - (last_time + ao_log_tiny_interval)) >= 0 && count) {
+ count = sum / count;
+ if (ao_log_started)
+ ao_log_tiny_data(count);
+ else
+ ao_log_tiny_queue(count);
+ sum = 0;
+ count = 0;
+ last_time = now;