projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into skytraq
[fw/altos]
/
src
/
ao.h
diff --git
a/src/ao.h
b/src/ao.h
index 0f3f0ea7394e57a66061cac9adade96a55deb0d0..b6862a87597fae90c4c03655b9540f63bb8a413a 100644
(file)
--- a/
src/ao.h
+++ b/
src/ao.h
@@
-861,7
+861,7
@@
ao_igniter_init(void);
*/
#define AO_CONFIG_MAJOR 1
*/
#define AO_CONFIG_MAJOR 1
-#define AO_CONFIG_MINOR
0
+#define AO_CONFIG_MINOR
1
struct ao_config {
uint8_t major;
struct ao_config {
uint8_t major;
@@
-870,6
+870,7
@@
struct ao_config {
int16_t accel_zero_g;
uint8_t radio_channel;
char callsign[AO_MAX_CALLSIGN + 1];
int16_t accel_zero_g;
uint8_t radio_channel;
char callsign[AO_MAX_CALLSIGN + 1];
+ uint8_t apogee_delay;
};
extern __xdata struct ao_config ao_config;
};
extern __xdata struct ao_config ao_config;