projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure that ao_alarm waits at least the specified time
[fw/altos]
/
src
/
ao.h
diff --git
a/src/ao.h
b/src/ao.h
index 287c912d17e492f6a139197db5e9aa060ad06174..096a4d80baf23b736821337be7e2d4374493a187 100644
(file)
--- a/
src/ao.h
+++ b/
src/ao.h
@@
-835,6
+835,11
@@
extern __xdata uint8_t ao_radio_mutex;
void
ao_radio_general_isr(void) interrupt 16;
void
ao_radio_general_isr(void) interrupt 16;
+void
+ao_radio_get(void);
+
+#define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
+
void
ao_radio_set_telemetry(void);
void
ao_radio_set_telemetry(void);
@@
-938,17
+943,18
@@
ao_igniter_init(void);
*/
#define AO_CONFIG_MAJOR 1
*/
#define AO_CONFIG_MAJOR 1
-#define AO_CONFIG_MINOR
2
+#define AO_CONFIG_MINOR
3
struct ao_config {
uint8_t major;
uint8_t minor;
uint16_t main_deploy;
struct ao_config {
uint8_t major;
uint8_t minor;
uint16_t main_deploy;
- int16_t accel_plus_g;
+ int16_t accel_plus_g;
/* changed for minor version 2 */
uint8_t radio_channel;
char callsign[AO_MAX_CALLSIGN + 1];
uint8_t radio_channel;
char callsign[AO_MAX_CALLSIGN + 1];
- uint8_t apogee_delay;
- int16_t accel_minus_g;
+ uint8_t apogee_delay; /* minor version 1 */
+ int16_t accel_minus_g; /* minor version 2 */
+ uint32_t radio_cal; /* minor version 3 */
};
extern __xdata struct ao_config ao_config;
};
extern __xdata struct ao_config ao_config;