projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libaltos: Add new microchip MAC address to bluetooth map
[fw/altos]
/
altoslib
/
AltosTelemetryStandard.java
diff --git
a/altoslib/AltosTelemetryStandard.java
b/altoslib/AltosTelemetryStandard.java
index 2a1c93652f08d8f42379deb693c587fdda1eb3e5..b8e5d3d6f95979c28810dcf0263e3106d8583fc6 100644
(file)
--- a/
altoslib/AltosTelemetryStandard.java
+++ b/
altoslib/AltosTelemetryStandard.java
@@
-16,7
+16,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_1
2
;
+package org.altusmetrum.altoslib_1
4
;
public abstract class AltosTelemetryStandard extends AltosTelemetry {
public int int8(int off) {
public abstract class AltosTelemetryStandard extends AltosTelemetry {
public int int8(int off) {
@@
-75,8
+75,11
@@
public abstract class AltosTelemetryStandard extends AltosTelemetry {
case packet_type_companion:
telem = new AltosTelemetryCompanion(bytes);
break;
case packet_type_companion:
telem = new AltosTelemetryCompanion(bytes);
break;
- case packet_type_mega_sensor:
- telem = new AltosTelemetryMegaSensor(bytes);
+ case packet_type_mega_sensor_mpu:
+ telem = new AltosTelemetryMegaSensor(bytes, AltosIMU.imu_type_telemega_v3);
+ break;
+ case packet_type_mega_sensor_bmx160:
+ telem = new AltosTelemetryMegaSensor(bytes, AltosIMU.imu_type_telemega_v4);
break;
case packet_type_mega_data:
telem = new AltosTelemetryMegaData(bytes);
break;
case packet_type_mega_data:
telem = new AltosTelemetryMegaData(bytes);