Revert adding state to GPS location packets

[fw/altos] / src / kernel / ao_config.h

diff --git a/src/kernel/ao_config.h b/src/kernel/ao_config.h
index 85673764e62c5d0f8a781ae328646c8d49506a0e..77f73fbe6014749b054949f82c46937272bfc516 100644 (file)
--- a/src/kernel/ao_config.h
+++ b/src/kernel/ao_config.h
@@ -53,7 +53,7 @@
 #endif
 
 #define AO_CONFIG_MAJOR        1
-#define AO_CONFIG_MINOR        17
+#define AO_CONFIG_MINOR        18
 
 #define AO_AES_LEN 16
 
@@ -99,6 +99,9 @@ struct ao_config {
        uint16_t        tracker_start_horiz;    /* minor version 17 */
        uint16_t        tracker_start_vert;     /* minor version 17 */
 #endif
+#if AO_PYRO_NUM
+       uint16_t        pyro_time;              /* minor version 18 */
+#endif
 };
 
 #define AO_IGNITE_MODE_DUAL            0
@@ -112,7 +115,12 @@ struct ao_config {
 #define AO_PAD_ORIENTATION_ANTENNA_UP  0
 #define AO_PAD_ORIENTATION_ANTENNA_DOWN        1
 
+#ifndef AO_CONFIG_MAX_SIZE
 #define AO_CONFIG_MAX_SIZE     128
+#endif
+
+/* 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;