projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Remove *_TO_DATA macros
[fw/altos]
/
src
/
kernel
/
ao_flight.c
diff --git
a/src/kernel/ao_flight.c
b/src/kernel/ao_flight.c
index b0d911ed7f2663ac5b820cc0146d4944da9d2d85..170396ff160ab41473f656d8b125d9b8f593b623 100644
(file)
--- a/
src/kernel/ao_flight.c
+++ b/
src/kernel/ao_flight.c
@@
-21,7
+21,7
@@
#include <ao_log.h>
#endif
#include <ao_log.h>
#endif
-#if HAS_MPU6000
+#if HAS_MPU6000
|| HAS_MPU9250
#include <ao_quaternion.h>
#endif
#include <ao_quaternion.h>
#endif
@@
-48,7
+48,8
@@
/* Main flight thread. */
__pdata enum ao_flight_state ao_flight_state; /* current flight state */
/* Main flight thread. */
__pdata enum ao_flight_state ao_flight_state; /* current flight state */
-__pdata uint16_t ao_boost_tick; /* time of launch detect */
+__pdata uint16_t ao_boost_tick; /* time of most recent boost detect */
+__pdata uint16_t ao_launch_tick; /* time of first boost detect */
__pdata uint16_t ao_motor_number; /* number of motors burned so far */
#if HAS_SENSOR_ERRORS
__pdata uint16_t ao_motor_number; /* number of motors burned so far */
#if HAS_SENSOR_ERRORS
@@
-174,7
+175,7
@@
ao_flight(void)
#endif
}
/* wakeup threads due to state change */
#endif
}
/* wakeup threads due to state change */
- ao_wakeup(
DATA_TO_XDATA(&ao_flight_state)
);
+ ao_wakeup(
&ao_flight_state
);
break;
case ao_flight_pad:
break;
case ao_flight_pad:
@@
-199,7
+200,7
@@
ao_flight(void)
)
{
ao_flight_state = ao_flight_boost;
)
{
ao_flight_state = ao_flight_boost;
- ao_boost_tick = ao_sample_tick;
+ ao_
launch_tick = ao_
boost_tick = ao_sample_tick;
/* start logging data */
ao_log_start();
/* start logging data */
ao_log_start();
@@
-218,7
+219,7
@@
ao_flight(void)
ao_wakeup(&ao_gps_new);
#endif
ao_wakeup(&ao_gps_new);
#endif
- ao_wakeup(
DATA_TO_XDATA(&ao_flight_state)
);
+ ao_wakeup(
&ao_flight_state
);
}
break;
case ao_flight_boost:
}
break;
case ao_flight_boost:
@@
-233,7
+234,7
@@
ao_flight(void)
* deceleration, or by waiting until the maximum burn duration
* (15 seconds) has past.
*/
* deceleration, or by waiting until the maximum burn duration
* (15 seconds) has past.
*/
- if ((ao_accel < AO_MSS_TO_ACCEL(-2.5)
&& ao_height > AO_M_TO_HEIGHT(100)
) ||
+ if ((ao_accel < AO_MSS_TO_ACCEL(-2.5)) ||
(int16_t) (ao_sample_tick - ao_boost_tick) > BOOST_TICKS_MAX)
{
#if HAS_ACCEL
(int16_t) (ao_sample_tick - ao_boost_tick) > BOOST_TICKS_MAX)
{
#if HAS_ACCEL
@@
-243,7
+244,7
@@
ao_flight(void)
ao_flight_state = ao_flight_coast;
#endif
++ao_motor_number;
ao_flight_state = ao_flight_coast;
#endif
++ao_motor_number;
- ao_wakeup(
DATA_TO_XDATA(&ao_flight_state)
);
+ ao_wakeup(
&ao_flight_state
);
}
break;
#if HAS_ACCEL
}
break;
#if HAS_ACCEL
@@
-256,7
+257,7
@@
ao_flight(void)
if (ao_speed < AO_MS_TO_SPEED(AO_MAX_BARO_SPEED))
{
ao_flight_state = ao_flight_coast;
if (ao_speed < AO_MS_TO_SPEED(AO_MAX_BARO_SPEED))
{
ao_flight_state = ao_flight_coast;
- ao_wakeup(
DATA_TO_XDATA(&ao_flight_state)
);
+ ao_wakeup(
&ao_flight_state
);
} else
goto check_re_boost;
break;
} else
goto check_re_boost;
break;
@@
-269,7
+270,7
@@
ao_flight(void)
* number of seconds.
*/
if (ao_config.apogee_lockout) {
* number of seconds.
*/
if (ao_config.apogee_lockout) {
- if ((int16_t) (ao_sample_tick - ao_
boost
_tick) <
+ if ((int16_t) (ao_sample_tick - ao_
launch
_tick) <
AO_SEC_TO_TICKS(ao_config.apogee_lockout))
break;
}
AO_SEC_TO_TICKS(ao_config.apogee_lockout))
break;
}
@@
-282,9
+283,11
@@
ao_flight(void)
* the measured altitude reasonably closely; otherwise
* we're probably transsonic.
*/
* the measured altitude reasonably closely; otherwise
* we're probably transsonic.
*/
+#define AO_ERROR_BOUND 100
+
if (ao_speed < 0
#if !HAS_ACCEL
if (ao_speed < 0
#if !HAS_ACCEL
- && (ao_sample_alt >= AO_MAX_BARO_HEIGHT || ao_error_h_sq_avg <
100
)
+ && (ao_sample_alt >= AO_MAX_BARO_HEIGHT || ao_error_h_sq_avg <
AO_ERROR_BOUND
)
#endif
)
{
#endif
)
{
@@
-303,16
+306,16
@@
ao_flight(void)
/* and enter drogue state */
ao_flight_state = ao_flight_drogue;
/* and enter drogue state */
ao_flight_state = ao_flight_drogue;
- ao_wakeup(
DATA_TO_XDATA(&ao_flight_state)
);
+ ao_wakeup(
&ao_flight_state
);
}
#if HAS_ACCEL
else {
check_re_boost:
}
#if HAS_ACCEL
else {
check_re_boost:
- ao_coast_avg_accel = ao_coast_avg_accel
- (ao_coast_avg_accel >> 6) + (ao_accel >> 6
);
+ ao_coast_avg_accel = ao_coast_avg_accel
+ ((ao_accel - ao_coast_avg_accel) >> 5
);
if (ao_coast_avg_accel > AO_MSS_TO_ACCEL(20)) {
ao_boost_tick = ao_sample_tick;
ao_flight_state = ao_flight_boost;
if (ao_coast_avg_accel > AO_MSS_TO_ACCEL(20)) {
ao_boost_tick = ao_sample_tick;
ao_flight_state = ao_flight_boost;
- ao_wakeup(
DATA_TO_XDATA(&ao_flight_state)
);
+ ao_wakeup(
&ao_flight_state
);
}
}
#endif
}
}
#endif
@@
-349,7
+352,7
@@
ao_flight(void)
ao_interval_min_height = ao_interval_max_height = ao_avg_height;
ao_flight_state = ao_flight_main;
ao_interval_min_height = ao_interval_max_height = ao_avg_height;
ao_flight_state = ao_flight_main;
- ao_wakeup(
DATA_TO_XDATA(&ao_flight_state)
);
+ ao_wakeup(
&ao_flight_state
);
}
break;
}
break;
@@
-376,7
+379,7
@@
ao_flight(void)
ao_timer_set_adc_interval(0);
#endif
ao_timer_set_adc_interval(0);
#endif
- ao_wakeup(
DATA_TO_XDATA(&ao_flight_state)
);
+ ao_wakeup(
&ao_flight_state
);
}
ao_interval_min_height = ao_interval_max_height = ao_avg_height;
ao_interval_end = ao_sample_tick + AO_INTERVAL_TICKS;
}
ao_interval_min_height = ao_interval_max_height = ao_avg_height;
ao_interval_end = ao_sample_tick + AO_INTERVAL_TICKS;