X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao.h;h=e076831d98ef8fff3f057590d820b8f9c15464b8;hb=3f0bc801fd08a613c681504f0d1f9374486a2487;hp=5bbe5158e8452707518f88cccf477cc83e960a48;hpb=02611efea0c485d78fad08c696c1f56e868d36b8;p=fw%2Faltos

diff --git a/src/ao.h b/src/ao.h
index 5bbe5158..e076831d 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -516,6 +516,70 @@ ao_storage_device_info(void) __reentrant;
  * ao_log.c
  */
 
+/* We record flight numbers in the first record of
+ * the log. Tasks may wait for this to be initialized
+ * by sleeping on this variable.
+ */
+extern __xdata uint16_t ao_flight_number;
+
+extern __pdata uint32_t ao_log_current_pos;
+extern __pdata uint32_t ao_log_end_pos;
+extern __pdata uint32_t ao_log_start_pos;
+extern __xdata uint8_t	ao_log_running;
+extern __xdata enum flight_state ao_log_state;
+
+/* required functions from the underlying log system */
+
+/* Return the flight number from the given log slot, 0 if none */
+uint16_t
+ao_log_flight(uint8_t slot);
+
+/* Flush the log */
+void
+ao_log_flush(void);
+
+/* Logging thread main routine */
+void
+ao_log(void);
+
+/* functions provided in ao_log.c */
+
+/* Figure out the current flight number */
+void
+ao_log_scan(void) __reentrant;
+
+/* Return the position of the start of the given log slot */
+uint32_t
+ao_log_pos(uint8_t slot);
+
+/* Start logging to eeprom */
+void
+ao_log_start(void);
+
+/* Stop logging */
+void
+ao_log_stop(void);
+
+/* Initialize the logging system */
+void
+ao_log_init(void);
+
+/* Write out the current flight number to the erase log */
+void
+ao_log_write_erase(uint8_t pos);
+
+/* Returns true if there are any logs stored in eeprom */
+uint8_t
+ao_log_present(void);
+
+/* Returns true if there is no more storage space available */
+uint8_t
+ao_log_full(void);
+
+/*
+ * ao_log_big.c
+ */
+
 /*
  * The data log is recorded in the eeprom as a sequence
  * of data packets.
@@ -614,44 +678,6 @@ struct ao_log_record {
 uint8_t
 ao_log_data(__xdata struct ao_log_record *log) __reentrant;
 
-/* Flush the log */
-void
-ao_log_flush(void);
-
-/* We record flight numbers in the first record of
- * the log. Tasks may wait for this to be initialized
- * by sleeping on this variable.
- */
-extern __xdata uint16_t ao_flight_number;
-
-/* Logging thread main routine */
-void
-ao_log(void);
-
-/* Start logging to eeprom */
-void
-ao_log_start(void);
-
-/* Stop logging */
-void
-ao_log_stop(void);
-
-/* Initialize the logging system */
-void
-ao_log_init(void);
-
-/* Write out the current flight number to the erase log */
-void
-ao_log_write_erase(uint8_t pos);
-
-/* Returns true if there are any logs stored in eeprom */
-uint8_t
-ao_log_present(void);
-
-/* Returns true if there is no more storage space available */
-uint8_t
-ao_log_full(void);
-
 /*
  * ao_flight.c
  */
@@ -680,6 +706,13 @@ extern __pdata int16_t			ao_ground_accel;
 extern __pdata int16_t			ao_min_pres;
 extern __pdata uint16_t			ao_launch_time;
 extern __xdata uint8_t			ao_flight_force_idle;
+#ifdef USE_KALMAN
+extern __pdata int16_t			ao_ground_height;
+extern __pdata int32_t			ao_k_max_height;
+extern __pdata int32_t			ao_k_height;
+extern __pdata int32_t			ao_k_speed;
+extern __pdata int32_t			ao_k_accel;
+#endif
 
 /* Flight thread */
 void
@@ -929,18 +962,12 @@ void
 ao_radio_general_isr(void) __interrupt 16;
 
 void
-ao_radio_get(void);
+ao_radio_get(uint8_t len);
 
 #define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
 
 void
-ao_radio_set_fixed_pkt(size_t size);
-
-#define ao_radio_set_telemetry() \
-        ao_radio_set_fixed_pkt(sizeof (struct ao_telemetry))
-
-#define ao_radio_set_packet() \
-        ao_radio_set_fixed_pkt(sizeof (struct ao_packet))
+ao_radio_set_packet(void);
 
 void
 ao_radio_send(__xdata void *data, uint8_t size) __reentrant;
@@ -1164,6 +1191,6 @@ void
 ao_packet_slave_stop(void);
 
 void
-ao_packet_slave_init(void);
+ao_packet_slave_init(uint8_t enable);
 
 #endif /* _AO_H_ */