projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
initial cut at telegps-v2.0 firmware
[fw/altos]
/
altoslib
/
AltosTelemetryStandard.java
diff --git
a/altoslib/AltosTelemetryStandard.java
b/altoslib/AltosTelemetryStandard.java
index d4aaff5be9844417ef5b40ebda938283be0e70b8..35d315c7972963b4b3ea1b9bfa447704c70e5d2a 100644
(file)
--- a/
altoslib/AltosTelemetryStandard.java
+++ b/
altoslib/AltosTelemetryStandard.java
@@
-3,7
+3,8
@@
*
* 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
*
* 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.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,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_
7
;
+package org.altusmetrum.altoslib_
11
;
public abstract class AltosTelemetryStandard extends AltosTelemetry {
int[] bytes;
public abstract class AltosTelemetryStandard extends AltosTelemetry {
int[] bytes;
@@
-68,11
+69,9
@@
public abstract class AltosTelemetryStandard extends AltosTelemetry {
case packet_type_satellite:
telem = new AltosTelemetrySatellite(bytes);
break;
case packet_type_satellite:
telem = new AltosTelemetrySatellite(bytes);
break;
-/*
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);
break;
case packet_type_mega_sensor:
telem = new AltosTelemetryMegaSensor(bytes);
break;
@@
-85,8
+84,11
@@
public abstract class AltosTelemetryStandard extends AltosTelemetry {
case packet_type_metrum_data:
telem = new AltosTelemetryMetrumData(bytes);
break;
case packet_type_metrum_data:
telem = new AltosTelemetryMetrumData(bytes);
break;
- case packet_type_mini:
- telem = new AltosTelemetryMini(bytes);
+ case packet_type_mini2:
+ telem = new AltosTelemetryMini2(bytes);
+ break;
+ case packet_type_mini3:
+ telem = new AltosTelemetryMini3(bytes);
break;
default:
telem = new AltosTelemetryRaw(bytes);
break;
default:
telem = new AltosTelemetryRaw(bytes);