X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConfigData.java;h=5760560762bebdca7082dd1493a48697a955d338;hb=c6f85cb149dff8732104521cb62b355e8a0d7148;hp=24ab255602b2afe2cf22baf9db3cc873aca67b2f;hpb=8d1d8d2a3c129cdbd55427bcda0f26715b02f1ee;p=fw%2Faltos

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 24ab2556..57605607 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -116,15 +116,31 @@ public class AltosConfigData implements Iterable<String> {
 		default:
 			if (flight_log_max <= 0)
 				return 1;
+			int	log_max = flight_log_max * 1024;
 			int	log_space = storage_size - storage_erase_unit;
-			int	log_used = stored_flight * flight_log_max;
+			int	log_used;
+
+			if (stored_flight <= 0)
+				log_used = 0;
+			else
+				log_used = stored_flight * log_max;
+			int	log_avail;
 
 			if (log_used >= log_space)
-				return 0;
-			return (log_space - log_used) / flight_log_max;
+				log_avail = 0;
+			else
+				log_avail = (log_space - log_used) / log_max;
+
+			return log_avail;
 		}
 	}
 
+	public boolean has_monitor_battery() {
+		if (product.startsWith("TeleBT"))
+			return true;
+		return false;
+	}
+
 	int[] parse_version(String v) {
 		String[] parts = v.split("\\.");
 		int r[] = new int[parts.length];
@@ -196,7 +212,7 @@ public class AltosConfigData implements Iterable<String> {
 
 		storage_size = -1;
 		storage_erase_unit = -1;
-		stored_flight = -1;
+		stored_flight = 0;
 	}
 
 	public void parse_line(String line) {
@@ -272,7 +288,7 @@ public class AltosConfigData implements Iterable<String> {
 
 		/* Storage info replies */
 		try { storage_size = get_int(line, "Storage size:"); } catch (Exception e) {}
-		try { storage_erase_unit = get_int(line, "Storage erase unit"); } catch (Exception e) {}
+		try { storage_erase_unit = get_int(line, "Storage erase unit:"); } catch (Exception e) {}
 
 		/* Log listing replies */
 		try { get_int(line, "flight"); stored_flight++; }  catch (Exception e) {}
@@ -466,7 +482,7 @@ public class AltosConfigData implements Iterable<String> {
 		/* UI doesn't support AES key config */
 
 		/* AO_PYRO_NUM */
-		if (pyros.length > 0) {
+		if (npyro > 0) {
 			for (int p = 0; p < pyros.length; p++) {
 				link.printf("c P %s\n",
 						   pyros[p].toString());
@@ -485,7 +501,6 @@ public class AltosConfigData implements Iterable<String> {
 		reset();
 		link.printf("c s\nf\nv\n");
 		read_link(link, "software-version");
-		System.out.printf("Log format %d\n", log_format);
 		switch (log_format) {
 		case AltosLib.AO_LOG_FORMAT_FULL:
 		case AltosLib.AO_LOG_FORMAT_TINY: