projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Don't hold GPS mutex while waiting in TM v2.0 report
[fw/altos]
/
src
/
core
/
ao.h
diff --git
a/src/core/ao.h
b/src/core/ao.h
index caa0ec195e59f6fea2774eaefed84c3ef3517931..0b634a7994dd83ad0361649f66a6463c46645b85 100644
(file)
--- a/
src/core/ao.h
+++ b/
src/core/ao.h
@@
-182,7
+182,7
@@
void
ao_cmd_hex(void);
void
ao_cmd_hex(void);
void
-ao_cmd_decimal(void);
+ao_cmd_decimal(void)
__reentrant
;
/* Read a single hex nibble off stdin. */
uint8_t
/* Read a single hex nibble off stdin. */
uint8_t
@@
-342,6
+342,10
@@
ao_spi_slave(void);
#define AO_GPS_DATE_VALID (1 << 6)
#define AO_GPS_COURSE_VALID (1 << 7)
#define AO_GPS_DATE_VALID (1 << 6)
#define AO_GPS_COURSE_VALID (1 << 7)
+#define AO_GPS_NEW_DATA 1
+#define AO_GPS_NEW_TRACKING 2
+
+extern __xdata uint8_t ao_gps_new;
extern __pdata uint16_t ao_gps_tick;
extern __xdata uint8_t ao_gps_mutex;
extern __xdata struct ao_telemetry_location ao_gps_data;
extern __pdata uint16_t ao_gps_tick;
extern __xdata uint8_t ao_gps_mutex;
extern __xdata struct ao_telemetry_location ao_gps_data;
@@
-735,7
+739,7
@@
extern __xdata uint8_t ao_force_freq;
#endif
#define AO_CONFIG_MAJOR 1
#endif
#define AO_CONFIG_MAJOR 1
-#define AO_CONFIG_MINOR 1
4
+#define AO_CONFIG_MINOR 1
5
#define AO_AES_LEN 16
#define AO_AES_LEN 16
@@
-769,6
+773,11
@@
struct ao_config {
#if HAS_RADIO_AMP
uint8_t radio_amp; /* minor version 14 */
#endif
#if HAS_RADIO_AMP
uint8_t radio_amp; /* minor version 14 */
#endif
+#if HAS_GYRO
+ int16_t accel_zero_along; /* minor version 15 */
+ int16_t accel_zero_across; /* minor version 15 */
+ int16_t accel_zero_through; /* minor version 15 */
+#endif
};
#define AO_IGNITE_MODE_DUAL 0
};
#define AO_IGNITE_MODE_DUAL 0