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 37f21508dd0877f1f6f4ae2427f13e1b0a22e273..b6862a87597fae90c4c03655b9540f63bb8a413a 100644
(file)
--- a/
src/ao.h
+++ b/
src/ao.h
@@
-668,7
+668,8
@@
void
ao_serial_putchar(char c) __critical;
#define AO_SERIAL_SPEED_4800 0
ao_serial_putchar(char c) __critical;
#define AO_SERIAL_SPEED_4800 0
-#define AO_SERIAL_SPEED_57600 1
+#define AO_SERIAL_SPEED_9600 1
+#define AO_SERIAL_SPEED_57600 2
void
ao_serial_set_speed(uint8_t speed);
void
ao_serial_set_speed(uint8_t speed);
@@
-800,7
+801,7
@@
void
ao_radio_recv(__xdata struct ao_radio_recv *recv) __reentrant;
void
ao_radio_recv(__xdata struct ao_radio_recv *recv) __reentrant;
void
-ao_radio_rdf(
void
);
+ao_radio_rdf(
int ms
);
void
ao_radio_rdf_abort(void);
void
ao_radio_rdf_abort(void);
@@
-860,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;
@@
-869,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;