Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plane: move struct Rangefinder_State to AP_Vehicle

This commit is contained in:
Tom Pittenger 2016-11-16 17:02:27 -08:00 committed by Tom Pittenger
parent 0ffeed644c
commit ce8db1fdba
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ArduPlane/Plane.h
View File

@ -217,19 +217,7 @@ private:
RangeFinder rangefinder {serial_manager};
struct {
bool in_range:1;
bool have_initial_reading:1;
bool in_use:1;
float initial_range;
float correction;
float initial_correction;
float last_stable_correction;
uint32_t last_correction_time_ms;
uint8_t in_range_count;
float height_estimate;
float last_distance;
} rangefinder_state;
AP_Vehicle::FixedWing::Rangefinder_State rangefinder_state;
AP_RPM rpm_sensor;

14
libraries/AP_Vehicle/AP_Vehicle.h
View File

@ -43,6 +43,20 @@ public:
AP_Float land_flare_sec;
AP_Float land_pre_flare_airspeed;
AP_Int8 stall_prevention;
struct Rangefinder_State {
bool in_range:1;
bool have_initial_reading:1;
bool in_use:1;
float initial_range;
float correction;
float initial_correction;
float last_stable_correction;
uint32_t last_correction_time_ms;
uint8_t in_range_count;
float height_estimate;
float last_distance;
};
};
/*