File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed
Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -62,13 +62,13 @@ StateEstimate::StateEstimate(RocketData& state) {
6262 acceleration = sensor_average<HighGData, 8 >(state.high_g , [](HighGData& data) {
6363 return (double ) data.ax ;
6464 });
65- altitude = sensor_average<Barometer, 8 >(state.barometer , [](Barometer& data) {
65+ altitude = sensor_average<Barometer, 16 >(state.barometer , [](Barometer& data) {
6666 return (double ) data.altitude ;
6767 });
6868 jerk = sensor_derivative<HighGData, 8 >(state.high_g , [](HighGData& data) {
6969 return (double ) data.ax ;
7070 });
71- vertical_speed = sensor_derivative<Barometer, 8 >(state.barometer , [](Barometer& data) {
71+ vertical_speed = sensor_derivative<Barometer, 16 >(state.barometer , [](Barometer& data) {
7272 return (double ) data.altitude ;
7373 });
7474}
Original file line number Diff line number Diff line change 6666#define sustainer_coast_time 3000
6767
6868// Transition to LANDED from MAIN if vertical speed is less than this threshold (m/s)
69- #define sustainer_landed_vertical_speed_threshold 3
69+ #define sustainer_landed_vertical_speed_threshold 4
7070
7171// Lock out further transitions from LANDED after this much time passes in the LANDED state. (ms)
7272#define sustainer_landed_time_lockout 60000
Original file line number Diff line number Diff line change @@ -182,7 +182,7 @@ struct RocketData {
182182 SensorData<KalmanData> kalman;
183183 SensorData<LowGData> low_g;
184184 BufferedSensorData<HighGData, 8 > high_g;
185- BufferedSensorData<Barometer, 8 > barometer;
185+ BufferedSensorData<Barometer, 16 > barometer;
186186 SensorData<LowGLSM> low_g_lsm;
187187 SensorData<Continuity> continuity;
188188 SensorData<PyroState> pyro;
You can’t perform that action at this time.
0 commit comments