X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_config.h;h=7e8e62f31a5ff6652588d6cb61b872f5c102de13;hb=5bfcefc475698dada8be8a2d66afbfcc064d4612;hp=f730c73c99df9764a4991bf0940e136a216117ce;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;p=fw%2Faltos diff --git a/src/kernel/ao_config.h b/src/kernel/ao_config.h index f730c73c..7e8e62f3 100644 --- a/src/kernel/ao_config.h +++ b/src/kernel/ao_config.h @@ -58,11 +58,11 @@ #endif #define AO_CONFIG_MAJOR 1 -#define AO_CONFIG_MINOR 23 +#define AO_CONFIG_MINOR 24 #define AO_AES_LEN 16 -extern __xdata uint8_t ao_config_aes_seq; +extern uint8_t ao_config_aes_seq; struct ao_config { uint8_t major; @@ -123,6 +123,9 @@ struct ao_config { uint8_t pad_box; /* minor version 22 */ uint8_t pad_idle; /* minor version 23 */ #endif +#if HAS_APRS + uint8_t aprs_offset; /* minor version 24 */ +#endif }; #define AO_APRS_FORMAT_COMPRESSED 0 @@ -130,7 +133,7 @@ struct ao_config { #define AO_CONFIG_DEFAULT_APRS_FORMAT AO_APRS_FORMAT_COMPRESSED #if HAS_RADIO_FORWARD -extern __xdata uint32_t ao_send_radio_setting; +extern uint32_t ao_send_radio_setting; #endif #define AO_IGNITE_MODE_DUAL 0 @@ -151,8 +154,8 @@ extern __xdata uint32_t ao_send_radio_setting; /* Make sure AO_CONFIG_MAX_SIZE is big enough */ typedef uint8_t config_check_space[(int) (AO_CONFIG_MAX_SIZE - sizeof (struct ao_config))]; -extern __xdata struct ao_config ao_config; -extern __pdata uint8_t ao_config_loaded; +extern struct ao_config ao_config; +extern uint8_t ao_config_loaded; void _ao_config_edit_start(void);