projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixup for interleave
[fw/altos]
/
src
/
kernel
/
ao_config.h
diff --git
a/src/kernel/ao_config.h
b/src/kernel/ao_config.h
index 0be3e14d1ee0b8a1fc7ca7447d1dbd89169e0371..f730c73c99df9764a4991bf0940e136a216117ce 100644
(file)
--- a/
src/kernel/ao_config.h
+++ b/
src/kernel/ao_config.h
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-57,7
+58,7
@@
#endif
#define AO_CONFIG_MAJOR 1
#endif
#define AO_CONFIG_MAJOR 1
-#define AO_CONFIG_MINOR 2
0
+#define AO_CONFIG_MINOR 2
3
#define AO_AES_LEN 16
#define AO_AES_LEN 16
@@
-112,8
+113,26
@@
struct ao_config {
#if HAS_RADIO_RATE
uint8_t radio_rate; /* minor version 20 */
#endif
#if HAS_RADIO_RATE
uint8_t radio_rate; /* minor version 20 */
#endif
+#if HAS_RADIO_FORWARD
+ uint32_t send_frequency; /* minor version 21 */
+#endif
+#if HAS_APRS
+ uint8_t aprs_format; /* minor version 22 */
+#endif
+#if HAS_FIXED_PAD_BOX
+ uint8_t pad_box; /* minor version 22 */
+ uint8_t pad_idle; /* minor version 23 */
+#endif
};
};
+#define AO_APRS_FORMAT_COMPRESSED 0
+#define AO_APRS_FORMAT_UNCOMPRESSED 1
+#define AO_CONFIG_DEFAULT_APRS_FORMAT AO_APRS_FORMAT_COMPRESSED
+
+#if HAS_RADIO_FORWARD
+extern __xdata uint32_t ao_send_radio_setting;
+#endif
+
#define AO_IGNITE_MODE_DUAL 0
#define AO_IGNITE_MODE_APOGEE 1
#define AO_IGNITE_MODE_MAIN 2
#define AO_IGNITE_MODE_DUAL 0
#define AO_IGNITE_MODE_APOGEE 1
#define AO_IGNITE_MODE_MAIN 2