altosui: fix 'magic' string to signal end of config data

[fw/altos] / altosui / AltosConfig.java

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index b1e6bc12cf578f0ba51309b90774befbe19c5056..7cd8cb8b91f51e788a380f5126145a978864621f 100644 (file)
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -148,7 +148,17 @@ 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_enabled(stored_flight.get() < 0);
+               boolean max_enabled = true;
+               switch (log_format.get()) {
+               case Altos.AO_LOG_FORMAT_TINY:
+                       max_enabled = false;
+                       break;
+               default:
+                       if (stored_flight.get() >= 0)
+                               max_enabled = false;
+                       break;
+               }
+               config_ui.set_flight_log_max_enabled(max_enabled);
                config_ui.set_radio_enable(radio_enable.get());
                config_ui.set_flight_log_max_limit(log_limit());
                config_ui.set_flight_log_max(flight_log_max.get());
@@ -164,7 +174,7 @@ public class AltosConfig implements ActionListener {
                        abort();
                        return;
                }
-               if (line.equals("done")) {
+               if (line.equals("all finished")) {
                        if (serial_line != null)
                                update_ui();
                        return;
@@ -234,7 +244,7 @@ public class AltosConfig implements ActionListener {
                                } catch (InterruptedException ie) {
                                }
                        }
-                       callback("done");
+                       callback("all finished");
                }
 
                void save_data() {