X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_config.h;h=c668b71a1979c418c5f39b145b8e72cb9a65b95e;hp=3c73ea4948d6264f82c6d7079df5c2706dcaa912;hb=db30a0dd958617cbe7fa8054ebb7b40ced90b602;hpb=70e46100acf597014ce54cf3b642254ce1cba59b

diff --git a/src/kernel/ao_config.h b/src/kernel/ao_config.h
index 3c73ea49..c668b71a 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
@@ -37,7 +38,7 @@
 #include <ao_storage.h>
 
 #define ao_config_setup() 		ao_storage_setup()
-#define ao_config_erase()		ao_storage_erase(ao_storage_config)
+#define ao_config_erase()		ao_storage_erase(ao_storage_config, ao_storage_block)
 #define ao_config_write(pos,bytes, len)	ao_storage_write(ao_storage_config+(pos), bytes, len)
 #define ao_config_read(pos,bytes, len)	ao_storage_read(ao_storage_config+(pos), bytes, len)
 #define ao_config_flush()		ao_storage_flush()
@@ -57,11 +58,11 @@
 #endif
 
 #define AO_CONFIG_MAJOR	1
-#define AO_CONFIG_MINOR	23
+#define AO_CONFIG_MINOR	25
 
 #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;
@@ -91,7 +92,7 @@ struct ao_config {
 #if HAS_RADIO_AMP
 	uint8_t		radio_amp;		/* minor version 14 */
 #endif
-#if HAS_GYRO
+#if HAS_IMU
 	int16_t		accel_zero_along;	/* minor version 15 */
 	int16_t		accel_zero_across;	/* minor version 15 */
 	int16_t		accel_zero_through;	/* minor version 15 */
@@ -122,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
@@ -129,12 +133,13 @@ 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
 #define AO_IGNITE_MODE_APOGEE		1
 #define AO_IGNITE_MODE_MAIN		2
+#define AO_IGNITE_MODE_BOOSTER		3
 
 #define AO_RADIO_ENABLE_CORE		1
 #define AO_RADIO_DISABLE_TELEMETRY	2
@@ -150,8 +155,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);