projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools/ao-cal-freq: Add --nosave and --output options. Check save results.
[fw/altos]
/
altoslib
/
AltosTelemetrySatellite.java
diff --git
a/altoslib/AltosTelemetrySatellite.java
b/altoslib/AltosTelemetrySatellite.java
index 6897f0e6d4273e740a51ad98e2773d0c0072197b..8213a43eda437694d44fb81e5991c1d33fe40f00 100644
(file)
--- a/
altoslib/AltosTelemetrySatellite.java
+++ b/
altoslib/AltosTelemetrySatellite.java
@@
-16,16
+16,15
@@
* 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
1
;
+package org.altusmetrum.altoslib_1
3
;
public class AltosTelemetrySatellite extends AltosTelemetryStandard {
public class AltosTelemetrySatellite extends AltosTelemetryStandard {
- int channels;
- AltosGPSSat[] sats;
+ int channels() { return uint8(5); }
- public AltosTelemetrySatellite(int[] bytes) {
- super(bytes);
+ AltosGPSSat[] sats() {
+ int channels = channels();
+ AltosGPSSat[] sats = null;
- channels = uint8(5);
if (channels > 12)
channels = 12;
if (channels == 0)
if (channels > 12)
channels = 12;
if (channels == 0)
@@
-38,14
+37,21
@@
public class AltosTelemetrySatellite extends AltosTelemetryStandard {
sats[i] = new AltosGPSSat(svid, c_n_1);
}
}
sats[i] = new AltosGPSSat(svid, c_n_1);
}
}
+ return sats;
}
}
- public void update_state(AltosState state) {
- super.update_state(state);
+ public AltosTelemetrySatellite(int[] bytes) throws AltosCRCException {
+ super(bytes);
+ }
+
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
+
+ AltosCalData cal_data = listener.cal_data();
- AltosGPS gps =
state
.make_temp_gps(true);
+ AltosGPS gps =
listener
.make_temp_gps(true);
- gps.cc_gps_sat = sats;
-
state.set_temp_gps(
);
+ gps.cc_gps_sat = sats
()
;
+
listener.set_gps(gps
);
}
}
}
}