projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Build telemega-v0.3 by default
[fw/altos]
/
altoslib
/
AltosTelemetryRecord.java
diff --git
a/altoslib/AltosTelemetryRecord.java
b/altoslib/AltosTelemetryRecord.java
index 6b6a252d0b1f0e375abd49ecef17a6e73cd98792..fdc3c88eb6d25b773c1dbad62a6fba17564f5ef9 100644
(file)
--- a/
altoslib/AltosTelemetryRecord.java
+++ b/
altoslib/AltosTelemetryRecord.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 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 {
import java.text.*;
public abstract class AltosTelemetryRecord {
@@
-43,6
+43,7
@@
public abstract class AltosTelemetryRecord {
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_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;
static AltosTelemetryRecord parse_hex(String hex) throws ParseException, AltosCRCException {
AltosTelemetryRecord r;
@@
-76,23
+77,28
@@
public abstract class AltosTelemetryRecord {
case packet_type_TM_sensor:
case packet_type_Tm_sensor:
case packet_type_Tn_sensor:
case packet_type_TM_sensor:
case packet_type_Tm_sensor:
case packet_type_Tn_sensor:
- case packet_type_MM_sensor:
r = new AltosTelemetryRecordSensor(bytes, rssi);
break;
case packet_type_configuration:
r = new AltosTelemetryRecordSensor(bytes, rssi);
break;
case packet_type_configuration:
- r = new AltosTelemetryRecordConfiguration(bytes);
+ r = new AltosTelemetryRecordConfiguration(bytes
, rssi
);
break;
case packet_type_location:
break;
case packet_type_location:
- r = new AltosTelemetryRecordLocation(bytes);
+ r = new AltosTelemetryRecordLocation(bytes
, rssi
);
break;
case packet_type_satellite:
break;
case packet_type_satellite:
- r = new AltosTelemetryRecordSatellite(bytes);
+ r = new AltosTelemetryRecordSatellite(bytes
, rssi
);
break;
case packet_type_companion:
break;
case packet_type_companion:
- r = new AltosTelemetryRecordCompanion(bytes);
+ r = new AltosTelemetryRecordCompanion(bytes, rssi);
+ break;
+ case packet_type_MM_sensor:
+ r = new AltosTelemetryRecordMegaSensor(bytes, rssi);
+ break;
+ case packet_type_MM_data:
+ r = new AltosTelemetryRecordMegaData(bytes, rssi);
break;
default:
break;
default:
- r = new AltosTelemetryRecordRaw(bytes);
+ r = new AltosTelemetryRecordRaw(bytes
, rssi
);
break;
}
break;
break;
}
break;