X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fao.h;h=cbe2f8dc34a222c82c668262912794b3f6838eb2;hb=b132eefc5f63412bb4a98a4bb72b9055e40d5d42;hp=43d4e0e3ddf84242a7b5265314781986b9607b23;hpb=7e7a10c06a0486e9f869e361e46f2c98db9897b0;p=fw%2Faltos

diff --git a/src/core/ao.h b/src/core/ao.h
index 43d4e0e3..cbe2f8dc 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -32,6 +32,12 @@
 #ifndef DATA_TO_XDATA
 #define DATA_TO_XDATA(a)	(a)
 #endif
+#ifndef PDATA_TO_XDATA
+#define PDATA_TO_XDATA(a)	(a)
+#endif
+#ifndef CODE_TO_XDATA
+#define CODE_TO_XDATA(a)	(a)
+#endif
 
 /* An AltOS task */
 struct ao_task {
@@ -996,7 +1002,11 @@ ao_spi_slave(void);
  */
 #define AO_MAX_CALLSIGN			8
 #define AO_MAX_VERSION			8
+#if LEGACY_MONITOR
 #define AO_MAX_TELEMETRY		128
+#else
+#define AO_MAX_TELEMETRY		32
+#endif
 
 struct ao_telemetry_generic {
 	uint16_t	serial;		/* 0 */
@@ -1156,6 +1166,12 @@ union ao_telemetry_all {
 	struct ao_telemetry_baro		baro;
 };
 
+struct ao_telemetry_all_recv {
+	union ao_telemetry_all		telemetry;
+	int8_t				rssi;
+	uint8_t				status;
+};
+
 /*
  * ao_gps.c
  */
@@ -1372,9 +1388,10 @@ extern const char const * const ao_state_names[];
 #define AO_MONITOR_RING	8
 
 union ao_monitor {
-		struct ao_telemetry_raw_recv	raw;
-		struct ao_telemetry_orig_recv	orig;
-		struct ao_telemetry_tiny_recv	tiny;
+	struct ao_telemetry_raw_recv	raw;
+	struct ao_telemetry_all_recv	all;
+	struct ao_telemetry_orig_recv	orig;
+	struct ao_telemetry_tiny_recv	tiny;
 };
 
 extern __xdata union ao_monitor ao_monitor_ring[AO_MONITOR_RING];
@@ -1858,4 +1875,26 @@ ao_log_single(void);
 void
 ao_terraui_init(void);
 
+/*
+ * ao_battery.c
+ */
+
+#ifdef BATTERY_PIN
+void
+ao_battery_isr(void) ao_arch_interrupt(1);
+
+uint16_t
+ao_battery_get(void);
+
+void
+ao_battery_init(void);
+#endif /* BATTERY_PIN */
+
+/*
+ * ao_sqrt.c
+ */
+
+uint32_t
+ao_sqrt(uint32_t op);
+
 #endif /* _AO_H_ */