altos: Remove *_TO_DATA macros

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

diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index 8dab7c42ad4ae06366f1364d1e7013aca1fd75a2..10a67116ac1d4eea5868763d66f8a9c82aa3b6cc 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
@@ -130,7 +135,7 @@ _ao_config_get(void)
                /* Version 0 stuff */
                ao_config.main_deploy = AO_CONFIG_DEFAULT_MAIN_DEPLOY;
                ao_xmemset(&ao_config.callsign, '\0', sizeof (ao_config.callsign));
-               ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN),
+               ao_xmemcpy(&ao_config.callsign, AO_CONFIG_DEFAULT_CALLSIGN,
                       sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
                ao_config._legacy_radio_channel = 0;
        }
@@ -219,6 +224,16 @@ _ao_config_get(void)
 #if HAS_RADIO_FORWARD
                if (minor < 21)
                        ao_config.send_frequency = 434550;
+#endif
+#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;
@@ -228,7 +243,10 @@ _ao_config_get(void)
        if (ao_force_freq) {
                ao_config.frequency = 434550;
                ao_config.radio_cal = ao_radio_cal;
-               ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN),
+#if HAS_RADIO_RATE
+               ao_config.radio_rate = AO_CONFIG_DEFAULT_RADIO_RATE;
+#endif
+               ao_xmemcpy(&ao_config.callsign, AO_CONFIG_DEFAULT_CALLSIGN,
                       sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
        }
 #endif
@@ -403,7 +421,7 @@ ao_config_accel_calibrate_auto(char *orientation) __reentrant
        accel_total = 0;
        cal_data_ring = ao_sample_data;
        while (i) {
-               ao_sleep(DATA_TO_XDATA(&ao_sample_data));
+               ao_sleep(&ao_sample_data);
                while (i && cal_data_ring != ao_sample_data) {
                        accel_total += (int32_t) ao_data_accel(&ao_data_ring[cal_data_ring]);
 #if HAS_GYRO
@@ -876,8 +894,61 @@ ao_config_aprs_ssid_set(void)
        ao_config.aprs_ssid = ao_cmd_lex_i;
        _ao_config_edit_finish();
 }
+
+void
+ao_config_aprs_format_set(void)
+{
+       ao_cmd_decimal();
+       if (ao_cmd_status != ao_cmd_success)
+               return;
+       _ao_config_edit_start();
+       ao_config.aprs_format = ao_cmd_lex_i != 0;
+       _ao_config_edit_finish();
+}
+
+void
+ao_config_aprs_format_show(void)
+{
+       printf ("APRS format: %d\n", ao_config.aprs_format);
+}
 #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;
@@ -969,6 +1040,14 @@ __code struct ao_config_var ao_config_vars[] = {
 #if HAS_APRS
        { "S <ssid>\0Set APRS SSID (0-15)",
          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 },