projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Make manual pyro firing command work again
[fw/altos]
/
src
/
core
/
ao_log.h
diff --git
a/src/core/ao_log.h
b/src/core/ao_log.h
index 95b3764991c47554669132244cc27b0c3a24a9e9..dce12f02279a19ae7c44acb4f5382dad1e68799e 100644
(file)
--- a/
src/core/ao_log.h
+++ b/
src/core/ao_log.h
@@
-236,7
+236,8
@@
struct ao_log_mega {
int16_t v_pbatt; /* 6 */
int16_t n_sense; /* 8 */
int16_t sense[10]; /* 10 */
int16_t v_pbatt; /* 6 */
int16_t n_sense; /* 8 */
int16_t sense[10]; /* 10 */
- } volt; /* 30 */
+ uint16_t pyro; /* 30 */
+ } volt; /* 32 */
/* AO_LOG_GPS_TIME */
struct {
int32_t latitude; /* 4 */
/* AO_LOG_GPS_TIME */
struct {
int32_t latitude; /* 4 */
@@
-289,12
+290,11
@@
struct ao_log_mini {
} u; /* 16 */
}; /* 16 */
} u; /* 16 */
}; /* 16 */
-static inline void
-ao_log_pack24(uint8_t *dst, uint32_t value) {
- dst[0] = value;
- dst[1] = value >> 8;
- dst[2] = value >> 16;
-}
+#define ao_log_pack24(dst,value) do { \
+ (dst)[0] = (value); \
+ (dst)[1] = (value) >> 8; \
+ (dst)[2] = (value) >> 16; \
+ } while (0)
/* Write a record to the eeprom log */
uint8_t
/* Write a record to the eeprom log */
uint8_t