X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosLib.java;h=c25a6273136c095b5b945fe71946631a7d393b25;hp=6c1729dfc03a32a51f64f3d8fbf2eabf092ec652;hb=57218127ee39724e985fefcf203991401f01cc84;hpb=da914cd72411af8c36af05b13c11b9093c8a378c

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 6c1729df..c25a6273 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.util.*;
 import java.io.*;
@@ -354,7 +354,7 @@ public class AltosLib {
 	public static final int AO_LOG_FORMAT_TELEMETRY = 3;
 	public static final int AO_LOG_FORMAT_TELESCIENCE = 4;
 	public static final int AO_LOG_FORMAT_TELEMEGA_OLD = 5;
-	public static final int AO_LOG_FORMAT_EASYMINI = 6;
+	public static final int AO_LOG_FORMAT_EASYMINI1 = 6;
 	public static final int AO_LOG_FORMAT_TELEMETRUM = 7;
 	public static final int AO_LOG_FORMAT_TELEMINI2 = 8;
 	public static final int AO_LOG_FORMAT_TELEGPS = 9;
@@ -362,6 +362,8 @@ public class AltosLib {
 	public static final int AO_LOG_FORMAT_DETHERM = 11;
 	public static final int AO_LOG_FORMAT_TELEMINI3 = 12;
 	public static final int AO_LOG_FORMAT_TELEFIRETWO = 13;
+	public static final int AO_LOG_FORMAT_EASYMINI2 = 14;
+	public static final int AO_LOG_FORMAT_TELEMEGA_3 = 15;
 	public static final int AO_LOG_FORMAT_NONE = 127;
 
 	public static boolean isspace(int c) {
@@ -586,7 +588,11 @@ public class AltosLib {
 	}
 
 	public static String igniter_name(int i) {
-		return String.format("Ignitor %c", 'A' + i);
+		return String.format("Igniter %c", 'A' + i);
+	}
+
+	public static String igniter_short_name(int i) {
+		return String.format("igniter_%c", 'a' + i);
 	}
 
 	public static AltosRecordSet record_set(File file) throws FileNotFoundException, IOException {