*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
#include <ao_data.h>
#include <ao_flight.h>
-static __xdata uint8_t ao_log_mutex;
-static __xdata struct ao_log_metrum log;
-
-__code uint8_t ao_log_format = AO_LOG_FORMAT_TELEMETRUM;
-
-static uint8_t
-ao_log_csum(__xdata uint8_t *b) __reentrant
-{
- uint8_t sum = 0x5a;
- uint8_t i;
-
- for (i = 0; i < sizeof (struct ao_log_metrum); i++)
- sum += *b++;
- return -sum;
-}
-
-uint8_t
-ao_log_metrum(__xdata struct ao_log_metrum *log) __reentrant
-{
- uint8_t wrote = 0;
- /* set checksum */
- log->csum = 0;
- log->csum = ao_log_csum((__xdata uint8_t *) log);
- ao_mutex_get(&ao_log_mutex); {
- if (ao_log_current_pos >= ao_log_end_pos && ao_log_running)
- ao_log_stop();
- if (ao_log_running) {
- wrote = 1;
- ao_storage_write(ao_log_current_pos,
- log,
- sizeof (struct ao_log_metrum));
- ao_log_current_pos += sizeof (struct ao_log_metrum);
- }
- } ao_mutex_put(&ao_log_mutex);
- return wrote;
-}
-
-static uint8_t
-ao_log_dump_check_data(void)
-{
- if (ao_log_csum((uint8_t *) &log) != 0)
- return 0;
- return 1;
-}
-
#if HAS_ADC
static __data uint8_t ao_log_data_pos;
#endif
log.u.flight.ground_pres = ao_ground_pres;
log.u.flight.flight = ao_flight_number;
- ao_log_metrum(&log);
+ ao_log_write(&log);
#endif
/* Write the whole contents of the ring to the log
#if HAS_ACCEL
log.u.sensor.accel = ao_data_accel(&ao_data_ring[ao_log_data_pos]);
#endif
- ao_log_metrum(&log);
+ ao_log_write(&log);
if (ao_log_state <= ao_flight_coast)
next_sensor = log.tick + AO_SENSOR_INTERVAL_ASCENT;
else
log.u.volt.v_batt = ao_data_ring[ao_log_data_pos].adc.v_batt;
log.u.volt.sense_a = ao_data_ring[ao_log_data_pos].adc.sense_a;
log.u.volt.sense_m = ao_data_ring[ao_log_data_pos].adc.sense_m;
- ao_log_metrum(&log);
+ ao_log_write(&log);
next_other = log.tick + AO_OTHER_INTERVAL;
}
ao_log_data_pos = ao_data_ring_next(ao_log_data_pos);
log.tick = ao_time();
log.u.state.state = ao_log_state;
log.u.state.reason = 0;
- ao_log_metrum(&log);
+ ao_log_write(&log);
if (ao_log_state == ao_flight_landed)
ao_log_stop();
}
}
#endif
-
-uint16_t
-ao_log_flight(uint8_t slot)
-{
- if (!ao_storage_read(ao_log_pos(slot),
- &log,
- sizeof (struct ao_log_metrum)))
- return 0;
-
- if (ao_log_dump_check_data() && log.type == AO_LOG_FLIGHT)
- return log.u.flight.flight;
- return 0;
-}