projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update turnon scripts to store cal values
[fw/altos]
/
src
/
core
/
ao.h
diff --git
a/src/core/ao.h
b/src/core/ao.h
index e7320327b712fd8ce50f62ae0830ada9af55276d..29ad26031d9733cfe7409b31127c06c53698ec41 100644
(file)
--- a/
src/core/ao.h
+++ b/
src/core/ao.h
@@
-307,6
+307,17
@@
ao_altitude_to_pa(alt_t alt);
#include <ao_serial.h>
#endif
#include <ao_serial.h>
#endif
+/*
+ * ao_convert_volt.c
+ *
+ * Convert ADC readings to decivolts
+ */
+
+int16_t
+ao_battery_decivolt(int16_t adc);
+
+int16_t
+ao_ignite_decivolt(int16_t adc);
/*
* ao_spi_slave.c
/*
* ao_spi_slave.c
@@
-342,6
+353,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
+750,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
+784,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