diff options
Diffstat (limited to 'altoslib')
| -rw-r--r-- | altoslib/AltosConfigData.java | 1 | ||||
| -rw-r--r-- | altoslib/AltosLib.java | 18 |
2 files changed, 13 insertions, 6 deletions
diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java index c6e92e62..6f343639 100644 --- a/altoslib/AltosConfigData.java +++ b/altoslib/AltosConfigData.java @@ -167,6 +167,7 @@ public class AltosConfigData implements Iterable<String> { try { callsign = get_string(line, "Callsign:"); } catch (Exception e) {} try { version = get_string(line,"software-version"); } catch (Exception e) {} try { product = get_string(line,"product"); } catch (Exception e) {} + try { manufacturer = get_string(line,"manufacturer"); } catch (Exception e) {} try { get_int(line, "flight"); stored_flight++; } catch (Exception e) {} try { storage_size = get_int(line, "Storage size:"); } catch (Exception e) {} diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java index 8d383f12..192c445e 100644 --- a/altoslib/AltosLib.java +++ b/altoslib/AltosLib.java @@ -109,7 +109,7 @@ public class AltosLib { public static final int ao_telemetry_0_8 = 3; public static final int ao_telemetry_max = 3; - public static final String[] ao_telemetry_name = { + private static final String[] ao_telemetry_name = { "Off", "Standard Telemetry", "TeleMetrum v0.9", "TeleMetrum v0.8" }; @@ -119,13 +119,13 @@ public class AltosLib { public static final int ao_telemetry_0_9_len = 95; public static final int ao_telemetry_0_8_len = 94; - public static final int[] ao_telemetry_len = { + private static final int[] ao_telemetry_len = { 0, 32, 95, 94 }; - public static HashMap<String,Integer> string_to_state = new HashMap<String,Integer>(); + private static HashMap<String,Integer> string_to_state = new HashMap<String,Integer>(); - public static boolean map_initialized = false; + private static boolean map_initialized = false; public static void initialize_map() { @@ -157,7 +157,7 @@ public class AltosLib { telemetry)); } - public static String[] state_to_string = { + private static String[] state_to_string = { "startup", "idle", "pad", @@ -170,7 +170,7 @@ public class AltosLib { "invalid", }; - public static String[] state_to_string_capital = { + private static String[] state_to_string_capital = { "Startup", "Idle", "Pad", @@ -197,6 +197,12 @@ public class AltosLib { return state_to_string[state]; } + public static String state_name_capital(int state) { + if (state < 0 || state_to_string.length <= state) + return "invalid"; + return state_to_string_capital[state]; + } + public static final int AO_GPS_VALID = (1 << 4); public static final int AO_GPS_RUNNING = (1 << 5); public static final int AO_GPS_DATE_VALID = (1 << 6); |