rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'baseorigin/revo/corvuscorax/airspeed_fixes' into corvuscorax/airspeed_fixes

Browse Source 
Conflicts:
	flight/RevoMini/UAVObjects.inc
This commit is contained in:
Corvus Corax 2012-11-05 15:16:03 +01:00
commit ce595a06d9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flight/Modules/PathPlanner/pathplanner.c
View File

@ -33,7 +33,7 @@
#include "paths.h" #include "paths.h"
#include "flightstatus.h" #include "flightstatus.h"
#include "baroairspeed.h" // TODO: make baroairspeed optional #include "airspeedactual.h"
#include "pathaction.h" #include "pathaction.h"
#include "pathdesired.h" #include "pathdesired.h"
#include "pathstatus.h" #include "pathstatus.h"
@ -110,7 +110,7 @@ int32_t PathPlannerInitialize()
PathStatusInitialize(); PathStatusInitialize();
PathDesiredInitialize(); PathDesiredInitialize();
PositionActualInitialize(); PositionActualInitialize();
BaroAirspeedInitialize(); AirspeedActualInitialize();
VelocityActualInitialize(); VelocityActualInitialize();
WaypointInitialize(); WaypointInitialize();
WaypointActiveInitialize(); WaypointActiveInitialize();
@ -482,11 +482,9 @@ static uint8_t conditionAboveSpeed() {
// use airspeed if requested and available // use airspeed if requested and available
if (pathAction.ConditionParameters[1]>0.5f) { if (pathAction.ConditionParameters[1]>0.5f) {
BaroAirspeedData baroAirspeed; AirspeedActualData airspeed;
BaroAirspeedGet (&baroAirspeed); AirspeedActualGet (&airspeed);
if (baroAirspeed.BaroConnected == BAROAIRSPEED_BAROCONNECTED_TRUE) { velocity = airspeed.CalibratedAirspeed;
velocity = baroAirspeed.TrueAirspeed;
}
} }
if ( velocity >= pathAction.ConditionParameters[0]) { if ( velocity >= pathAction.ConditionParameters[0]) {

2
flight/RevoMini/UAVObjects.inc
View File

@ -40,6 +40,8 @@ UAVOBJSRCFILENAMES += baroaltitude
UAVOBJSRCFILENAMES += baroairspeed UAVOBJSRCFILENAMES += baroairspeed
UAVOBJSRCFILENAMES += airspeedsettings UAVOBJSRCFILENAMES += airspeedsettings
UAVOBJSRCFILENAMES += airspeedactual UAVOBJSRCFILENAMES += airspeedactual
UAVOBJSRCFILENAMES += fixedwingpathfollowersettings
UAVOBJSRCFILENAMES += fixedwingpathfollowerstatus
UAVOBJSRCFILENAMES += flightbatterysettings UAVOBJSRCFILENAMES += flightbatterysettings
UAVOBJSRCFILENAMES += firmwareiapobj UAVOBJSRCFILENAMES += firmwareiapobj
UAVOBJSRCFILENAMES += flightbatterystate UAVOBJSRCFILENAMES += flightbatterystate