Merge branch 'buttonbox'

Conflicts:
	doc/telemetrum-doc.xsl

Pull the buttbox version of the docs in as it had been updated.

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 0 insertions, 29 deletions

diff --git a/ao-tools/altosui/AltosDataPoint.java b/ao-tools/altosui/AltosDataPoint.java
deleted file mode 100644
index 66313e03..00000000
--- a/ao-tools/altosui/AltosDataPoint.java
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// Copyright (c) 2010 Anthony Towns
-// GPL v2 or later
-
-package altosui;
-
-interface AltosDataPoint {
-    int version();
-    int serial();
-    int flight();
-    String callsign();
-    double time();
-    double rssi();
-
-    int state();
-    String state_name();
-
-    double acceleration();
-    double pressure();
-    double altitude();
-    double height();
-    double accel_speed();
-    double baro_speed();
-    double temperature();
-    double battery_voltage();
-    double drogue_voltage();
-    double main_voltage();
-}
-