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 b4847cddf9327e696579f1bf3e3e341567795a33..71445335a7a39901c98b91c4346f1cbd1e6686e1 100644 (file)
--- a/src/kernel/ao_config.c
+++ b/src/kernel/ao_config.c
@@ -44,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
@@ -183,9 +184,13 @@ _ao_config_get(void)
 #endif
 #if HAS_TRACKER
                if (minor < 17) {
-                       ao_config.tracker_start_horiz = AO_CONFIG_DEFAULT_TRACKER_START_HORIZ;
-                       ao_config.tracker_start_vert = AO_CONFIG_DEFAULT_TRACKER_START_VERT;
+                       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;
@@ -690,29 +695,48 @@ void
 ao_config_tracker_show(void)
 {
        printf ("Tracker setting: %d %d\n",
-               ao_config.tracker_start_horiz,
-               ao_config.tracker_start_vert);
+               ao_config.tracker_motion,
+               ao_config.tracker_interval);
 }
 
 void
 ao_config_tracker_set(void)
 {
-       uint16_t        h, v;
+       uint16_t        m, i;
        ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
-       h = ao_cmd_lex_i;
+       m = ao_cmd_lex_i;
        ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
-       v = ao_cmd_lex_i;
+       i = ao_cmd_lex_i;
        _ao_config_edit_start();
-       ao_config.tracker_start_horiz = h;
-       ao_config.tracker_start_vert = v;
+       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;
@@ -778,6 +802,8 @@ __code struct ao_config_var ao_config_vars[] = {
 #if AO_PYRO_NUM
        { "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)",
@@ -788,7 +814,7 @@ __code struct ao_config_var ao_config_vars[] = {
          ao_config_beep_set, ao_config_beep_show },
 #endif
 #if HAS_TRACKER
-       { "t <horiz> <vert>\0Tracker start trigger distances",
+       { "t <motion> <interval>\0Tracker configuration",
          ao_config_tracker_set, ao_config_tracker_show },
 #endif
        { "s\0Show",