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

Merge remote branch 'origin/corvuscorax/bugfix-metadata' into next

Browse Source
This commit is contained in:
Corvus Corax 2011-12-01 01:34:45 +01:00
commit c84334f649
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/Modules/Actuator/actuator.c
View File

@ -207,7 +207,7 @@ static void actuatorTask(void* parameters)
nMixers ++;
}
}
if((nMixers < 2) && !ActuatorCommandReadOnly(dummy)) //Nothing can fly with less than two mixers.
if((nMixers < 2) && !ActuatorCommandReadOnly()) //Nothing can fly with less than two mixers.
{
setFailsafe(); // So that channels like PWM buzzer keep working
continue;

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

@ -189,19 +189,19 @@ static void manualControlTask(void *parameters)
lastActivityTime = lastSysTime;
}
if (ManualControlCommandReadOnly(&cmd)) {
if (ManualControlCommandReadOnly()) {
FlightTelemetryStatsData flightTelemStats;
FlightTelemetryStatsGet(&flightTelemStats);
if(flightTelemStats.Status != FLIGHTTELEMETRYSTATS_STATUS_CONNECTED) {
/* trying to fly via GCS and lost connection. fall back to transmitter */
UAVObjMetadata metadata;
UAVObjGetMetadata(&cmd, &metadata);
ManualControlCommandGetMetadata(&metadata);
metadata.access = ACCESS_READWRITE;
UAVObjSetMetadata(&cmd, &metadata);
ManualControlCommandSetMetadata(&metadata);
}
}
if (!ManualControlCommandReadOnly(&cmd)) {
if (!ManualControlCommandReadOnly()) {
bool valid_input_detected = true;

2
flight/UAVObjects/inc/uavobjecttemplate.h
View File

@ -67,7 +67,7 @@
#define $(NAME)InstUpdated(instId) UAVObjUpdated($(NAME)Handle(), instId)
#define $(NAME)GetMetadata(dataOut) UAVObjGetMetadata($(NAME)Handle(), dataOut)
#define $(NAME)SetMetadata(dataIn) UAVObjSetMetadata($(NAME)Handle(), dataIn)
#define $(NAME)ReadOnly(dataIn) UAVObjReadOnly($(NAME)Handle())
#define $(NAME)ReadOnly() UAVObjReadOnly($(NAME)Handle())
// Object data
typedef struct {