telelco-v0.2: Make config.pad_box override switches

[fw/altos] / src / kernel / ao_config.c

diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index f95ca8933cc3f526c15a9c7d2acf2d7efea4f9c4..cfcad5bc74cf10015bbd8b63606b8bc1913bccf1 100644 (file)
--- a/src/kernel/ao_config.c
+++ b/src/kernel/ao_config.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,6 +35,10 @@ __pdata uint8_t ao_config_loaded;
 __pdata uint8_t ao_config_dirty;
 __xdata uint8_t ao_config_mutex;
 
+#if HAS_FORCE_FREQ
+__xdata uint8_t ao_force_freq;
+#endif
+
 #ifndef AO_CONFIG_DEFAULT_APRS_INTERVAL
 #define AO_CONFIG_DEFAULT_APRS_INTERVAL        0
 #endif
@@ -224,9 +229,14 @@ _ao_config_get(void)
                if (minor < 22)
                        ao_config.aprs_format = AO_CONFIG_DEFAULT_APRS_FORMAT;
 #endif
+#if HAS_PAD
+               if (minor < 22) {
 #if HAS_FIXED_PAD_BOX
-               if (minor < 22)
                        ao_config.pad_box = 1;
+#else
+                       ao_config.pad_box = 0;
+#endif
+               }
                if (minor < 23)
                        ao_config.pad_idle = 120;
 #endif
@@ -238,6 +248,9 @@ _ao_config_get(void)
        if (ao_force_freq) {
                ao_config.frequency = 434550;
                ao_config.radio_cal = ao_radio_cal;
+#if HAS_RADIO_RATE
+               ao_config.radio_rate = AO_CONFIG_DEFAULT_RADIO_RATE;
+#endif
                ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN),
                       sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
        }
@@ -905,7 +918,7 @@ ao_config_aprs_format_show(void)
 }
 #endif /* HAS_APRS */
 
-#if HAS_FIXED_PAD_BOX
+#if HAS_PAD
 void
 ao_config_pad_box_show(void)
 {
@@ -1035,7 +1048,7 @@ __code struct ao_config_var ao_config_vars[] = {
        { "C <0 compressed, 1 uncompressed>\0APRS format",
          ao_config_aprs_format_set, ao_config_aprs_format_show },
 #endif
-#if HAS_FIXED_PAD_BOX
+#if HAS_PAD
        { "B <box>\0Set pad box (1-99)",
          ao_config_pad_box_set, ao_config_pad_box_show },
        { "i <seconds>\0Set idle timeout (0 disable)",