altos: Simplify tracker logic, removing boost detect

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

diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index 4482f673f59c0fdbbe132f0c52bcd89d1095a762..71445335a7a39901c98b91c4346f1cbd1e6686e1 100644 (file)
--- a/src/kernel/ao_config.c
+++ b/src/kernel/ao_config.c
@@ -22,6 +22,12 @@
 #include <ao_sample.h>
 #include <ao_data.h>
 #endif
+#if HAS_BEEP
+#include <ao_beep.h>
+#endif
+#if HAS_TRACKER
+#include <ao_tracker.h>
+#endif
 
 __xdata struct ao_config ao_config;
 __pdata uint8_t ao_config_loaded;
@@ -38,6 +44,7 @@ __xdata uint8_t ao_config_mutex;
 #define AO_CONFIG_DEFAULT_APOGEE_DELAY 0
 #define AO_CONFIG_DEFAULT_IGNITE_MODE  AO_IGNITE_MODE_DUAL
 #define AO_CONFIG_DEFAULT_PAD_ORIENTATION      AO_PAD_ORIENTATION_ANTENNA_UP
+#define AO_CONFIG_DEFAULT_PYRO_TIME    AO_MS_TO_TICKS(50)
 #if HAS_EEPROM
 #ifndef USE_INTERNAL_FLASH
 #error Please define USE_INTERNAL_FLASH
@@ -127,7 +134,7 @@ _ao_config_get(void)
                        ao_config.radio_cal = ao_radio_cal;
 #endif
                /* Fixups for minor version 4 */
-#if HAS_FLIGHT
+#if HAS_LOG
                if (minor < 4)
                        ao_config.flight_log_max = AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX;
 #endif
@@ -170,6 +177,20 @@ _ao_config_get(void)
                        ao_config.accel_plus_g = 0;
                        ao_config.accel_minus_g = 0;
                }
+#endif
+#if HAS_BEEP_CONFIG
+               if (minor < 16)
+                       ao_config.mid_beep = AO_BEEP_MID_DEFAULT;
+#endif
+#if HAS_TRACKER
+               if (minor < 17) {
+                       ao_config.tracker_motion = AO_TRACKER_MOTION_DEFAULT;
+                       ao_config.tracker_interval = AO_TRACKER_INTERVAL_DEFAULT;
+               }
+#endif
+#if AO_PYRO_NUM
+               if (minor < 18)
+                       ao_config.pyro_time = AO_CONFIG_DEFAULT_PYRO_TIME;
 #endif
                ao_config.minor = AO_CONFIG_MINOR;
                ao_config_dirty = 1;
@@ -357,7 +378,7 @@ ao_config_accel_calibrate_set(void) __reentrant
        int16_t accel_across_up = 0, accel_across_down = 0;
        int16_t accel_through_up = 0, accel_through_down = 0;
 #endif
-       
+
        ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
@@ -555,7 +576,7 @@ ao_config_radio_enable_set(void) __reentrant
        _ao_config_edit_finish();
 }
 #endif /* HAS_RADIO */
-       
+
 #if HAS_AES
 
 __xdata uint8_t        ao_config_aes_seq = 1;
@@ -650,6 +671,72 @@ ao_config_radio_power_set(void)
 
 #endif
 
+#if HAS_BEEP_CONFIG
+void
+ao_config_beep_show(void)
+{
+       printf ("Beeper setting: %d\n", ao_config.mid_beep);
+}
+
+void
+ao_config_beep_set(void)
+{
+       ao_cmd_decimal();
+       if (ao_cmd_status != ao_cmd_success)
+               return;
+       _ao_config_edit_start();
+       ao_config.mid_beep = ao_cmd_lex_i;
+       _ao_config_edit_finish();
+}
+#endif
+
+#if HAS_TRACKER
+void
+ao_config_tracker_show(void)
+{
+       printf ("Tracker setting: %d %d\n",
+               ao_config.tracker_motion,
+               ao_config.tracker_interval);
+}
+
+void
+ao_config_tracker_set(void)
+{
+       uint16_t        m, i;
+       ao_cmd_decimal();
+       if (ao_cmd_status != ao_cmd_success)
+               return;
+       m = ao_cmd_lex_i;
+       ao_cmd_decimal();
+       if (ao_cmd_status != ao_cmd_success)
+               return;
+       i = ao_cmd_lex_i;
+       _ao_config_edit_start();
+       ao_config.tracker_motion = m;
+       ao_config.tracker_interval = i;
+       _ao_config_edit_finish();
+}
+#endif /* HAS_TRACKER */
+
+#if AO_PYRO_NUM
+void
+ao_config_pyro_time_show(void)
+{
+       printf ("Pyro time: %d\n", ao_config.pyro_time);
+}
+
+void
+ao_config_pyro_time_set(void)
+{
+       ao_cmd_decimal();
+       if (ao_cmd_status != ao_cmd_success)
+               return;
+       _ao_config_edit_start();
+       ao_config.pyro_time = ao_cmd_lex_i;
+       _ao_config_edit_finish();
+}
+#endif
+
 struct ao_config_var {
        __code char     *str;
        void            (*set)(void) __reentrant;
@@ -697,7 +784,7 @@ __code struct ao_config_var ao_config_vars[] = {
 #if HAS_ACCEL
        { "a <+g> <-g>\0Accel calib (0 for auto)",
          ao_config_accel_calibrate_set,ao_config_accel_calibrate_show },
-       { "o <0 antenna up, 1 antenna down>\0Set pad orientation",
+       { "o <0 antenna up, 1 antenna down>\0Pad orientation",
          ao_config_pad_orientation_set,ao_config_pad_orientation_show },
 #endif /* HAS_ACCEL */
 #if HAS_LOG
@@ -705,20 +792,30 @@ __code struct ao_config_var ao_config_vars[] = {
          ao_config_log_set,            ao_config_log_show },
 #endif
 #if HAS_IGNITE
-       { "i <0 dual, 1 apogee, 2 main>\0Set igniter mode",
+       { "i <0 dual, 1 apogee, 2 main>\0Igniter mode",
          ao_config_ignite_mode_set,    ao_config_ignite_mode_show },
 #endif
 #if HAS_AES
-       { "k <32 hex digits>\0Set AES encryption key",
+       { "k <32 hex digits>\0AES encryption key",
          ao_config_key_set, ao_config_key_show },
 #endif
 #if AO_PYRO_NUM
-       { "P <n,?>\0Configure pyro channels",
+       { "P <n,?>\0Pyro channels",
          ao_pyro_set, ao_pyro_show },
+       { "I <ticks>\0Pyro firing time",
+         ao_config_pyro_time_set, ao_config_pyro_time_show },
 #endif
 #if HAS_APRS
        { "A <secs>\0APRS packet interval (0 disable)",
          ao_config_aprs_set, ao_config_aprs_show },
+#endif
+#if HAS_BEEP_CONFIG
+       { "b <val>\0Beeper tone (freq = 1/2 (24e6/32) / beep",
+         ao_config_beep_set, ao_config_beep_show },
+#endif
+#if HAS_TRACKER
+       { "t <motion> <interval>\0Tracker configuration",
+         ao_config_tracker_set, ao_config_tracker_show },
 #endif
        { "s\0Show",
          ao_config_show,               0 },