projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/avr: Pull-up on the SPI slave select pin
[fw/altos]
/
altosui
/
AltosGPS.java
diff --git
a/altosui/AltosGPS.java
b/altosui/AltosGPS.java
index 0dbc8364bb71f1e06f6ab10050a2021c48037374..b5df7c9a61d4b981553971cfd5842b862a7f86a0 100644
(file)
--- a/
altosui/AltosGPS.java
+++ b/
altosui/AltosGPS.java
@@
-21,10
+21,6
@@
import java.lang.*;
import java.text.*;
public class AltosGPS {
import java.text.*;
public class AltosGPS {
- public class AltosGPSSat {
- int svid;
- int c_n0;
- }
final static int MISSING = AltosRecord.MISSING;
final static int MISSING = AltosRecord.MISSING;
@@
-158,9
+154,9
@@
public class AltosGPS {
else
tracking_channels = AltosParse.parse_int(words[i]);
i++;
else
tracking_channels = AltosParse.parse_int(words[i]);
i++;
- cc_gps_sat = new AltosGPS
.AltosGPS
Sat[tracking_channels];
+ cc_gps_sat = new AltosGPSSat[tracking_channels];
for (int chan = 0; chan < tracking_channels; chan++) {
for (int chan = 0; chan < tracking_channels; chan++) {
- cc_gps_sat[chan] = new AltosGPS
.AltosGPS
Sat();
+ cc_gps_sat[chan] = new AltosGPSSat();
cc_gps_sat[chan].svid = AltosParse.parse_int(words[i++]);
/* Older versions included SiRF status bits */
if (version < 2)
cc_gps_sat[chan].svid = AltosParse.parse_int(words[i++]);
/* Older versions included SiRF status bits */
if (version < 2)
@@
-168,7
+164,7
@@
public class AltosGPS {
cc_gps_sat[chan].c_n0 = AltosParse.parse_int(words[i++]);
}
} else
cc_gps_sat[chan].c_n0 = AltosParse.parse_int(words[i++]);
}
} else
- cc_gps_sat = new AltosGPS
.AltosGPS
Sat[0];
+ cc_gps_sat = new AltosGPSSat[0];
}
public void set_latitude(int in_lat) {
}
public void set_latitude(int in_lat) {
@@
-201,14
+197,14
@@
public class AltosGPS {
public void add_sat(int svid, int c_n0) {
if (cc_gps_sat == null) {
public void add_sat(int svid, int c_n0) {
if (cc_gps_sat == null) {
- cc_gps_sat = new AltosGPS
.AltosGPS
Sat[1];
+ cc_gps_sat = new AltosGPSSat[1];
} else {
} else {
- AltosGPSSat[] new_gps_sat = new AltosGPS
.AltosGPS
Sat[cc_gps_sat.length + 1];
+ AltosGPSSat[] new_gps_sat = new AltosGPSSat[cc_gps_sat.length + 1];
for (int i = 0; i < cc_gps_sat.length; i++)
new_gps_sat[i] = cc_gps_sat[i];
cc_gps_sat = new_gps_sat;
}
for (int i = 0; i < cc_gps_sat.length; i++)
new_gps_sat[i] = cc_gps_sat[i];
cc_gps_sat = new_gps_sat;
}
- AltosGPS
.AltosGPSSat sat = new AltosGPS.
AltosGPSSat();
+ AltosGPS
Sat sat = new
AltosGPSSat();
sat.svid = svid;
sat.c_n0 = c_n0;
cc_gps_sat[cc_gps_sat.length - 1] = sat;
sat.svid = svid;
sat.c_n0 = c_n0;
cc_gps_sat[cc_gps_sat.length - 1] = sat;