Merge remote-tracking branch 'mjb/altoslib_mjb'

[fw/altos] / altoslib / AltosLib.java

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 8d383f1219498def39161c055dbe7c4e5b530073..192c445e0c42dabe2b9e3c42a209fe8843e9269c 100644 (file)
--- 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 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"
        };
 
                "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_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
        };
 
                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()
        {
 
        public static void initialize_map()
        {


@@ -157,7 +157,7 @@ public class AltosLib {
                                                                 telemetry));
        }
        
                                                                 telemetry));
        }
        

-       public static String[] state_to_string = {
+       private static String[] state_to_string = {

                "startup",
                "idle",
                "pad",
                "startup",
                "idle",
                "pad",


@@ -170,7 +170,7 @@ public class AltosLib {
                "invalid",
        };
 
                "invalid",
        };
 

-       public static String[] state_to_string_capital = {
+       private static String[] state_to_string_capital = {

                "Startup",
                "Idle",
                "Pad",
                "Startup",
                "Idle",
                "Pad",


@@ -197,6 +197,12 @@ public class AltosLib {
                return state_to_string[state];
        }
 
                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);
        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);