summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--altoslib/AltosCSV.java8
-rw-r--r--altoslib/AltosEepromDownload.java14
-rw-r--r--altoslib/AltosEepromFile.java4
-rw-r--r--altoslib/AltosFlightStats.java6
-rw-r--r--altoslib/AltosKML.java8
-rw-r--r--altoslib/AltosMap.java9
-rw-r--r--altoslib/AltosReplayReader.java2
-rw-r--r--altoslib/AltosState.java6
-rw-r--r--altoslib/AltosTelemetry.java2
-rw-r--r--altoslib/AltosTelemetryFile.java4
-rw-r--r--altosui/AltosFlightStatus.java6
-rw-r--r--altosui/AltosFlightUI.java10
-rw-r--r--altosui/AltosPad.java10
-rw-r--r--altosui/AltosUI.java2
-rw-r--r--altosuilib/AltosDisplayThread.java32
-rw-r--r--altosuilib/AltosGraphDataPoint.java2
16 files changed, 63 insertions, 62 deletions
diff --git a/altoslib/AltosCSV.java b/altoslib/AltosCSV.java
index edb23e69..150f5a64 100644
--- a/altoslib/AltosCSV.java
+++ b/altoslib/AltosCSV.java
@@ -129,7 +129,7 @@ public class AltosCSV implements AltosWriter {
}
void write_flight(AltosState state) {
- out.printf("%d,%8s", state.state, state.state_name());
+ out.printf("%d,%8s", state.state(), state.state_name());
}
void write_basic_header() {
@@ -326,14 +326,14 @@ public class AltosCSV implements AltosWriter {
}
private void write(AltosState state) {
- if (state.state == AltosLib.ao_flight_startup)
+ if (state.state() == AltosLib.ao_flight_startup)
return;
if (!header_written) {
write_header();
header_written = true;
}
if (!seen_boost) {
- if (state.state >= AltosLib.ao_flight_boost) {
+ if (state.state() >= AltosLib.ao_flight_boost) {
seen_boost = true;
boost_tick = state.tick;
flush_pad();
@@ -368,7 +368,7 @@ public class AltosCSV implements AltosWriter {
has_gps_sat = false;
has_companion = false;
for (AltosState state : states) {
- if (state.state != AltosLib.ao_flight_stateless && state.state != AltosLib.ao_flight_invalid && state.state != AltosLib.ao_flight_startup)
+ if (state.state() != AltosLib.ao_flight_stateless && state.state() != AltosLib.ao_flight_invalid && state.state() != AltosLib.ao_flight_startup)
has_flight_state = true;
if (state.acceleration() != AltosLib.MISSING || state.pressure() != AltosLib.MISSING)
has_basic = true;
diff --git a/altoslib/AltosEepromDownload.java b/altoslib/AltosEepromDownload.java
index baaeb993..5e035dbc 100644
--- a/altoslib/AltosEepromDownload.java
+++ b/altoslib/AltosEepromDownload.java
@@ -111,12 +111,12 @@ public class AltosEepromDownload implements Runnable {
monitor.set_flight(state.flight);
/* Monitor state transitions to update display */
- if (state.state != AltosLib.ao_flight_invalid &&
- state.state <= AltosLib.ao_flight_landed)
+ if (state.state() != AltosLib.ao_flight_invalid &&
+ state.state() <= AltosLib.ao_flight_landed)
{
- if (state.state > AltosLib.ao_flight_pad)
+ if (state.state() > AltosLib.ao_flight_pad)
want_file = true;
- if (state.state == AltosLib.ao_flight_landed)
+ if (state.state() == AltosLib.ao_flight_landed)
done = true;
}
@@ -174,13 +174,13 @@ public class AltosEepromDownload implements Runnable {
CaptureEeprom (eechunk, log_format);
- if (state.state != prev_state && state.state != AltosLib.ao_flight_invalid) {
+ if (state.state() != prev_state && state.state() != AltosLib.ao_flight_invalid) {
state_block = block;
- prev_state = state.state;
+ prev_state = state.state();
}
monitor.set_value(state.state_name(),
- state.state,
+ state.state(),
block - state_block,
block - log.start_block);
}
diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index 33d4f63b..002b7fff 100644
--- a/altoslib/AltosEepromFile.java
+++ b/altoslib/AltosEepromFile.java
@@ -72,7 +72,7 @@ public class AltosEepromFile extends AltosStateIterable {
headers = new AltosEepromIterable(AltosEepromHeader.read(input));
start = headers.state();
- if (start.state != AltosLib.ao_flight_stateless)
+ if (start.state() != AltosLib.ao_flight_stateless)
start.set_state(AltosLib.ao_flight_pad);
if (start.log_format == AltosLib.MISSING) {
@@ -117,7 +117,7 @@ public class AltosEepromFile extends AltosStateIterable {
for (AltosEeprom eeprom : body) {
eeprom.update_state(state);
state.finish_update();
- if (state.state >= AltosLib.ao_flight_boost) {
+ if (state.state() >= AltosLib.ao_flight_boost) {
start.set_boost_tick(state.tick);
break;
}
diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java
index b837ba84..fdf79fa2 100644
--- a/altoslib/AltosFlightStats.java
+++ b/altoslib/AltosFlightStats.java
@@ -52,7 +52,7 @@ public class AltosFlightStats {
for (AltosState s : states) {
state = s;
- if (state.state == AltosLib.ao_flight_landed)
+ if (state.state() == AltosLib.ao_flight_landed)
break;
}
@@ -92,7 +92,7 @@ public class AltosFlightStats {
state = s;
if (state.acceleration() < 1)
boost_time = state.time;
- if (state.state >= AltosLib.ao_flight_boost && state.state <= AltosLib.ao_flight_landed)
+ if (state.state() >= AltosLib.ao_flight_boost && state.state() <= AltosLib.ao_flight_landed)
break;
}
if (state == null)
@@ -138,7 +138,7 @@ public class AltosFlightStats {
if (state.pressure() != AltosLib.MISSING)
has_flight_data = true;
- int state_id = state.state;
+ int state_id = state.state();
if (state.time >= boost_time && state_id < AltosLib.ao_flight_boost)
state_id = AltosLib.ao_flight_boost;
if (state.time >= landed_time && state_id < AltosLib.ao_flight_landed)
diff --git a/altoslib/AltosKML.java b/altoslib/AltosKML.java
index 81433958..1a364106 100644
--- a/altoslib/AltosKML.java
+++ b/altoslib/AltosKML.java
@@ -112,8 +112,8 @@ public class AltosKML implements AltosWriter {
boolean started = false;
void state_start(AltosState state) {
- String state_name = AltosLib.state_name(state.state);
- String state_color = state_color(state.state);
+ String state_name = AltosLib.state_name(state.state());
+ String state_color = state_color(state.state());
out.printf(kml_style_start, state_name, state_color);
out.printf("\tState: %s\n", state_name);
out.printf("%s", kml_style_end);
@@ -171,8 +171,8 @@ public class AltosKML implements AltosWriter {
}
if (prev != null && prev.gps_sequence == state.gps_sequence)
return;
- if (state.state != flight_state) {
- flight_state = state.state;
+ if (state.state() != flight_state) {
+ flight_state = state.state();
if (prev != null) {
coord(state);
state_end(prev);
diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index 8a3266c9..a2855192 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -230,23 +230,23 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
if (!gps.locked && gps.nsat < 4)
return;
- switch (state.state) {
+ switch (state.state()) {
case AltosLib.ao_flight_boost:
if (!have_boost) {
- add_mark(gps.lat, gps.lon, state.state);
+ add_mark(gps.lat, gps.lon, state.state());
have_boost = true;
}
break;
case AltosLib.ao_flight_landed:
if (!have_landed) {
- add_mark(gps.lat, gps.lon, state.state);
+ add_mark(gps.lat, gps.lon, state.state());
have_landed = true;
}
break;
}
if (path != null) {
- AltosMapRectangle damage = path.add(gps.lat, gps.lon, state.state);
+ AltosMapRectangle damage = path.add(gps.lat, gps.lon, state.state());
if (damage != null)
repaint(damage, AltosMapPath.stroke_width);
@@ -324,6 +324,7 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
if (!tiles.containsKey(point)) {
AltosLatLon ul = transform.lat_lon(point);
AltosLatLon center = transform.lat_lon(new AltosPointDouble(x + AltosMap.px_size/2, y + AltosMap.px_size/2));
+ debug("make tile %g,%g\n", center.lat, center.lon);
AltosMapTile tile = map_interface.new_tile(this, ul, center, zoom, maptype, px_size);
tiles.put(point, tile);
}
diff --git a/altoslib/AltosReplayReader.java b/altoslib/AltosReplayReader.java
index 9419ec93..55faa17c 100644
--- a/altoslib/AltosReplayReader.java
+++ b/altoslib/AltosReplayReader.java
@@ -39,7 +39,7 @@ public class AltosReplayReader extends AltosFlightReader {
public void update(AltosState state) throws InterruptedException {
/* Make it run in realtime after the rocket leaves the pad */
- if (state.state > AltosLib.ao_flight_pad && state.time_change > 0)
+ if (state.state() > AltosLib.ao_flight_pad && state.time_change > 0)
Thread.sleep((int) (Math.min(state.time_change,10) * 1000));
state.set_received_time(System.currentTimeMillis());
}
diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index cf4fb9b0..12cd5adf 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -284,7 +284,7 @@ public class AltosState implements Cloneable, Serializable {
}
}
- public int state;
+ private int state;
public int flight;
public int serial;
public int altitude_32;
@@ -1056,6 +1056,10 @@ public class AltosState implements Cloneable, Serializable {
}
}
+ public int state() {
+ return state;
+ }
+
public void set_device_type(int device_type) {
this.device_type = device_type;
switch (device_type) {
diff --git a/altoslib/AltosTelemetry.java b/altoslib/AltosTelemetry.java
index 4c973cd9..821adc84 100644
--- a/altoslib/AltosTelemetry.java
+++ b/altoslib/AltosTelemetry.java
@@ -44,7 +44,7 @@ public abstract class AltosTelemetry implements AltosStateUpdate {
public void update_state(AltosState state) {
state.set_serial(serial);
- if (state.state == AltosLib.ao_flight_invalid)
+ if (state.state() == AltosLib.ao_flight_invalid)
state.set_state(AltosLib.ao_flight_startup);
state.set_tick(tick);
state.set_rssi(rssi, status);
diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java
index d2275f54..d87939ff 100644
--- a/altoslib/AltosTelemetryFile.java
+++ b/altoslib/AltosTelemetryFile.java
@@ -75,7 +75,7 @@ public class AltosTelemetryFile extends AltosStateIterable {
for (AltosTelemetry telem : telems) {
telem.update_state(state);
state.finish_update();
- if (state.state != AltosLib.ao_flight_invalid && state.state >= AltosLib.ao_flight_boost) {
+ if (state.state() != AltosLib.ao_flight_invalid && state.state() >= AltosLib.ao_flight_boost) {
start.set_boost_tick(state.tick);
break;
}
@@ -93,4 +93,4 @@ public class AltosTelemetryFile extends AltosStateIterable {
}
return new AltosTelemetryIterator(state, i);
}
-} \ No newline at end of file
+}
diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java
index 815a6fa4..f44e2616 100644
--- a/altosui/AltosFlightStatus.java
+++ b/altosui/AltosFlightStatus.java
@@ -173,14 +173,14 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
int last_state = -1;
void show(AltosState state, AltosListenerState listener_state) {
- if (state.state != last_state) {
- if (state.state == AltosLib.ao_flight_stateless)
+ if (state.state() != last_state) {
+ if (state.state() == AltosLib.ao_flight_stateless)
hide();
else {
show();
value.setText(state.state_name());
}
- last_state = state.state;
+ last_state = state.state();
}
}
diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index db33e0d9..939c4688 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -53,13 +53,13 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
JComponent cur_tab = null;
JComponent which_tab(AltosState state) {
- if (state.state < Altos.ao_flight_boost)
+ if (state.state() < Altos.ao_flight_boost)
return pad;
- if (state.state <= Altos.ao_flight_coast)
+ if (state.state() <= Altos.ao_flight_coast)
return ascent;
- if (state.state <= Altos.ao_flight_main)
+ if (state.state() <= Altos.ao_flight_main)
return descent;
- if (state.state == AltosLib.ao_flight_stateless)
+ if (state.state() == AltosLib.ao_flight_stateless)
return descent;
return landed;
}
@@ -102,7 +102,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
if (state == null)
state = new AltosState();
- if (state.state != Altos.ao_flight_startup) {
+ if (state.state() != Altos.ao_flight_startup) {
if (!has_state) {
pane.setTitleAt(0, "Launch Pad");
pane.add(ascent, 1);
diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 2f87b681..d056e256 100644
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -49,10 +49,10 @@ public class AltosPad extends AltosUIFlightTab {
hide();
} else {
if (state.flight != 0) {
- if (state.state <= Altos.ao_flight_pad)
+ if (state.state() <= Altos.ao_flight_pad)
show("Ready to record");
- else if (state.state < Altos.ao_flight_landed ||
- state.state == AltosLib.ao_flight_stateless)
+ else if (state.state() < Altos.ao_flight_landed ||
+ state.state() == AltosLib.ao_flight_stateless)
show("Recording data");
else
show("Recorded data");
@@ -121,8 +121,8 @@ public class AltosPad extends AltosUIFlightTab {
}
boolean report_pad(AltosState state) {
- if ((state.state == AltosLib.ao_flight_stateless ||
- state.state < AltosLib.ao_flight_pad) &&
+ if ((state.state() == AltosLib.ao_flight_stateless ||
+ state.state() < AltosLib.ao_flight_pad) &&
state.gps != null &&
state.gps.lat != AltosLib.MISSING)
{
diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index f6caa4ef..c29f0db3 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -539,7 +539,7 @@ public class AltosUI extends AltosUIFrame {
System.out.printf ("process cat\n");
for (AltosState state : eef) {
System.out.printf ("tick %d state %d height %g\n",
- state.tick, state.state, state.height());
+ state.tick, state.state(), state.height());
if ((state.set & AltosState.set_gps) != 0)
System.out.printf ("time %g lat %g lon %g alt %g\n",
state.time_since_boost(),
diff --git a/altosuilib/AltosDisplayThread.java b/altosuilib/AltosDisplayThread.java
index 73d85698..a773022b 100644
--- a/altosuilib/AltosDisplayThread.java
+++ b/altosuilib/AltosDisplayThread.java
@@ -78,7 +78,7 @@ public class AltosDisplayThread extends Thread {
return;
/* reset the landing count once we hear about a new flight */
- if (state.state < AltosLib.ao_flight_drogue)
+ if (state.state() < AltosLib.ao_flight_drogue)
reported_landing = 0;
/* Shut up once the rocket is on the ground */
@@ -87,8 +87,8 @@ public class AltosDisplayThread extends Thread {
}
/* If the rocket isn't on the pad, then report height */
- if (AltosLib.ao_flight_drogue <= state.state &&
- state.state < AltosLib.ao_flight_landed &&
+ if (AltosLib.ao_flight_drogue <= state.state() &&
+ state.state() < AltosLib.ao_flight_landed &&
state.from_pad != null &&
state.range >= 0)
{
@@ -99,7 +99,7 @@ public class AltosDisplayThread extends Thread {
(int) (state.from_pad.bearing + 0.5),
(int) (state.elevation + 0.5),
AltosConvert.distance.say(state.range));
- } else if (state.state > AltosLib.ao_flight_pad && state.height() != AltosLib.MISSING) {
+ } else if (state.state() > AltosLib.ao_flight_pad && state.height() != AltosLib.MISSING) {
voice.speak(AltosConvert.height.say_units(state.height()));
} else {
reported_landing = 0;
@@ -109,11 +109,11 @@ public class AltosDisplayThread extends Thread {
* either we've got a landed report or we haven't heard from it in
* a long time
*/
- if (state.state != AltosLib.ao_flight_stateless &&
- state.state >= AltosLib.ao_flight_drogue &&
+ if (state.state() != AltosLib.ao_flight_stateless &&
+ state.state() >= AltosLib.ao_flight_drogue &&
(last ||
System.currentTimeMillis() - state.received_time >= 15000 ||
- state.state == AltosLib.ao_flight_landed))
+ state.state() == AltosLib.ao_flight_landed))
{
if (Math.abs(state.speed()) < 20 && state.height() < 100)
voice.speak("rocket landed safely");
@@ -124,10 +124,6 @@ public class AltosDisplayThread extends Thread {
(int) (state.from_pad.bearing + 0.5),
AltosConvert.distance.say_units(state.from_pad.distance));
++reported_landing;
- if (state.state != AltosLib.ao_flight_landed) {
- state.state = AltosLib.ao_flight_landed;
- show_safely();
- }
}
}
@@ -167,7 +163,7 @@ public class AltosDisplayThread extends Thread {
}
public synchronized void notice(boolean spoken) {
- if (old_state != null && old_state.state != state.state) {
+ if (old_state != null && old_state.state() != state.state()) {
report_time = now();
this.notify();
} else if (spoken)
@@ -182,17 +178,17 @@ public class AltosDisplayThread extends Thread {
synchronized boolean tell() {
boolean ret = false;
- if (old_state == null || old_state.state != state.state) {
- if (state.state != AltosLib.ao_flight_stateless)
+ if (old_state == null || old_state.state() != state.state()) {
+ if (state.state() != AltosLib.ao_flight_stateless)
voice.speak(state.state_name());
- if ((old_state == null || old_state.state <= AltosLib.ao_flight_boost) &&
- state.state > AltosLib.ao_flight_boost) {
+ if ((old_state == null || old_state.state() <= AltosLib.ao_flight_boost) &&
+ state.state() > AltosLib.ao_flight_boost) {
if (state.max_speed() != AltosLib.MISSING)
voice.speak("max speed: %s.",
AltosConvert.speed.say_units(state.max_speed() + 0.5));
ret = true;
- } else if ((old_state == null || old_state.state < AltosLib.ao_flight_drogue) &&
- state.state >= AltosLib.ao_flight_drogue) {
+ } else if ((old_state == null || old_state.state() < AltosLib.ao_flight_drogue) &&
+ state.state() >= AltosLib.ao_flight_drogue) {
if (state.max_height() != AltosLib.MISSING)
voice.speak("max height: %s.",
AltosConvert.height.say_units(state.max_height() + 0.5));
diff --git a/altosuilib/AltosGraphDataPoint.java b/altosuilib/AltosGraphDataPoint.java
index 30d436ae..ce76e906 100644
--- a/altosuilib/AltosGraphDataPoint.java
+++ b/altosuilib/AltosGraphDataPoint.java
@@ -217,7 +217,7 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
public int id(int index) {
if (index == data_state) {
- int s = state.state;
+ int s = state.state();
if (AltosLib.ao_flight_boost <= s && s <= AltosLib.ao_flight_landed)
return s;
} else if (data_ignitor_fired_0 <= index && index <= data_ignitor_fired_max) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-04 02:50:03 +0000