X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_config.h;h=41aafcca8cb5ae4151920bf7aeec34f6b514de0e;hp=70f9f33bdbc6104e60e95a4470ecf35d1f509927;hb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830;hpb=3f3382126bf1122b1a78abe8458af5ec112a1f95

diff --git a/src/kernel/ao_config.h b/src/kernel/ao_config.h
index 70f9f33b..41aafcca 100644
--- 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
- * 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
@@ -28,6 +29,10 @@
 #define USE_EEPROM_CONFIG 0
 #endif
 
+#ifndef FLIGHT_LOG_APPEND
+#define FLIGHT_LOG_APPEND 0
+#endif
+
 #if USE_STORAGE_CONFIG
 
 #include <ao_storage.h>
@@ -53,11 +58,11 @@
 #endif
 
 #define AO_CONFIG_MAJOR	1
-#define AO_CONFIG_MINOR	19
+#define AO_CONFIG_MINOR	23
 
 #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;
@@ -105,8 +110,29 @@ struct ao_config {
 #if HAS_APRS
 	uint8_t		aprs_ssid;		/* minor version 19 */
 #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 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
@@ -125,8 +151,8 @@ struct ao_config {
 /* 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);
@@ -143,6 +169,9 @@ ao_config_put(void);
 void
 ao_config_set_radio(void);
 
+void
+ao_config_log_fix_append(void);
+
 void
 ao_config_init(void);