*
* 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.h"
-static __xdata uint8_t ao_log_mutex;
-static __xdata struct ao_log_record log;
-
-__code uint8_t ao_log_format = AO_LOG_FORMAT_FULL;
-
-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_record); i++)
- sum += *b++;
- return -sum;
-}
-
-uint8_t
-ao_log_data(__xdata struct ao_log_record *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_record));
- ao_log_current_pos += sizeof (struct ao_log_record);
- }
- } 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;
-}
-
-static __data uint8_t ao_log_data_pos;
+static uint8_t ao_log_data_pos;
/* a hack to make sure that ao_log_records fill the eeprom block in even units */
typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_record))] ;
void
ao_log(void)
{
- __pdata uint16_t next_sensor, next_other;
+ uint16_t next_sensor, next_other;
ao_storage_setup();
while (!ao_log_running)
ao_sleep(&ao_log_running);
- log.type = AO_LOG_FLIGHT;
- log.tick = ao_sample_tick;
+ ao_log_data.type = AO_LOG_FLIGHT;
+ ao_log_data.tick = ao_sample_tick;
#if HAS_ACCEL
- log.u.flight.ground_accel = ao_ground_accel;
+ ao_log_data.u.flight.ground_accel = ao_ground_accel;
#endif
- log.u.flight.flight = ao_flight_number;
- ao_log_data(&log);
+ ao_log_data.u.flight.flight = ao_flight_number;
+ ao_log_write(&ao_log_data);
/* Write the whole contents of the ring to the log
* when starting up.
for (;;) {
/* Write samples to EEPROM */
while (ao_log_data_pos != ao_sample_data) {
- log.tick = ao_data_ring[ao_log_data_pos].tick;
- if ((int16_t) (log.tick - next_sensor) >= 0) {
- log.type = AO_LOG_SENSOR;
- log.u.sensor.accel = ao_data_ring[ao_log_data_pos].adc.accel;
- log.u.sensor.pres = ao_data_ring[ao_log_data_pos].adc.pres;
- ao_log_data(&log);
+ ao_log_data.tick = ao_data_ring[ao_log_data_pos].tick;
+ if ((int16_t) (ao_log_data.tick - next_sensor) >= 0) {
+ ao_log_data.type = AO_LOG_SENSOR;
+ ao_log_data.u.sensor.accel = ao_data_ring[ao_log_data_pos].adc.accel;
+ ao_log_data.u.sensor.pres = ao_data_ring[ao_log_data_pos].adc.pres;
+ ao_log_write(&ao_log_data);
if (ao_log_state <= ao_flight_coast)
- next_sensor = log.tick + AO_SENSOR_INTERVAL_ASCENT;
+ next_sensor = ao_log_data.tick + AO_SENSOR_INTERVAL_ASCENT;
else
- next_sensor = log.tick + AO_SENSOR_INTERVAL_DESCENT;
+ next_sensor = ao_log_data.tick + AO_SENSOR_INTERVAL_DESCENT;
}
- if ((int16_t) (log.tick - next_other) >= 0) {
- log.type = AO_LOG_TEMP_VOLT;
- log.u.temp_volt.temp = ao_data_ring[ao_log_data_pos].adc.temp;
- log.u.temp_volt.v_batt = ao_data_ring[ao_log_data_pos].adc.v_batt;
- ao_log_data(&log);
- log.type = AO_LOG_DEPLOY;
- log.u.deploy.drogue = ao_data_ring[ao_log_data_pos].adc.sense_d;
- log.u.deploy.main = ao_data_ring[ao_log_data_pos].adc.sense_m;
- ao_log_data(&log);
- next_other = log.tick + AO_OTHER_INTERVAL;
+ if ((int16_t) (ao_log_data.tick - next_other) >= 0) {
+ ao_log_data.type = AO_LOG_TEMP_VOLT;
+ ao_log_data.u.temp_volt.temp = ao_data_ring[ao_log_data_pos].adc.temp;
+ ao_log_data.u.temp_volt.v_batt = ao_data_ring[ao_log_data_pos].adc.v_batt;
+ ao_log_write(&ao_log_data);
+ ao_log_data.type = AO_LOG_DEPLOY;
+ ao_log_data.u.deploy.drogue = ao_data_ring[ao_log_data_pos].adc.sense_d;
+ ao_log_data.u.deploy.main = ao_data_ring[ao_log_data_pos].adc.sense_m;
+ ao_log_write(&ao_log_data);
+ next_other = ao_log_data.tick + AO_OTHER_INTERVAL;
}
ao_log_data_pos = ao_data_ring_next(ao_log_data_pos);
}
/* Write state change to EEPROM */
if (ao_flight_state != ao_log_state) {
ao_log_state = ao_flight_state;
- log.type = AO_LOG_STATE;
- log.tick = ao_sample_tick;
- log.u.state.state = ao_log_state;
- log.u.state.reason = 0;
- ao_log_data(&log);
+ ao_log_data.type = AO_LOG_STATE;
+ ao_log_data.tick = ao_sample_tick;
+ ao_log_data.u.state.state = ao_log_state;
+ ao_log_data.u.state.reason = 0;
+ ao_log_write(&ao_log_data);
if (ao_log_state == ao_flight_landed)
ao_log_stop();
ao_sleep(&ao_log_running);
}
}
-
-uint16_t
-ao_log_flight(uint8_t slot)
-{
- if (!ao_storage_read(ao_log_pos(slot),
- &log,
- sizeof (struct ao_log_record)))
- return 0;
-
- if (ao_log_dump_check_data() && log.type == AO_LOG_FLIGHT)
- return log.u.flight.flight;
- return 0;
-}
projects / fw / altos / blobdiff