altosui: Adjust max log setting for storage block size

[fw/altos] / altosui / AltosConfigFCUI.java

diff --git a/altosui/AltosConfigFCUI.java b/altosui/AltosConfigFCUI.java
index 624c7246d91cdcca18e44266127c171872c2b34a..b7dc70bf4cb9d1aa6d0fbca9456b63e08e885932 100644 (file)
--- a/altosui/AltosConfigFCUI.java
+++ b/altosui/AltosConfigFCUI.java
@@ -46,6 +46,7 @@ public class AltosConfigFCUI
        JLabel                  aprs_interval_label;
        JLabel                  aprs_ssid_label;
        JLabel                  aprs_format_label;
+       JLabel                  aprs_offset_label;
        JLabel                  flight_log_max_label;
        JLabel                  ignite_mode_label;
        JLabel                  pad_orientation_label;
@@ -72,6 +73,7 @@ public class AltosConfigFCUI
        JComboBox<String>       aprs_interval_value;
        JComboBox<Integer>      aprs_ssid_value;
        JComboBox<String>       aprs_format_value;
+       JComboBox<Integer>      aprs_offset_value;
        JComboBox<String>       flight_log_max_value;
        JComboBox<String>       ignite_mode_value;
        JComboBox<String>       pad_orientation_value;
@@ -130,6 +132,10 @@ public class AltosConfigFCUI
                0, 1, 2 ,3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
        };
 
+       static Integer[]        aprs_offset_values = {
+               0, 2, 4, 6, 8, 10, 12, 14, 16, 18
+       };
+
        static String[]         beep_values = {
                "3750",
                "4000",
@@ -236,6 +242,15 @@ public class AltosConfigFCUI
                        aprs_format_value.setToolTipText("Hardware doesn't support APRS");
        }
 
+       void set_aprs_offset_tool_tip() {
+               if (aprs_offset_value.isVisible())
+                       aprs_offset_value.setToolTipText("Set the APRS offset from top of minute");
+               else if (aprs_offset_value.isVisible())
+                       aprs_offset_value.setToolTipText("Software version doesn't support setting the APRS offset");
+               else
+                       aprs_offset_value.setToolTipText("Hardware doesn't support APRS");
+       }
+
        void set_flight_log_max_tool_tip() {
                if (flight_log_max_value.isVisible())
                        flight_log_max_value.setToolTipText("Size reserved for each flight log (in kB)");
@@ -621,6 +636,33 @@ public class AltosConfigFCUI
                set_aprs_format_tool_tip();
                row++;
 
+               /* APRS offset */
+               c = new GridBagConstraints();
+               c.gridx = 0; c.gridy = row;
+               c.gridwidth = 4;
+               c.fill = GridBagConstraints.NONE;
+               c.anchor = GridBagConstraints.LINE_START;
+               c.insets = il;
+               c.ipady = 5;
+               aprs_offset_label = new JLabel("APRS offset:");
+               pane.add(aprs_offset_label, c);
+
+               c = new GridBagConstraints();
+               c.gridx = 4; c.gridy = row;
+               c.gridwidth = 4;
+               c.fill = GridBagConstraints.HORIZONTAL;
+               c.weightx = 1;
+               c.anchor = GridBagConstraints.LINE_START;
+               c.insets = ir;
+               c.ipady = 5;
+               aprs_offset_value = new JComboBox<Integer>(aprs_offset_values);
+               aprs_offset_value.setEditable(false);
+               aprs_offset_value.addItemListener(this);
+               aprs_offset_value.setMaximumRowCount(aprs_offset_values.length);
+               pane.add(aprs_offset_value, c);
+               set_aprs_offset_tool_tip();
+               row++;
+
                /* Callsign */
                c = new GridBagConstraints();
                c.gridx = 0; c.gridy = row;
@@ -1229,16 +1271,18 @@ public class AltosConfigFCUI
                return AltosLib.MISSING;
        }
 
-       public void set_flight_log_max_limit(int new_flight_log_max_limit) {
+       public void set_flight_log_max_limit(int new_flight_log_max_limit, int new_storage_erase_unit) {
                flight_log_max_limit = new_flight_log_max_limit;
                if (new_flight_log_max_limit != AltosLib.MISSING) {
                        flight_log_max_value.removeAllItems();
                        for (int i = 8; i >= 1; i--) {
                                int     size = flight_log_max_limit / i;
+                               if (new_storage_erase_unit != 0)
+                                       size &= ~(new_storage_erase_unit - 1);
                                flight_log_max_value.addItem(String.format("%d (%d flights)", size, i));
                        }
                }
-               if (flight_log_max != 0)
+               if (flight_log_max != 0 && flight_log_max != AltosLib.MISSING)
                        set_flight_log_max(flight_log_max);
        }
 
@@ -1482,4 +1526,20 @@ public class AltosConfigFCUI
                        return aprs_format_value.getSelectedIndex();
                return AltosLib.MISSING;
        }
+
+       public void set_aprs_offset(int new_aprs_offset) {
+               if (new_aprs_offset != AltosLib.MISSING)
+                       aprs_offset_value.setSelectedItem(new_aprs_offset);
+               aprs_offset_value.setVisible(new_aprs_offset != AltosLib.MISSING);
+               aprs_offset_label.setVisible(new_aprs_offset != AltosLib.MISSING);
+               set_aprs_offset_tool_tip();
+       }
+
+       public int aprs_offset() throws AltosConfigDataException {
+               if (aprs_offset_value.isVisible()) {
+                       Integer i = (Integer) aprs_offset_value.getSelectedItem();
+                       return i;
+               }
+               return AltosLib.MISSING;
+       }
 }