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

Disable the new features if not revolution and set an error flag. Fixes

Browse Source 
compilation errors.
This commit is contained in:
James Cotton 2012-03-05 00:24:11 -06:00
parent 7961aba83c
commit 61d59828dc
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flight/Modules/ManualControl/manualcontrol.c
View File

@ -598,6 +598,7 @@ static void updateStabilizationDesired(ManualControlCommandData * cmd, ManualCon
StabilizationDesiredSet(&stabilization); StabilizationDesiredSet(&stabilization);
} }
#if defined(REVOLUTION)
// TODO: Need compile flag to exclude this from copter control // TODO: Need compile flag to exclude this from copter control
static void altitudeHoldDesired(ManualControlCommandData * cmd) static void altitudeHoldDesired(ManualControlCommandData * cmd)
{ {
@ -637,7 +638,12 @@ static void altitudeHoldDesired(ManualControlCommandData * cmd)
AltitudeHoldDesiredSet(&altitudeHoldDesired); AltitudeHoldDesiredSet(&altitudeHoldDesired);
} }
#else
static void altitudeHoldDesired(ManualControlCommandData * cmd)
{
AlarmsSet(SYSTEMALARMS_ALARM_MANUALCONTROL, SYSTEMALARMS_ALARM_ERROR);
}
#endif
/** /**
* Convert channel from servo pulse duration (microseconds) to scaled -1/+1 range. * Convert channel from servo pulse duration (microseconds) to scaled -1/+1 range.
*/ */

2
flight/Revolution/System/inc/pios_config.h
View File

@ -105,6 +105,8 @@
// This actually needs calibrating // This actually needs calibrating
#define IDLE_COUNTS_PER_SEC_AT_NO_LOAD (8379692) #define IDLE_COUNTS_PER_SEC_AT_NO_LOAD (8379692)
#define REVOLUTION
#endif /* PIOS_CONFIG_H */ #endif /* PIOS_CONFIG_H */
/** /**
* @} * @}