altosui: Radio channel gets set to zero by altos when frequency is set

[fw/altos] / altosui / AltosConfig.java

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index 84261ec7a5523753f00387835beadb0da261d719..bb2665c2876eb7c1af9332614557fa47920f965e 100644 (file)
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -194,7 +194,9 @@ 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, "Frequency:", radio_frequency);
+               if (get_int(line, "Frequency:", radio_frequency))
+                       if (radio_frequency.get() < 0)
+                               radio_frequency.set(434550);
                get_int(line, "Radio enable:", radio_enable);
                get_int(line, "Storage size:", storage_size);
                get_int(line, "Storage erase unit:", storage_erase_unit);
@@ -395,6 +397,7 @@ public class AltosConfig implements ActionListener {
 
                if (frequency > 0) {
                        radio_frequency.set((int) Math.floor (freq * 1000 + 0.5));
+                       radio_channel.set(0);
                } else if (setting > 0) {
                        radio_setting.set(AltosConvert.radio_frequency_to_setting(freq,
                                                                                  radio_calibration.get()));