projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up all existing lintian warnings
[fw/altos]
/
src
/
ao.h
diff --git
a/src/ao.h
b/src/ao.h
index 8836a286b05fab25d5e720cad8c98f4ea37c85a2..b315af7a9672208d57d7bbc8fd062762260f5e7e 100644
(file)
--- a/
src/ao.h
+++ b/
src/ao.h
@@
-464,16
+464,16
@@
ao_mutex_put(__xdata uint8_t *ao_mutex) __reentrant;
*/
/* Total bytes of available storage */
*/
/* Total bytes of available storage */
-extern __
x
data uint32_t ao_storage_total;
+extern __
p
data uint32_t ao_storage_total;
/* Block size - device is erased in these units. At least 256 bytes */
/* Block size - device is erased in these units. At least 256 bytes */
-extern __
x
data uint32_t ao_storage_block;
+extern __
p
data uint32_t ao_storage_block;
/* Byte offset of config block. Will be ao_storage_block bytes long */
/* Byte offset of config block. Will be ao_storage_block bytes long */
-extern __
x
data uint32_t ao_storage_config;
+extern __
p
data uint32_t ao_storage_config;
/* Storage unit size - device reads and writes must be within blocks of this size. Usually 256 bytes. */
/* Storage unit size - device reads and writes must be within blocks of this size. Usually 256 bytes. */
-extern __
x
data uint16_t ao_storage_unit;
+extern __
p
data uint16_t ao_storage_unit;
#define AO_STORAGE_ERASE_LOG (ao_storage_config + AO_CONFIG_MAX_SIZE)
#define AO_STORAGE_ERASE_LOG (ao_storage_config + AO_CONFIG_MAX_SIZE)
@@
-707,7
+707,7
@@
enum ao_flight_state {
extern __pdata enum ao_flight_state ao_flight_state;
extern __pdata uint16_t ao_launch_time;
extern __pdata enum ao_flight_state ao_flight_state;
extern __pdata uint16_t ao_launch_time;
-extern __
x
data uint8_t ao_flight_force_idle;
+extern __
p
data uint8_t ao_flight_force_idle;
/* Flight thread */
void
/* Flight thread */
void
@@
-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