X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfig.java;h=9a44c1c5a273cd42dbf8c1e181371d3cf20cf4f6;hp=d5d7d56a337f7350c02fd58273dcbc18503a1cf1;hb=ef7f60df841f1eb22b9cec0d7f68cf2c003d6b30;hpb=dd383b86b9a13d7af2d6b07f4fb85ccc666ed898

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index d5d7d56a..9a44c1c5 100644
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -67,6 +67,7 @@ public class AltosConfig implements ActionListener {
 	AltosConfigData	remote_config_data;
 	double		remote_frequency;
 	int_ref		serial;
+	int_ref		log_format;
 	int_ref		main_deploy;
 	int_ref		apogee_delay;
 	int_ref		radio_channel;
@@ -75,6 +76,8 @@ public class AltosConfig implements ActionListener {
 	int_ref		ignite_mode;
 	int_ref		pad_orientation;
 	int_ref		radio_setting;
+	int_ref		storage_size;
+	int_ref		storage_erase_unit;
 	string_ref	version;
 	string_ref	product;
 	string_ref	callsign;
@@ -126,6 +129,15 @@ public class AltosConfig implements ActionListener {
 			serial_line.stop_remote();
 	}
 
+	int log_limit() {
+		if (storage_size.get() > 0 && storage_erase_unit.get() > 0) {
+			int	log_limit = storage_size.get() - storage_erase_unit.get();
+			if (log_limit > 0)
+				return log_limit / 1024;
+		}
+		return 1024;
+	}
+
 	void update_ui() {
 		config_ui.set_serial(serial.get());
 		config_ui.set_product(product.get());
@@ -134,6 +146,7 @@ public class AltosConfig implements ActionListener {
 		config_ui.set_apogee_delay(apogee_delay.get());
 		config_ui.set_radio_calibration(radio_calibration.get());
 		config_ui.set_radio_frequency(frequency());
+		config_ui.set_flight_log_max_limit(log_limit());
 		config_ui.set_flight_log_max(flight_log_max.get());
 		config_ui.set_ignite_mode(ignite_mode.get());
 		config_ui.set_pad_orientation(pad_orientation.get());
@@ -153,6 +166,7 @@ public class AltosConfig implements ActionListener {
 			return;
 		}
 		get_int(line, "serial-number", serial);
+		get_int(line, "log-format", log_format);
 		get_int(line, "Main deploy:", main_deploy);
 		get_int(line, "Apogee delay:", apogee_delay);
 		get_int(line, "Radio channel:", radio_channel);
@@ -161,6 +175,8 @@ public class AltosConfig implements ActionListener {
 		get_int(line, "Ignite mode:", ignite_mode);
 		get_int(line, "Pad orientation:", pad_orientation);
 		get_int(line, "Radio setting:", radio_setting);
+		get_int(line, "Storage size:", storage_size);
+		get_int(line, "Storage erase unit:", storage_erase_unit);
 		get_string(line, "Callsign:", callsign);
 		get_string(line,"software-version", version);
 		get_string(line,"product", product);
@@ -190,7 +206,7 @@ public class AltosConfig implements ActionListener {
 		void get_data() {
 			try {
 				config.start_serial();
-				config.serial_line.printf("c s\nv\n");
+				config.serial_line.printf("c s\nf\nv\n");
 				for (;;) {
 					try {
 						String line = config.serial_line.get_reply(5000);
@@ -228,9 +244,7 @@ public class AltosConfig implements ActionListener {
 								radio_calibration.get());
 				if (remote) {
 					serial_line.stop_remote();
-					serial_line.set_radio_frequency(frequency,
-									has_setting,
-									radio_calibration.get());
+					serial_line.set_radio_frequency(frequency);
 					AltosPreferences.set_frequency(device.getSerial(), frequency);
 					serial_line.start_remote();
 				}
@@ -320,8 +334,6 @@ public class AltosConfig implements ActionListener {
 	}
 
 	double frequency() {
-		System.out.printf("setting %d channel %d calibration %d\n",
-				  radio_setting.get(), radio_channel.get(), radio_calibration.get());
 		return AltosConvert.radio_to_frequency(radio_setting.get(),
 						       radio_calibration.get(),
 						       radio_channel.get());
@@ -340,13 +352,27 @@ public class AltosConfig implements ActionListener {
 	}
 
 	void save_data() {
+
+		/* bounds check stuff */
+		if (config_ui.flight_log_max() > log_limit()) {
+			JOptionPane.showMessageDialog(owner,
+						      String.format("Requested flight log, %dk, is larger than the available space, %dk.\n",
+								    config_ui.flight_log_max(),
+								    log_limit()),
+						      "Maximum Flight Log Too Large",
+						      JOptionPane.ERROR_MESSAGE);
+			return;
+		}
+
 		main_deploy.set(config_ui.main_deploy());
 		apogee_delay.set(config_ui.apogee_delay());
 		radio_calibration.set(config_ui.radio_calibration());
 		set_frequency(config_ui.radio_frequency());
 		flight_log_max.set(config_ui.flight_log_max());
-		ignite_mode.set(config_ui.ignite_mode());
-		pad_orientation.set(config_ui.pad_orientation());
+		if (ignite_mode.get() >= 0)
+			ignite_mode.set(config_ui.ignite_mode());
+		if (pad_orientation.get() >= 0)
+			pad_orientation.set(config_ui.pad_orientation());
 		callsign.set(config_ui.callsign());
 		run_serial_thread(serial_mode_save);
 	}
@@ -376,6 +402,7 @@ public class AltosConfig implements ActionListener {
 		owner = given_owner;
 
 		serial = new int_ref(0);
+		log_format = new int_ref(Altos.AO_LOG_FORMAT_UNKNOWN);
 		main_deploy = new int_ref(250);
 		apogee_delay = new int_ref(0);
 		radio_channel = new int_ref(0);
@@ -384,6 +411,8 @@ public class AltosConfig implements ActionListener {
 		flight_log_max = new int_ref(0);
 		ignite_mode = new int_ref(-1);
 		pad_orientation = new int_ref(-1);
+		storage_size = new int_ref(-1);
+		storage_erase_unit = new int_ref(-1);
 		callsign = new string_ref("N0CALL");
 		version = new string_ref("unknown");
 		product = new string_ref("unknown");