projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/altosui: Add pad orientation configure option
[fw/altos]
/
src
/
ao.h
diff --git
a/src/ao.h
b/src/ao.h
index e52a2198c4645eb3f45377f4f96dc4321521ec92..b315af7a9672208d57d7bbc8fd062762260f5e7e 100644
(file)
--- a/
src/ao.h
+++ b/
src/ao.h
@@
-829,6
+829,7
@@
extern __pdata int16_t ao_height; /* meters */
extern __pdata int16_t ao_speed; /* m/s * 16 */
extern __pdata int16_t ao_accel; /* m/s² * 16 */
extern __pdata int16_t ao_max_height; /* max of ao_height */
extern __pdata int16_t ao_speed; /* m/s * 16 */
extern __pdata int16_t ao_accel; /* m/s² * 16 */
extern __pdata int16_t ao_max_height; /* max of ao_height */
+extern __pdata int16_t ao_avg_height; /* running average of height */
extern __pdata int16_t ao_error_h;
extern __pdata int16_t ao_error_h_sq_avg;
extern __pdata int16_t ao_error_h;
extern __pdata int16_t ao_error_h_sq_avg;
@@
-1357,7
+1358,7
@@
ao_igniter_init(void);
*/
#define AO_CONFIG_MAJOR 1
*/
#define AO_CONFIG_MAJOR 1
-#define AO_CONFIG_MINOR
4
+#define AO_CONFIG_MINOR
6
struct ao_config {
uint8_t major;
struct ao_config {
uint8_t major;
@@
-1370,8
+1371,17
@@
struct ao_config {
int16_t accel_minus_g; /* minor version 2 */
uint32_t radio_cal; /* minor version 3 */
uint32_t flight_log_max; /* minor version 4 */
int16_t accel_minus_g; /* minor version 2 */
uint32_t radio_cal; /* minor version 3 */
uint32_t flight_log_max; /* minor version 4 */
+ uint8_t ignite_mode; /* minor version 5 */
+ uint8_t pad_orientation; /* minor version 6 */
};
};
+#define AO_IGNITE_MODE_DUAL 0
+#define AO_IGNITE_MODE_APOGEE 1
+#define AO_IGNITE_MODE_MAIN 2
+
+#define AO_PAD_ORIENTATION_ANTENNA_UP 0
+#define AO_PAD_ORIENTATION_ANTENNA_DOWN 1
+
extern __xdata struct ao_config ao_config;
#define AO_CONFIG_MAX_SIZE 128
extern __xdata struct ao_config ao_config;
#define AO_CONFIG_MAX_SIZE 128