diff options
Diffstat (limited to 'altosuilib')
| -rw-r--r-- | altosuilib/AltosInfoTable.java | 2 | ||||
| -rw-r--r-- | altosuilib/AltosUILib.java | 16 | ||||
| -rw-r--r-- | altosuilib/AltosUIPreferencesBackend.java | 8 |
3 files changed, 23 insertions, 3 deletions
diff --git a/altosuilib/AltosInfoTable.java b/altosuilib/AltosInfoTable.java index 625fe76f..91cc43bb 100644 --- a/altosuilib/AltosInfoTable.java +++ b/altosuilib/AltosInfoTable.java @@ -207,7 +207,7 @@ public class AltosInfoTable extends JTable implements AltosFlightDisplay, Hierar state.gps.climb_rate); if (state.gps.h_error != AltosLib.MISSING && state.gps.v_error != AltosLib.MISSING) - info_add_row(1, "GPS error", "%6d m(h)%3d m(v)", + info_add_row(1, "GPS error", "%6.0f m(h)%6.0f m(v)", state.gps.h_error, state.gps.v_error); if (state.gps.pdop != AltosLib.MISSING && state.gps.hdop != AltosLib.MISSING && diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java index 8fa7dfe6..ccadf07c 100644 --- a/altosuilib/AltosUILib.java +++ b/altosuilib/AltosUILib.java @@ -82,11 +82,23 @@ public class AltosUILib extends AltosLib { static public boolean loaded_library = false; static public boolean has_bluetooth = false; - static final String[] library_names = { "altos", "altos32", "altos64" }; + static final String[] library_names_32 = { "altos", "altos32", "altos64" }; + static final String[] library_names_64 = { "altos", "altos64", "altos32" }; public static boolean load_library() { if (!initialized) { - for (String name : library_names) { + String model = System.getProperty("sun.arch.data.model", "missing"); + boolean is_64 = false; + if (model.equals("64")) { + is_64 = true; + } else if (model.equals("32")) { + ; + } else { + String arch = System.getProperty("os.arch", "missing"); + if (arch.endsWith("64")) + is_64 = true; + } + for (String name : is_64 ? library_names_64 : library_names_32) { try { System.loadLibrary(name); libaltos.altos_init(); diff --git a/altosuilib/AltosUIPreferencesBackend.java b/altosuilib/AltosUIPreferencesBackend.java index 4048fd83..8d4431f1 100644 --- a/altosuilib/AltosUIPreferencesBackend.java +++ b/altosuilib/AltosUIPreferencesBackend.java @@ -62,6 +62,14 @@ public class AltosUIPreferencesBackend implements AltosPreferencesBackend { _preferences.putBoolean(key, value); } + public byte[] getBytes(String key, byte[] def) { + return _preferences.getByteArray(key, def); + } + + public void putBytes(String key, byte[] value) { + _preferences.putByteArray(key, value); + } + public boolean nodeExists(String key) { try { return _preferences.nodeExists(key); |