X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConfigData.java;h=213d8f1311b56f35bf66469a898dacd8bea4a4f4;hp=99b8e39d2042e4279605294acafb6c223d72de5d;hb=eeacc001ba089b4bf5552b8ef36e61a0a96efabe;hpb=dfff41c2bec16fe4c7b198a4720eb40d8e740ac4

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 99b8e39d..213d8f13 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_3;
 
 import java.util.*;
 import java.text.*;
@@ -70,6 +70,9 @@ public class AltosConfigData implements Iterable<String> {
 	/* HAS_APRS */
 	public int		aprs_interval;
 
+	/* HAS_BEEP */
+	public int		beep;
+
 	/* Storage info replies */
 	public int	storage_size;
 	public int	storage_erase_unit;
@@ -116,15 +119,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];
@@ -194,9 +213,11 @@ public class AltosConfigData implements Iterable<String> {
 
 		aprs_interval = -1;
 
+		beep = -1;
+
 		storage_size = -1;
 		storage_erase_unit = -1;
-		stored_flight = -1;
+		stored_flight = 0;
 	}
 
 	public void parse_line(String line) {
@@ -270,9 +291,12 @@ public class AltosConfigData implements Iterable<String> {
 		/* HAS_APRS */
 		try { aprs_interval = get_int(line, "APRS interval:"); } catch (Exception e) {}
 
+		/* HAS_BEEP */
+		try { beep = get_int(line, "Beeper setting:"); } catch (Exception e) {}
+
 		/* 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) {}
@@ -320,6 +344,10 @@ public class AltosConfigData implements Iterable<String> {
 	public double frequency() {
 		int	channel = radio_channel;
 		int	setting = radio_setting;
+
+		if (radio_frequency < 0 && channel < 0 && setting < 0)
+			return -1;
+
 		if (channel < 0)
 			channel = 0;
 		if (setting < 0)
@@ -331,9 +359,22 @@ public class AltosConfigData implements Iterable<String> {
 						       channel);
 	}
 
+	boolean use_flash_for_config() {
+		if (product.startsWith("TeleMega"))
+			return false;
+		if (product.startsWith("TeleMetrum-v2"))
+			return false;
+		return true;
+	}
+
+
 	public int log_limit() {
-		if (storage_size > 0 && storage_erase_unit > 0) {
-			int	log_limit = storage_size - storage_erase_unit;
+		if (storage_size > 0) {
+			int	log_limit = storage_size;
+
+			if (storage_erase_unit > 0 && use_flash_for_config())
+				log_limit -= storage_erase_unit;
+
 			if (log_limit > 0)
 				return log_limit / 1024;
 		}
@@ -376,8 +417,13 @@ public class AltosConfigData implements Iterable<String> {
 		if (npyro > 0)
 			pyros = source.pyros();
 
+		/* HAS_APRS */
 		if (aprs_interval >= 0)
 			aprs_interval = source.aprs_interval();
+
+		/* HAS_BEEP */
+		if (beep >= 0)
+			beep = source.beep();
 	}
 
 	public void set_values(AltosConfigValues dest) {
@@ -390,15 +436,20 @@ public class AltosConfigData implements Iterable<String> {
 		dest.set_radio_calibration(radio_calibration);
 		dest.set_radio_frequency(frequency());
 		boolean max_enabled = true;
+
+		if (log_limit() == 0)
+			max_enabled = false;
+
 		switch (log_format) {
 		case AltosLib.AO_LOG_FORMAT_TINY:
 			max_enabled = false;
 			break;
 		default:
-			if (stored_flight >= 0)
+			if (stored_flight > 0)
 				max_enabled = false;
 			break;
 		}
+
 		dest.set_flight_log_max_enabled(max_enabled);
 		dest.set_radio_enable(radio_enable);
 		dest.set_flight_log_max_limit(log_limit());
@@ -411,6 +462,7 @@ public class AltosConfigData implements Iterable<String> {
 		else
 			dest.set_pyros(null);
 		dest.set_aprs_interval(aprs_interval);
+		dest.set_beep(beep);
 	}
 
 	public void save(AltosLink link, boolean remote) throws InterruptedException, TimeoutException {
@@ -466,7 +518,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());
@@ -477,6 +529,10 @@ public class AltosConfigData implements Iterable<String> {
 		if (aprs_interval >= 0)
 			link.printf("c A %d\n", aprs_interval);
 
+		/* HAS_BEEP */
+		if (beep >= 0)
+			link.printf("c b %d\n", beep);
+
 		link.printf("c w\n");
 		link.flush_output();
 	}
@@ -485,11 +541,10 @@ 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:
-		case AltosLib.AO_LOG_FORMAT_MEGAMETRUM:
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA:
 			link.printf("l\n");
 			read_link(link, "done");
 		default: