summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/ao_adc.h28
-rw-r--r--src/core/ao_data.h2
-rw-r--r--src/core/ao_log_big.c24
-rw-r--r--src/core/ao_telemetry.c28
4 files changed, 30 insertions, 52 deletions
diff --git a/src/core/ao_adc.h b/src/core/ao_adc.h
index 8ec740c4..0dd87080 100644
--- a/src/core/ao_adc.h
+++ b/src/core/ao_adc.h
@@ -18,29 +18,7 @@
#ifndef _AO_ADC_H_
#define _AO_ADC_H_
-/*
- * One set of samples read from the A/D converter or telemetry
- */
-
-#if AO_ADC_RING
-/*
- * ao_adc.c
- */
-
-#define ao_adc_ring_next(n) (((n) + 1) & (AO_ADC_RING - 1))
-#define ao_adc_ring_prev(n) (((n) - 1) & (AO_ADC_RING - 1))
-
-
-/*
- * A/D data is stored in a ring, with the next sample to be written
- * at ao_adc_head
- */
-extern volatile __xdata struct ao_adc ao_adc_ring[AO_ADC_RING];
-extern volatile __data uint8_t ao_adc_head;
-#if HAS_ACCEL_REF
-extern volatile __xdata uint16_t ao_accel_ref[AO_ADC_RING];
-#endif
-#endif
+#include <ao_data.h>
/* Trigger a conversion sequence (called from the timer interrupt) */
void
@@ -50,9 +28,9 @@ ao_adc_poll(void);
void
ao_adc_sleep(void);
-/* Get a copy of the last complete A/D sample set */
+/* Get a copy of the last complete sample set */
void
-ao_adc_get(__xdata struct ao_adc *packet);
+ao_data_get(__xdata struct ao_data *packet);
/* Initialize the A/D converter */
void
diff --git a/src/core/ao_data.h b/src/core/ao_data.h
index d28730a8..bd7e2d54 100644
--- a/src/core/ao_data.h
+++ b/src/core/ao_data.h
@@ -96,7 +96,7 @@ typedef int16_t accel_t;
typedef int16_t accel_t;
#define ao_data_accel(packet) ((packet)->adc.accel)
-#define ao_data_set_accel(packet, accel) ((packet)->adc.accel = (accel))
+#define ao_data_set_accel(packet, a) ((packet)->adc.accel = (a))
#define ao_data_accel_invert(a) (0x7fff -(a))
/*
diff --git a/src/core/ao_log_big.c b/src/core/ao_log_big.c
index 43b3aa0c..50eca069 100644
--- a/src/core/ao_log_big.c
+++ b/src/core/ao_log_big.c
@@ -60,7 +60,7 @@ ao_log_dump_check_data(void)
return 1;
}
-static __data uint8_t ao_log_adc_pos;
+static __data 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))] ;
@@ -94,17 +94,17 @@ ao_log(void)
/* Write the whole contents of the ring to the log
* when starting up.
*/
- ao_log_adc_pos = ao_adc_ring_next(ao_sample_adc);
- next_other = next_sensor = ao_adc_ring[ao_log_adc_pos].tick;
+ ao_log_data_pos = ao_data_ring_next(ao_sample_data);
+ next_other = next_sensor = ao_data_ring[ao_log_data_pos].tick;
ao_log_state = ao_flight_startup;
for (;;) {
/* Write samples to EEPROM */
- while (ao_log_adc_pos != ao_sample_adc) {
- log.tick = ao_adc_ring[ao_log_adc_pos].tick;
+ 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_adc_ring[ao_log_adc_pos].accel;
- log.u.sensor.pres = ao_adc_ring[ao_log_adc_pos].pres;
+ 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);
if (ao_log_state <= ao_flight_coast)
next_sensor = log.tick + AO_SENSOR_INTERVAL_ASCENT;
@@ -113,16 +113,16 @@ ao_log(void)
}
if ((int16_t) (log.tick - next_other) >= 0) {
log.type = AO_LOG_TEMP_VOLT;
- log.u.temp_volt.temp = ao_adc_ring[ao_log_adc_pos].temp;
- log.u.temp_volt.v_batt = ao_adc_ring[ao_log_adc_pos].v_batt;
+ 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_adc_ring[ao_log_adc_pos].sense_d;
- log.u.deploy.main = ao_adc_ring[ao_log_adc_pos].sense_m;
+ 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;
}
- ao_log_adc_pos = ao_adc_ring_next(ao_log_adc_pos);
+ ao_log_data_pos = ao_data_ring_next(ao_log_data_pos);
}
/* Write state change to EEPROM */
if (ao_flight_state != ao_log_state) {
diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index 46d72609..800adfcb 100644
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -53,23 +53,23 @@ static __xdata union ao_telemetry_all telemetry;
static void
ao_send_sensor(void)
{
- uint8_t sample = ao_adc_ring_prev(ao_sample_adc);
+ uint8_t sample = ao_data_ring_prev(ao_sample_data);
- telemetry.generic.tick = ao_adc_ring[sample].tick;
+ telemetry.generic.tick = ao_data_ring[sample].tick;
telemetry.generic.type = AO_TELEMETRY_SENSOR;
telemetry.sensor.state = ao_flight_state;
#if HAS_ACCEL
- telemetry.sensor.accel = ao_adc_ring[sample].accel;
+ telemetry.sensor.accel = ao_data_ring[sample].adc.accel;
#else
telemetry.sensor.accel = 0;
#endif
- telemetry.sensor.pres = ao_adc_ring[sample].pres;
- telemetry.sensor.temp = ao_adc_ring[sample].temp;
- telemetry.sensor.v_batt = ao_adc_ring[sample].v_batt;
+ telemetry.sensor.pres = ao_data_ring[sample].adc.pres;
+ telemetry.sensor.temp = ao_data_ring[sample].adc.temp;
+ telemetry.sensor.v_batt = ao_data_ring[sample].adc.v_batt;
#if HAS_IGNITE
- telemetry.sensor.sense_d = ao_adc_ring[sample].sense_d;
- telemetry.sensor.sense_m = ao_adc_ring[sample].sense_m;
+ telemetry.sensor.sense_d = ao_data_ring[sample].adc.sense_d;
+ telemetry.sensor.sense_m = ao_data_ring[sample].adc.sense_m;
#else
telemetry.sensor.sense_d = 0;
telemetry.sensor.sense_m = 0;
@@ -99,19 +99,19 @@ static uint8_t ao_baro_sample;
static void
ao_send_baro(void)
{
- uint8_t sample = ao_sample_adc;
- uint8_t samples = (sample - ao_baro_sample) & (AO_ADC_RING - 1);
+ uint8_t sample = ao_sample_data;
+ uint8_t samples = (sample - ao_baro_sample) & (AO_DATA_RING - 1);
if (samples > 12) {
- ao_baro_sample = (ao_baro_sample + (samples - 12)) & (AO_ADC_RING - 1);
+ ao_baro_sample = (ao_baro_sample + (samples - 12)) & (AO_DATA_RING - 1);
samples = 12;
}
- telemetry.generic.tick = ao_adc_ring[sample].tick;
+ telemetry.generic.tick = ao_data_ring[sample].tick;
telemetry.generic.type = AO_TELEMETRY_BARO;
telemetry.baro.samples = samples;
for (sample = 0; sample < samples; sample++) {
- telemetry.baro.baro[sample] = ao_adc_ring[ao_baro_sample].pres;
- ao_baro_sample = ao_adc_ring_next(ao_baro_sample);
+ telemetry.baro.baro[sample] = ao_data_ring[ao_baro_sample].adc.pres;
+ ao_baro_sample = ao_data_ring_next(ao_baro_sample);
}
ao_radio_send(&telemetry, sizeof (telemetry));
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-02 18:25:43 +0000