Switch from GPLv2 to GPLv2+

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

diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index b0d3e5417533ccf32e79e8fd905fc5b386d1d7b7..5dda1c85009094855eb7e15436ec64d6f0c73da9 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
@@ -223,6 +224,12 @@ _ao_config_get(void)
 #if HAS_APRS
                if (minor < 22)
                        ao_config.aprs_format = AO_CONFIG_DEFAULT_APRS_FORMAT;
+#endif
+#if HAS_FIXED_PAD_BOX
+               if (minor < 22)
+                       ao_config.pad_box = 1;
+               if (minor < 23)
+                       ao_config.pad_idle = 120;
 #endif
                ao_config.minor = AO_CONFIG_MINOR;
                ao_config_dirty = 1;
@@ -899,6 +906,42 @@ ao_config_aprs_format_show(void)
 }
 #endif /* HAS_APRS */
 
+#if HAS_FIXED_PAD_BOX
+void
+ao_config_pad_box_show(void)
+{
+       printf ("Pad box: %d\n", ao_config.pad_box);
+}
+
+void
+ao_config_pad_box_set(void)
+{
+       ao_cmd_decimal();
+       if (ao_cmd_status != ao_cmd_success)
+               return;
+       _ao_config_edit_start();
+       ao_config.pad_box = ao_cmd_lex_i;
+       _ao_config_edit_finish();
+}
+
+void
+ao_config_pad_idle_show(void)
+{
+       printf ("Idle timeout: %d\n", ao_config.pad_idle);
+}
+
+void
+ao_config_pad_idle_set(void)
+{
+       ao_cmd_decimal();
+       if (ao_cmd_status != ao_cmd_success)
+               return;
+       _ao_config_edit_start();
+       ao_config.pad_idle = ao_cmd_lex_i;
+       _ao_config_edit_finish();
+}
+#endif
+
 struct ao_config_var {
        __code char     *str;
        void            (*set)(void) __reentrant;
@@ -992,6 +1035,12 @@ __code struct ao_config_var ao_config_vars[] = {
          ao_config_aprs_ssid_set, ao_config_aprs_ssid_show },
        { "C <0 compressed, 1 uncompressed>\0APRS format",
          ao_config_aprs_format_set, ao_config_aprs_format_show },
+#endif
+#if HAS_FIXED_PAD_BOX
+       { "B <box>\0Set pad box (1-99)",
+         ao_config_pad_box_set, ao_config_pad_box_show },
+       { "i <seconds>\0Set idle timeout (0 disable)",
+         ao_config_pad_idle_set, ao_config_pad_idle_show },
 #endif
        { "s\0Show",
          ao_config_show,               0 },