projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Oops. Was only filling out part of the TeleMetrum ADC record
[fw/altos]
/
altosui
/
AltosCompanionInfo.java
diff --git
a/altosui/AltosCompanionInfo.java
b/altosui/AltosCompanionInfo.java
index 82bde62355345da96feca7b7a1d27d57ef21e533..1f446700218827c64ff1ff6673df8cf1654f2156 100644
(file)
--- a/
altosui/AltosCompanionInfo.java
+++ b/
altosui/AltosCompanionInfo.java
@@
-18,15
+18,8
@@
package altosui;
import java.awt.*;
package altosui;
import java.awt.*;
-import java.awt.event.*;
import javax.swing.*;
import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
+import org.altusmetrum.altoslib_2.*;
public class AltosCompanionInfo extends JTable {
private AltosFlightInfoTableModel model;
public class AltosCompanionInfo extends JTable {
private AltosFlightInfoTableModel model;
@@
-77,24
+70,24
@@
public class AltosCompanionInfo extends JTable {
model.clear();
}
model.clear();
}
- Altos
RecordCompanion
companion;
+ Altos
Companion
companion;
public String board_name() {
if (companion == null)
return "None";
switch (companion.board_id) {
public String board_name() {
if (companion == null)
return "None";
switch (companion.board_id) {
- case Altos
Record
Companion.board_id_telescience:
+ case AltosCompanion.board_id_telescience:
return "TeleScience";
default:
return String.format("%02x\n", companion.board_id);
}
}
return "TeleScience";
default:
return String.format("%02x\n", companion.board_id);
}
}
- public void show(AltosState state,
int crc_errors
) {
+ public void show(AltosState state,
AltosListenerState listener_state
) {
if (state == null)
return;
if (state == null)
return;
- if (state.
data.
companion != null)
- companion = state.
data.
companion;
+ if (state.companion != null)
+ companion = state.companion;
info_reset();
info_add_row(0, "Companion board", "%s", board_name());
if (companion != null) {
info_reset();
info_add_row(0, "Companion board", "%s", board_name());
if (companion != null) {