Merge branch 'master' into altosdroid

[fw/altos] / altoslib / AltosTelemetryRecord.java

diff --git a/altoslib/AltosTelemetryRecord.java b/altoslib/AltosTelemetryRecord.java
index 4292dae8e6bb629f715e94dd27dfb8f4cfe9a2d1..01215968427069b36aa585090404f58ff9b57af6 100644 (file)
--- a/altoslib/AltosTelemetryRecord.java
+++ b/altoslib/AltosTelemetryRecord.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_1;
 import java.text.*;
 
 public abstract class AltosTelemetryRecord {
@@ -42,6 +42,8 @@ public abstract class AltosTelemetryRecord {
        final static int packet_type_location = 0x05;
        final static int packet_type_satellite = 0x06;
        final static int packet_type_companion = 0x07;
+       final static int packet_type_MM_sensor = 0x08;
+       final static int packet_type_MM_data = 0x09;
        
        static AltosTelemetryRecord parse_hex(String hex)  throws ParseException, AltosCRCException {
                AltosTelemetryRecord    r;
@@ -89,6 +91,12 @@ public abstract class AltosTelemetryRecord {
                        case packet_type_companion:
                                r = new AltosTelemetryRecordCompanion(bytes);
                                break;
+                       case packet_type_MM_sensor:
+                               r = new AltosTelemetryRecordMegaSensor(bytes, rssi);
+                               break;
+                       case packet_type_MM_data:
+                               r = new AltosTelemetryRecordMegaData(bytes);
+                               break;
                        default:
                                r = new AltosTelemetryRecordRaw(bytes);
                                break;