altoslib: Add companion telemetry data support

This got lost in the great telemetry rewrite

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

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 4edae54adaef19185e2735abe0013a68d9e29fc7..cf4fb9b030d66ca147be6af432e6304401d2d8a0 100644 (file)
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -1358,11 +1358,6 @@ public class AltosState implements Cloneable, Serializable {
                }
        }
 
-       public void make_companion (int nchannels) {
-               if (companion == null)
-                       companion = new AltosCompanion(nchannels);
-       }
-
        public void set_companion(AltosCompanion companion) {
                this.companion = companion;
        }

diff --git a/altoslib/AltosTelemetryCompanion.java b/altoslib/AltosTelemetryCompanion.java
new file mode 100644 (file)
index 0000000..96125ac
--- /dev/null
+++ b/altoslib/AltosTelemetryCompanion.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2015 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altoslib_8;
+
+public class AltosTelemetryCompanion extends AltosTelemetryStandard {
+       AltosCompanion  companion;
+
+       static final public int max_channels = 12;
+
+       public AltosTelemetryCompanion(int[] bytes) {
+               super(bytes);
+
+               int     channels = uint8(7);
+
+               if (channels > max_channels)
+                       channels = max_channels;
+
+               companion = new AltosCompanion(channels);
+
+               companion.tick = tick;
+               companion.board_id = uint8(5);
+               companion.update_period = uint8(6);
+
+               if (channels == 0)
+                       companion.companion_data = null;
+               else {
+                       companion.companion_data = new int[channels];
+
+                       for (int i = 0; i < channels; i++)
+                               companion.companion_data[i] = uint16(8 + i * 2);
+               }
+       }
+
+       public void update_state(AltosState state) {
+               super.update_state(state);
+
+               state.set_companion(companion);
+       }
+}

diff --git a/altoslib/AltosTelemetryStandard.java b/altoslib/AltosTelemetryStandard.java
index 2756182616f7cec6a2d79ac0d9025854feb3ffa2..c2a5ab3c584f8d32c0573d2ab292714bcdddb5ee 100644 (file)
--- a/altoslib/AltosTelemetryStandard.java
+++ b/altoslib/AltosTelemetryStandard.java
@@ -68,11 +68,9 @@ public abstract class AltosTelemetryStandard extends AltosTelemetry {
                case packet_type_satellite:
                        telem = new AltosTelemetrySatellite(bytes);
                        break;
-/*
                case packet_type_companion:
                        telem = new AltosTelemetryCompanion(bytes);
                        break;
-*/
                case packet_type_mega_sensor:
                        telem = new AltosTelemetryMegaSensor(bytes);
                        break;

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index a6b178fa167fcbee9efcd110222432c5c7abf8ab..d1f8f2652e6329f0cce1db9c44ed8e6c913569d6 100644 (file)
--- a/altoslib/Makefile.am
+++ b/altoslib/Makefile.am
@@ -96,6 +96,7 @@ altoslib_JAVA = \
        AltosStateUpdate.java \
        AltosTelemetry.java \
        AltosTelemetryConfiguration.java \
+       AltosTelemetryCompanion.java \
        AltosTelemetryFile.java \
        AltosTelemetryIterable.java \
        AltosTelemetryLegacy.java \