projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Set u-blox navigation settings
[fw/altos]
/
altoslib
/
AltosTelemetryRecord.java
diff --git
a/altoslib/AltosTelemetryRecord.java
b/altoslib/AltosTelemetryRecord.java
index 367c148dd187df11645877b2ccbfcaf9beaca95a..fdc3c88eb6d25b773c1dbad62a6fba17564f5ef9 100644
(file)
--- a/
altoslib/AltosTelemetryRecord.java
+++ b/
altoslib/AltosTelemetryRecord.java
@@
-15,7
+15,8
@@
* 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 {
public abstract class AltosTelemetryRecord {
@@
-41,13
+42,15
@@
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_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;
int[] bytes;
try {
static AltosTelemetryRecord parse_hex(String hex) throws ParseException, AltosCRCException {
AltosTelemetryRecord r;
int[] bytes;
try {
- bytes = Altos.hexbytes(hex);
+ bytes = Altos
Lib
.hexbytes(hex);
} catch (NumberFormatException ne) {
throw new ParseException(ne.getMessage(), 0);
}
} catch (NumberFormatException ne) {
throw new ParseException(ne.getMessage(), 0);
}
@@
-60,16
+63,16
@@
public abstract class AltosTelemetryRecord {
if (!cksum(bytes))
throw new ParseException(String.format("invalid line \"%s\"", hex), 0);
if (!cksum(bytes))
throw new ParseException(String.format("invalid line \"%s\"", hex), 0);
- int rssi = Altos.int8(bytes, bytes.length - 3) / 2 - 74;
- int status = Altos.uint8(bytes, bytes.length - 2);
+ int rssi = Altos
Lib
.int8(bytes, bytes.length - 3) / 2 - 74;
+ int status = Altos
Lib
.uint8(bytes, bytes.length - 2);
if ((status & PKT_APPEND_STATUS_1_CRC_OK) == 0)
throw new AltosCRCException(rssi);
/* length, data ..., rssi, status, checksum -- 4 bytes extra */
switch (bytes.length) {
if ((status & PKT_APPEND_STATUS_1_CRC_OK) == 0)
throw new AltosCRCException(rssi);
/* length, data ..., rssi, status, checksum -- 4 bytes extra */
switch (bytes.length) {
- case Altos.ao_telemetry_standard_len + 4:
- int type = Altos.uint8(bytes, 4 + 1);
+ case Altos
Lib
.ao_telemetry_standard_len + 4:
+ int type = Altos
Lib
.uint8(bytes, 4 + 1);
switch (type) {
case packet_type_TM_sensor:
case packet_type_Tm_sensor:
switch (type) {
case packet_type_TM_sensor:
case packet_type_Tm_sensor:
@@
-77,26
+80,32
@@
public abstract class AltosTelemetryRecord {
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;
- case Altos.ao_telemetry_0_9_len + 4:
+ case Altos
Lib
.ao_telemetry_0_9_len + 4:
r = new AltosTelemetryRecordLegacy(bytes, rssi, status);
break;
r = new AltosTelemetryRecordLegacy(bytes, rssi, status);
break;
- case Altos.ao_telemetry_0_8_len + 4:
+ case Altos
Lib
.ao_telemetry_0_8_len + 4:
r = new AltosTelemetryRecordLegacy(bytes, rssi, status);
break;
default:
r = new AltosTelemetryRecordLegacy(bytes, rssi, status);
break;
default: