X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosLib.java;h=2e9dc6486a1907f2dc7027de20f3157adba84556;hb=b97a125a9f8bd9619833647a9b6aa6329103e136;hp=68bdd17fdcbe95621842963f29ad5dbe67e42f78;hpb=4828be0ca5252ac9cd6061209385dcd6c4c57965;p=fw%2Faltos

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 68bdd17f..2e9dc648 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -112,6 +112,7 @@ public class AltosLib {
 	public final static int product_telegps = 0x0025;
 	public final static int product_easymini = 0x0026;
 	public final static int product_telemini = 0x0027;
+	public final static int product_easymega = 0x0028;
 	public final static int product_altusmetrum_min = 0x000a;
 	public final static int product_altusmetrum_max = 0x002c;
 
@@ -143,7 +144,8 @@ public class AltosLib {
 		new Product("megadongle", product_megadongle),
 		new Product("telegps", product_telegps),
 		new Product("easymini", product_easymini),
-		new Product("telemini", product_telemini)
+		new Product("telemini", product_telemini),
+		new Product("easymega", product_easymega)
 	};
 
 	public static int name_to_product(String name) {
@@ -329,7 +331,7 @@ public class AltosLib {
 		return false;
 	}
 
-	public static boolean ishex(int c) {
+	public static final boolean ishex(int c) {
 		if ('0' <= c && c <= '9')
 			return true;
 		if ('a' <= c && c <= 'f')
@@ -339,7 +341,7 @@ public class AltosLib {
 		return false;
 	}
 
-	public static boolean ishex(String s) {
+	public static final boolean ishex(String s) {
 		for (int i = 0; i < s.length(); i++)
 			if (!ishex(s.charAt(i)))
 				return false;
@@ -463,10 +465,17 @@ public class AltosLib {
 
 		if ((s.length() & 1) != 0)
 			throw new NumberFormatException(String.format("invalid line \"%s\"", s));
-		n = s.length() / 2;
+		byte[] bytes = s.getBytes(unicode_set);
+		n = bytes.length / 2;
 		r = new int[n];
-		for (i = 0; i < n; i++)
-			r[i] = hexbyte(s, i * 2);
+		for (i = 0; i < n; i++) {
+			int h = fromhex(bytes[(i << 1)]);
+			int l = fromhex(bytes[(i << 1) + 1]);
+			if (h < 0 || l < 0)
+				throw new NumberFormatException(String.format("invalid hex \"%c%c\"",
+									      bytes[(i<<1)], bytes[(i<<1) + 1]));
+			r[i] = (h << 4) + l;
+		}
 		return r;
 	}