diff options
author | Bdale Garbee <bdale@gag.com> | 2015-07-16 13:31:42 -0600 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2015-07-16 13:31:42 -0600 |
commit | 6e9bb9178356620bd47d9f2e31abf42b7f1a8f11 (patch) | |
tree | 6f04b5500462d1f6e26ebcba58c5e9cd56afd442 /src/kernel/ao_config.h | |
parent | e2cefd8593d269ce603aaf33f4a53a5c2dcb3350 (diff) | |
parent | 87c8bb3956897830da1f7aaca2990a9571767b73 (diff) |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'src/kernel/ao_config.h')
-rw-r--r-- | src/kernel/ao_config.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/kernel/ao_config.h b/src/kernel/ao_config.h index 164584a5..cfe8555c 100644 --- a/src/kernel/ao_config.h +++ b/src/kernel/ao_config.h @@ -57,7 +57,7 @@ #endif #define AO_CONFIG_MAJOR 1 -#define AO_CONFIG_MINOR 21 +#define AO_CONFIG_MINOR 22 #define AO_AES_LEN 16 @@ -115,8 +115,15 @@ struct ao_config { #if HAS_RADIO_FORWARD uint32_t send_frequency; /* minor version 21 */ #endif +#if HAS_APRS + uint8_t aprs_format; /* minor version 22 */ +#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 |