projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Remove redundant initialization of ao_interval variables
[fw/altos]
/
src
/
ao_flight_test.c
diff --git
a/src/ao_flight_test.c
b/src/ao_flight_test.c
index fde38dc334b2ccbbdc43902eba076b27241937e4..2bf7f2b233a4a3b789d5031d60b7adf1482de225 100644
(file)
--- a/
src/ao_flight_test.c
+++ b/
src/ao_flight_test.c
@@
-22,6
+22,8
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
+#define AO_HERTZ 100
+
#define AO_ADC_RING 64
#define ao_adc_ring_next(n) (((n) + 1) & (AO_ADC_RING - 1))
#define ao_adc_ring_prev(n) (((n) - 1) & (AO_ADC_RING - 1))
#define AO_ADC_RING 64
#define ao_adc_ring_next(n) (((n) + 1) & (AO_ADC_RING - 1))
#define ao_adc_ring_prev(n) (((n) - 1) & (AO_ADC_RING - 1))
@@
-51,7
+53,7
@@
enum ao_flight_state {
ao_flight_pad = 2,
ao_flight_boost = 3,
ao_flight_fast = 4,
ao_flight_pad = 2,
ao_flight_boost = 3,
ao_flight_fast = 4,
- ao_flight_
apogee
= 5,
+ ao_flight_
coast
= 5,
ao_flight_drogue = 6,
ao_flight_main = 7,
ao_flight_landed = 8,
ao_flight_drogue = 6,
ao_flight_main = 7,
ao_flight_landed = 8,
@@
-68,6
+70,8
@@
uint8_t ao_adc_head;
#define ao_cmd_register(c)
#define ao_usb_disable()
#define ao_telemetry_set_interval(x)
#define ao_cmd_register(c)
#define ao_usb_disable()
#define ao_telemetry_set_interval(x)
+#define ao_rdf_set(rdf)
+#define ao_packet_slave_start()
enum ao_igniter {
ao_igniter_drogue = 0,
enum ao_igniter {
ao_igniter_drogue = 0,
@@
-106,7
+110,7
@@
ao_sleep(void *wchan);
const char const * const ao_state_names[] = {
"startup", "idle", "pad", "boost", "fast",
const char const * const ao_state_names[] = {
"startup", "idle", "pad", "boost", "fast",
- "
apogee
", "drogue", "main", "landed", "invalid"
+ "
coast
", "drogue", "main", "landed", "invalid"
};
struct ao_cmds {
};
struct ao_cmds {
@@
-142,12
+146,13
@@
ao_altitude_to_pres(int16_t alt) __reentrant
struct ao_config {
uint16_t main_deploy;
struct ao_config {
uint16_t main_deploy;
- int16_t accel_zero_g;
+ int16_t accel_plus_g;
+ int16_t accel_minus_g;
};
#define ao_config_get()
};
#define ao_config_get()
-struct ao_config ao_config = { 250, 1
6000
};
+struct ao_config ao_config = { 250, 1
5937, 16467
};
#include "ao_flight.c"
#include "ao_flight.c"
@@
-212,7
+217,7
@@
ao_sleep(void *wchan)
type = words[0][0];
tick = strtoul(words[1], NULL, 16);
a = strtoul(words[2], NULL, 16);
type = words[0][0];
tick = strtoul(words[1], NULL, 16);
a = strtoul(words[2], NULL, 16);
- b = strtoul(words[
2
], NULL, 16);
+ b = strtoul(words[
3
], NULL, 16);
} else if (nword >= 36 && strcmp(words[0], "CALL") == 0) {
tick = atoi(words[10]);
if (!ao_flight_started) {
} else if (nword >= 36 && strcmp(words[0], "CALL") == 0) {
tick = atoi(words[10]);
if (!ao_flight_started) {