altosui: Standard text field in flight UI needs more width (now 20)

[fw/altos] / altosui / Altos.java

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 9626379730a16f806170f487f1945047a7a35822..1acce9492a4c96b08bdbef5f8de6719f514be35e 100644 (file)
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -70,11 +70,23 @@ public class Altos {
 
        /* Telemetry modes */
        static final int ao_telemetry_off = 0;
-       static final int ao_telemetry_legacy = 1;
-       static final int ao_telemetry_split = 2;
+       static final int ao_telemetry_min = 1;
+       static final int ao_telemetry_standard = 1;
+       static final int ao_telemetry_0_9 = 2;
+       static final int ao_telemetry_0_8 = 3;
+       static final int ao_telemetry_max = 3;
+
+       static final String[] ao_telemetry_name = {
+               "Off", "Standard Telemetry", "TeleMetrum v0.9", "TeleMetrum v0.8"
+       };
+
+       static final int ao_telemetry_standard_len = 32;
+       static final int ao_telemetry_0_9_len = 95;
+       static final int ao_telemetry_0_8_len = 94;
 
-       static final int ao_telemetry_split_len = 32;
-       static final int ao_telemetry_legacy_len = 95;
+       static final int[] ao_telemetry_len = {
+               0, 32, 95, 94
+       };
 
        static HashMap<String,Integer>  string_to_state = new HashMap<String,Integer>();
 
@@ -86,7 +98,7 @@ public class Altos {
        static final Font value_font = new Font("Monospaced", Font.PLAIN, 22);
        static final Font status_font = new Font("SansSerif", Font.BOLD, 24);
 
-       static final int text_width = 16;
+       static final int text_width = 20;
 
        static void initialize_map()
        {
@@ -103,6 +115,20 @@ public class Altos {
                map_initialized = true;
        }
 
+       static int telemetry_len(int telemetry) {
+               if (telemetry <= ao_telemetry_max)
+                       return ao_telemetry_len[telemetry];
+               throw new IllegalArgumentException(String.format("Invalid telemetry %d",
+                                                                telemetry));
+       }
+
+       static String telemetry_name(int telemetry) {
+               if (telemetry <= ao_telemetry_max)
+                       return ao_telemetry_name[telemetry];
+               throw new IllegalArgumentException(String.format("Invalid telemetry %d",
+                                                                telemetry));
+       }
+       
        static String[] state_to_string = {
                "startup",
                "idle",