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

Flight: Got read only check working for UAVObjects and modified the ManualControl Module to use it. Edouard - please check over this.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1427 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2010-08-27 00:15:48 +00:00 committed by peabody124
parent 70f13ba896
commit a0b21bef45
32 changed files with 99 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
flight/OpenPilot/Modules/ManualControl/manualcontrol.c
View File

@ -93,73 +93,76 @@ static void manualControlTask(void* parameters)
ManualControlSettingsGet(&settings);
StabilizationSettingsGet(&stabSettings);
// Check settings, if error raise alarm
if ( settings.Roll >= MANUALCONTROLSETTINGS_ROLL_NONE ||
settings.Pitch >= MANUALCONTROLSETTINGS_PITCH_NONE ||
settings.Yaw >= MANUALCONTROLSETTINGS_YAW_NONE ||
settings.Throttle >= MANUALCONTROLSETTINGS_THROTTLE_NONE ||
settings.FlightMode >= MANUALCONTROLSETTINGS_FLIGHTMODE_NONE )
{
AlarmsSet(SYSTEMALARMS_ALARM_MANUALCONTROL, SYSTEMALARMS_ALARM_CRITICAL);
cmd.FlightMode = MANUALCONTROLCOMMAND_FLIGHTMODE_AUTO;
cmd.Connected = MANUALCONTROLCOMMAND_CONNECTED_FALSE;
ManualControlCommandSet(&cmd);
continue;
}
// Read channel values in us
// TODO: settings.InputMode is currently ignored because PIOS will not allow runtime
// selection of PWM and PPM. The configuration is currently done at compile time in
// the pios_config.h file.
for (int n = 0; n < MANUALCONTROLCOMMAND_CHANNEL_NUMELEM; ++n)
{
if(!ManualControlCommandReadOnly(&cmd))
{
// Check settings, if error raise alarm
if ( settings.Roll >= MANUALCONTROLSETTINGS_ROLL_NONE ||
settings.Pitch >= MANUALCONTROLSETTINGS_PITCH_NONE ||
settings.Yaw >= MANUALCONTROLSETTINGS_YAW_NONE ||
settings.Throttle >= MANUALCONTROLSETTINGS_THROTTLE_NONE ||
settings.FlightMode >= MANUALCONTROLSETTINGS_FLIGHTMODE_NONE )
{
AlarmsSet(SYSTEMALARMS_ALARM_MANUALCONTROL, SYSTEMALARMS_ALARM_CRITICAL);
cmd.FlightMode = MANUALCONTROLCOMMAND_FLIGHTMODE_AUTO;
cmd.Connected = MANUALCONTROLCOMMAND_CONNECTED_FALSE;
ManualControlCommandSet(&cmd);
continue;
}
// Read channel values in us
// TODO: settings.InputMode is currently ignored because PIOS will not allow runtime
// selection of PWM and PPM. The configuration is currently done at compile time in
// the pios_config.h file.
for (int n = 0; n < MANUALCONTROLCOMMAND_CHANNEL_NUMELEM; ++n)
{
#if defined(PIOS_INCLUDE_PWM)
cmd.Channel[n] = PIOS_PWM_Get(n);
cmd.Channel[n] = PIOS_PWM_Get(n);
#elif defined(PIOS_INCLUDE_PPM)
cmd.Channel[n] = PIOS_PPM_Get(n);
cmd.Channel[n] = PIOS_PPM_Get(n);
#elif defined(PIOS_INCLUDE_SPEKTRUM)
cmd.Channel[n] = PIOS_SPEKTRUM_Get(n);
cmd.Channel[n] = PIOS_SPEKTRUM_Get(n);
#endif
}
// Calculate roll command in range +1 to -1
cmd.Roll = scaleChannel( cmd.Channel[settings.Roll], settings.ChannelMax[settings.Roll],
settings.ChannelMin[settings.Roll], settings.ChannelNeutral[settings.Roll] );
// Calculate pitch command in range +1 to -1
cmd.Pitch = scaleChannel( cmd.Channel[settings.Pitch], settings.ChannelMax[settings.Pitch],
settings.ChannelMin[settings.Pitch], settings.ChannelNeutral[settings.Pitch] );
// Calculate yaw command in range +1 to -1
cmd.Yaw = scaleChannel( cmd.Channel[settings.Yaw], settings.ChannelMax[settings.Yaw],
settings.ChannelMin[settings.Yaw], settings.ChannelNeutral[settings.Yaw] );
// Calculate throttle command in range +1 to -1
cmd.Throttle = scaleChannel( cmd.Channel[settings.Throttle], settings.ChannelMax[settings.Throttle],
settings.ChannelMin[settings.Throttle], settings.ChannelNeutral[settings.Throttle] );
// Update flight mode
flightMode = scaleChannel( cmd.Channel[settings.FlightMode], settings.ChannelMax[settings.FlightMode],
settings.ChannelMin[settings.FlightMode], settings.ChannelNeutral[settings.FlightMode] );
if (flightMode < -FLIGHT_MODE_LIMIT)
{
cmd.FlightMode = MANUALCONTROLCOMMAND_FLIGHTMODE_MANUAL;
}
else if (flightMode > FLIGHT_MODE_LIMIT)
{
cmd.FlightMode = MANUALCONTROLCOMMAND_FLIGHTMODE_AUTO;
}
else
{
cmd.FlightMode = MANUALCONTROLCOMMAND_FLIGHTMODE_STABILIZED;
}
// Update the ManualControlCommand object
ManualControlCommandSet(&cmd);
// This seems silly to set then get, but the reason is if the GCS is
// the control input, the set command will be blocked by the read only
// setting and the get command will pull the right values from telemetry
ManualControlCommandGet(&cmd);
}
// Calculate roll command in range +1 to -1
cmd.Roll = scaleChannel( cmd.Channel[settings.Roll], settings.ChannelMax[settings.Roll],
settings.ChannelMin[settings.Roll], settings.ChannelNeutral[settings.Roll] );
// Calculate pitch command in range +1 to -1
cmd.Pitch = scaleChannel( cmd.Channel[settings.Pitch], settings.ChannelMax[settings.Pitch],
settings.ChannelMin[settings.Pitch], settings.ChannelNeutral[settings.Pitch] );
// Calculate yaw command in range +1 to -1
cmd.Yaw = scaleChannel( cmd.Channel[settings.Yaw], settings.ChannelMax[settings.Yaw],
settings.ChannelMin[settings.Yaw], settings.ChannelNeutral[settings.Yaw] );
// Calculate throttle command in range +1 to -1
cmd.Throttle = scaleChannel( cmd.Channel[settings.Throttle], settings.ChannelMax[settings.Throttle],
settings.ChannelMin[settings.Throttle], settings.ChannelNeutral[settings.Throttle] );
// Update flight mode
flightMode = scaleChannel( cmd.Channel[settings.FlightMode], settings.ChannelMax[settings.FlightMode],
settings.ChannelMin[settings.FlightMode], settings.ChannelNeutral[settings.FlightMode] );
if (flightMode < -FLIGHT_MODE_LIMIT)
{
cmd.FlightMode = MANUALCONTROLCOMMAND_FLIGHTMODE_MANUAL;
}
else if (flightMode > FLIGHT_MODE_LIMIT)
{
cmd.FlightMode = MANUALCONTROLCOMMAND_FLIGHTMODE_AUTO;
}
else
{
cmd.FlightMode = MANUALCONTROLCOMMAND_FLIGHTMODE_STABILIZED;
}
// Update the ManualControlCommand object
ManualControlCommandSet(&cmd);
// This seems silly to set then get, but the reason is if the GCS is
// the control input, the set command will be blocked by the read only
// setting and the get command will pull the right values from telemetry
}
else
ManualControlCommandGet(&cmd); /* Under GCS control */
// Check for connection status (negative throttle values)
// The receiver failsafe for the throttle channel should be set to a value below the channel NEUTRAL
@ -168,6 +171,7 @@ static void manualControlTask(void* parameters)
cmd.Connected = MANUALCONTROLCOMMAND_CONNECTED_FALSE;
cmd.FlightMode = MANUALCONTROLCOMMAND_FLIGHTMODE_AUTO;
AlarmsSet(SYSTEMALARMS_ALARM_MANUALCONTROL, SYSTEMALARMS_ALARM_WARNING);
ManualControlCommandSet(&cmd);
}
else
{
@ -177,6 +181,7 @@ static void manualControlTask(void* parameters)
{
cmd.Throttle = 0;
}
ManualControlCommandSet(&cmd);
}
// Depending on the mode update the Stabilization or Actuator objects

2
flight/OpenPilot/UAVObjects/inc/actuatorcommand.h
View File

@ -67,7 +67,7 @@
#define ActuatorCommandInstUpdated(instId) UAVObjUpdated(ActuatorCommandHandle(), instId)
#define ActuatorCommandGetMetadata(dataOut) UAVObjGetMetadata(ActuatorCommandHandle(), dataOut)
#define ActuatorCommandSetMetadata(dataIn) UAVObjSetMetadata(ActuatorCommandHandle(), dataIn)
#define ActuatorCommandReadOnly(dataIn) UAVObjReadOnly(ActuatorCommandHandle(), dataIn)
#define ActuatorCommandReadOnly(dataIn) UAVObjReadOnly(ActuatorCommandHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/actuatordesired.h
View File

@ -67,7 +67,7 @@
#define ActuatorDesiredInstUpdated(instId) UAVObjUpdated(ActuatorDesiredHandle(), instId)
#define ActuatorDesiredGetMetadata(dataOut) UAVObjGetMetadata(ActuatorDesiredHandle(), dataOut)
#define ActuatorDesiredSetMetadata(dataIn) UAVObjSetMetadata(ActuatorDesiredHandle(), dataIn)
#define ActuatorDesiredReadOnly(dataIn) UAVObjReadOnly(ActuatorDesiredHandle(), dataIn)
#define ActuatorDesiredReadOnly(dataIn) UAVObjReadOnly(ActuatorDesiredHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/actuatorsettings.h
View File

@ -67,7 +67,7 @@
#define ActuatorSettingsInstUpdated(instId) UAVObjUpdated(ActuatorSettingsHandle(), instId)
#define ActuatorSettingsGetMetadata(dataOut) UAVObjGetMetadata(ActuatorSettingsHandle(), dataOut)
#define ActuatorSettingsSetMetadata(dataIn) UAVObjSetMetadata(ActuatorSettingsHandle(), dataIn)
#define ActuatorSettingsReadOnly(dataIn) UAVObjReadOnly(ActuatorSettingsHandle(), dataIn)
#define ActuatorSettingsReadOnly(dataIn) UAVObjReadOnly(ActuatorSettingsHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/ahrscalibration.h
View File

@ -67,7 +67,7 @@
#define AHRSCalibrationInstUpdated(instId) UAVObjUpdated(AHRSCalibrationHandle(), instId)
#define AHRSCalibrationGetMetadata(dataOut) UAVObjGetMetadata(AHRSCalibrationHandle(), dataOut)
#define AHRSCalibrationSetMetadata(dataIn) UAVObjSetMetadata(AHRSCalibrationHandle(), dataIn)
#define AHRSCalibrationReadOnly(dataIn) UAVObjReadOnly(AHRSCalibrationHandle(), dataIn)
#define AHRSCalibrationReadOnly(dataIn) UAVObjReadOnly(AHRSCalibrationHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/ahrssettings.h
View File

@ -67,7 +67,7 @@
#define AHRSSettingsInstUpdated(instId) UAVObjUpdated(AHRSSettingsHandle(), instId)
#define AHRSSettingsGetMetadata(dataOut) UAVObjGetMetadata(AHRSSettingsHandle(), dataOut)
#define AHRSSettingsSetMetadata(dataIn) UAVObjSetMetadata(AHRSSettingsHandle(), dataIn)
#define AHRSSettingsReadOnly(dataIn) UAVObjReadOnly(AHRSSettingsHandle(), dataIn)
#define AHRSSettingsReadOnly(dataIn) UAVObjReadOnly(AHRSSettingsHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/ahrsstatus.h
View File

@ -67,7 +67,7 @@
#define AhrsStatusInstUpdated(instId) UAVObjUpdated(AhrsStatusHandle(), instId)
#define AhrsStatusGetMetadata(dataOut) UAVObjGetMetadata(AhrsStatusHandle(), dataOut)
#define AhrsStatusSetMetadata(dataIn) UAVObjSetMetadata(AhrsStatusHandle(), dataIn)
#define AhrsStatusReadOnly(dataIn) UAVObjReadOnly(AhrsStatusHandle(), dataIn)
#define AhrsStatusReadOnly(dataIn) UAVObjReadOnly(AhrsStatusHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/attitudeactual.h
View File

@ -67,7 +67,7 @@
#define AttitudeActualInstUpdated(instId) UAVObjUpdated(AttitudeActualHandle(), instId)
#define AttitudeActualGetMetadata(dataOut) UAVObjGetMetadata(AttitudeActualHandle(), dataOut)
#define AttitudeActualSetMetadata(dataIn) UAVObjSetMetadata(AttitudeActualHandle(), dataIn)
#define AttitudeActualReadOnly(dataIn) UAVObjReadOnly(AttitudeActualHandle(), dataIn)
#define AttitudeActualReadOnly(dataIn) UAVObjReadOnly(AttitudeActualHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/attitudedesired.h
View File

@ -67,7 +67,7 @@
#define AttitudeDesiredInstUpdated(instId) UAVObjUpdated(AttitudeDesiredHandle(), instId)
#define AttitudeDesiredGetMetadata(dataOut) UAVObjGetMetadata(AttitudeDesiredHandle(), dataOut)
#define AttitudeDesiredSetMetadata(dataIn) UAVObjSetMetadata(AttitudeDesiredHandle(), dataIn)
#define AttitudeDesiredReadOnly(dataIn) UAVObjReadOnly(AttitudeDesiredHandle(), dataIn)
#define AttitudeDesiredReadOnly(dataIn) UAVObjReadOnly(AttitudeDesiredHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/attituderaw.h
View File

@ -67,7 +67,7 @@
#define AttitudeRawInstUpdated(instId) UAVObjUpdated(AttitudeRawHandle(), instId)
#define AttitudeRawGetMetadata(dataOut) UAVObjGetMetadata(AttitudeRawHandle(), dataOut)
#define AttitudeRawSetMetadata(dataIn) UAVObjSetMetadata(AttitudeRawHandle(), dataIn)
#define AttitudeRawReadOnly(dataIn) UAVObjReadOnly(AttitudeRawHandle(), dataIn)
#define AttitudeRawReadOnly(dataIn) UAVObjReadOnly(AttitudeRawHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/baroaltitude.h
View File

@ -67,7 +67,7 @@
#define BaroAltitudeInstUpdated(instId) UAVObjUpdated(BaroAltitudeHandle(), instId)
#define BaroAltitudeGetMetadata(dataOut) UAVObjGetMetadata(BaroAltitudeHandle(), dataOut)
#define BaroAltitudeSetMetadata(dataIn) UAVObjSetMetadata(BaroAltitudeHandle(), dataIn)
#define BaroAltitudeReadOnly(dataIn) UAVObjReadOnly(BaroAltitudeHandle(), dataIn)
#define BaroAltitudeReadOnly(dataIn) UAVObjReadOnly(BaroAltitudeHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/exampleobject1.h
View File

@ -67,7 +67,7 @@
#define ExampleObject1InstUpdated(instId) UAVObjUpdated(ExampleObject1Handle(), instId)
#define ExampleObject1GetMetadata(dataOut) UAVObjGetMetadata(ExampleObject1Handle(), dataOut)
#define ExampleObject1SetMetadata(dataIn) UAVObjSetMetadata(ExampleObject1Handle(), dataIn)
#define ExampleObject1ReadOnly(dataIn) UAVObjReadOnly(ExampleObject1Handle(), dataIn)
#define ExampleObject1ReadOnly(dataIn) UAVObjReadOnly(ExampleObject1Handle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/exampleobject2.h
View File

@ -67,7 +67,7 @@
#define ExampleObject2InstUpdated(instId) UAVObjUpdated(ExampleObject2Handle(), instId)
#define ExampleObject2GetMetadata(dataOut) UAVObjGetMetadata(ExampleObject2Handle(), dataOut)
#define ExampleObject2SetMetadata(dataIn) UAVObjSetMetadata(ExampleObject2Handle(), dataIn)
#define ExampleObject2ReadOnly(dataIn) UAVObjReadOnly(ExampleObject2Handle(), dataIn)
#define ExampleObject2ReadOnly(dataIn) UAVObjReadOnly(ExampleObject2Handle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/examplesettings.h
View File

@ -67,7 +67,7 @@
#define ExampleSettingsInstUpdated(instId) UAVObjUpdated(ExampleSettingsHandle(), instId)
#define ExampleSettingsGetMetadata(dataOut) UAVObjGetMetadata(ExampleSettingsHandle(), dataOut)
#define ExampleSettingsSetMetadata(dataIn) UAVObjSetMetadata(ExampleSettingsHandle(), dataIn)
#define ExampleSettingsReadOnly(dataIn) UAVObjReadOnly(ExampleSettingsHandle(), dataIn)
#define ExampleSettingsReadOnly(dataIn) UAVObjReadOnly(ExampleSettingsHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/flightbatterystate.h
View File

@ -67,7 +67,7 @@
#define FlightBatteryStateInstUpdated(instId) UAVObjUpdated(FlightBatteryStateHandle(), instId)
#define FlightBatteryStateGetMetadata(dataOut) UAVObjGetMetadata(FlightBatteryStateHandle(), dataOut)
#define FlightBatteryStateSetMetadata(dataIn) UAVObjSetMetadata(FlightBatteryStateHandle(), dataIn)
#define FlightBatteryStateReadOnly(dataIn) UAVObjReadOnly(FlightBatteryStateHandle(), dataIn)
#define FlightBatteryStateReadOnly(dataIn) UAVObjReadOnly(FlightBatteryStateHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/flightsituationactual.h
View File

@ -67,7 +67,7 @@
#define FlightSituationActualInstUpdated(instId) UAVObjUpdated(FlightSituationActualHandle(), instId)
#define FlightSituationActualGetMetadata(dataOut) UAVObjGetMetadata(FlightSituationActualHandle(), dataOut)
#define FlightSituationActualSetMetadata(dataIn) UAVObjSetMetadata(FlightSituationActualHandle(), dataIn)
#define FlightSituationActualReadOnly(dataIn) UAVObjReadOnly(FlightSituationActualHandle(), dataIn)
#define FlightSituationActualReadOnly(dataIn) UAVObjReadOnly(FlightSituationActualHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/flighttelemetrystats.h
View File

@ -67,7 +67,7 @@
#define FlightTelemetryStatsInstUpdated(instId) UAVObjUpdated(FlightTelemetryStatsHandle(), instId)
#define FlightTelemetryStatsGetMetadata(dataOut) UAVObjGetMetadata(FlightTelemetryStatsHandle(), dataOut)
#define FlightTelemetryStatsSetMetadata(dataIn) UAVObjSetMetadata(FlightTelemetryStatsHandle(), dataIn)
#define FlightTelemetryStatsReadOnly(dataIn) UAVObjReadOnly(FlightTelemetryStatsHandle(), dataIn)
#define FlightTelemetryStatsReadOnly(dataIn) UAVObjReadOnly(FlightTelemetryStatsHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/gcstelemetrystats.h
View File

@ -67,7 +67,7 @@
#define GCSTelemetryStatsInstUpdated(instId) UAVObjUpdated(GCSTelemetryStatsHandle(), instId)
#define GCSTelemetryStatsGetMetadata(dataOut) UAVObjGetMetadata(GCSTelemetryStatsHandle(), dataOut)
#define GCSTelemetryStatsSetMetadata(dataIn) UAVObjSetMetadata(GCSTelemetryStatsHandle(), dataIn)
#define GCSTelemetryStatsReadOnly(dataIn) UAVObjReadOnly(GCSTelemetryStatsHandle(), dataIn)
#define GCSTelemetryStatsReadOnly(dataIn) UAVObjReadOnly(GCSTelemetryStatsHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/gpsposition.h
View File

@ -67,7 +67,7 @@
#define GPSPositionInstUpdated(instId) UAVObjUpdated(GPSPositionHandle(), instId)
#define GPSPositionGetMetadata(dataOut) UAVObjGetMetadata(GPSPositionHandle(), dataOut)
#define GPSPositionSetMetadata(dataIn) UAVObjSetMetadata(GPSPositionHandle(), dataIn)
#define GPSPositionReadOnly(dataIn) UAVObjReadOnly(GPSPositionHandle(), dataIn)
#define GPSPositionReadOnly(dataIn) UAVObjReadOnly(GPSPositionHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/homelocation.h
View File

@ -67,7 +67,7 @@
#define HomeLocationInstUpdated(instId) UAVObjUpdated(HomeLocationHandle(), instId)
#define HomeLocationGetMetadata(dataOut) UAVObjGetMetadata(HomeLocationHandle(), dataOut)
#define HomeLocationSetMetadata(dataIn) UAVObjSetMetadata(HomeLocationHandle(), dataIn)
#define HomeLocationReadOnly(dataIn) UAVObjReadOnly(HomeLocationHandle(), dataIn)
#define HomeLocationReadOnly(dataIn) UAVObjReadOnly(HomeLocationHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/manualcontrolcommand.h
View File

@ -67,7 +67,7 @@
#define ManualControlCommandInstUpdated(instId) UAVObjUpdated(ManualControlCommandHandle(), instId)
#define ManualControlCommandGetMetadata(dataOut) UAVObjGetMetadata(ManualControlCommandHandle(), dataOut)
#define ManualControlCommandSetMetadata(dataIn) UAVObjSetMetadata(ManualControlCommandHandle(), dataIn)
#define ManualControlCommandReadOnly(dataIn) UAVObjReadOnly(ManualControlCommandHandle(), dataIn)
#define ManualControlCommandReadOnly(dataIn) UAVObjReadOnly(ManualControlCommandHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/manualcontrolsettings.h
View File

@ -67,7 +67,7 @@
#define ManualControlSettingsInstUpdated(instId) UAVObjUpdated(ManualControlSettingsHandle(), instId)
#define ManualControlSettingsGetMetadata(dataOut) UAVObjGetMetadata(ManualControlSettingsHandle(), dataOut)
#define ManualControlSettingsSetMetadata(dataIn) UAVObjSetMetadata(ManualControlSettingsHandle(), dataIn)
#define ManualControlSettingsReadOnly(dataIn) UAVObjReadOnly(ManualControlSettingsHandle(), dataIn)
#define ManualControlSettingsReadOnly(dataIn) UAVObjReadOnly(ManualControlSettingsHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/navigationdesired.h
View File

@ -67,7 +67,7 @@
#define NavigationDesiredInstUpdated(instId) UAVObjUpdated(NavigationDesiredHandle(), instId)
#define NavigationDesiredGetMetadata(dataOut) UAVObjGetMetadata(NavigationDesiredHandle(), dataOut)
#define NavigationDesiredSetMetadata(dataIn) UAVObjSetMetadata(NavigationDesiredHandle(), dataIn)
#define NavigationDesiredReadOnly(dataIn) UAVObjReadOnly(NavigationDesiredHandle(), dataIn)
#define NavigationDesiredReadOnly(dataIn) UAVObjReadOnly(NavigationDesiredHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/navigationsettings.h
View File

@ -67,7 +67,7 @@
#define NavigationSettingsInstUpdated(instId) UAVObjUpdated(NavigationSettingsHandle(), instId)
#define NavigationSettingsGetMetadata(dataOut) UAVObjGetMetadata(NavigationSettingsHandle(), dataOut)
#define NavigationSettingsSetMetadata(dataIn) UAVObjSetMetadata(NavigationSettingsHandle(), dataIn)
#define NavigationSettingsReadOnly(dataIn) UAVObjReadOnly(NavigationSettingsHandle(), dataIn)
#define NavigationSettingsReadOnly(dataIn) UAVObjReadOnly(NavigationSettingsHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/objectpersistence.h
View File

@ -67,7 +67,7 @@
#define ObjectPersistenceInstUpdated(instId) UAVObjUpdated(ObjectPersistenceHandle(), instId)
#define ObjectPersistenceGetMetadata(dataOut) UAVObjGetMetadata(ObjectPersistenceHandle(), dataOut)
#define ObjectPersistenceSetMetadata(dataIn) UAVObjSetMetadata(ObjectPersistenceHandle(), dataIn)
#define ObjectPersistenceReadOnly(dataIn) UAVObjReadOnly(ObjectPersistenceHandle(), dataIn)
#define ObjectPersistenceReadOnly(dataIn) UAVObjReadOnly(ObjectPersistenceHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/positionactual.h
View File

@ -67,7 +67,7 @@
#define PositionActualInstUpdated(instId) UAVObjUpdated(PositionActualHandle(), instId)
#define PositionActualGetMetadata(dataOut) UAVObjGetMetadata(PositionActualHandle(), dataOut)
#define PositionActualSetMetadata(dataIn) UAVObjSetMetadata(PositionActualHandle(), dataIn)
#define PositionActualReadOnly(dataIn) UAVObjReadOnly(PositionActualHandle(), dataIn)
#define PositionActualReadOnly(dataIn) UAVObjReadOnly(PositionActualHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/stabilizationsettings.h
View File

@ -67,7 +67,7 @@
#define StabilizationSettingsInstUpdated(instId) UAVObjUpdated(StabilizationSettingsHandle(), instId)
#define StabilizationSettingsGetMetadata(dataOut) UAVObjGetMetadata(StabilizationSettingsHandle(), dataOut)
#define StabilizationSettingsSetMetadata(dataIn) UAVObjSetMetadata(StabilizationSettingsHandle(), dataIn)
#define StabilizationSettingsReadOnly(dataIn) UAVObjReadOnly(StabilizationSettingsHandle(), dataIn)
#define StabilizationSettingsReadOnly(dataIn) UAVObjReadOnly(StabilizationSettingsHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/systemalarms.h
View File

@ -67,7 +67,7 @@
#define SystemAlarmsInstUpdated(instId) UAVObjUpdated(SystemAlarmsHandle(), instId)
#define SystemAlarmsGetMetadata(dataOut) UAVObjGetMetadata(SystemAlarmsHandle(), dataOut)
#define SystemAlarmsSetMetadata(dataIn) UAVObjSetMetadata(SystemAlarmsHandle(), dataIn)
#define SystemAlarmsReadOnly(dataIn) UAVObjReadOnly(SystemAlarmsHandle(), dataIn)
#define SystemAlarmsReadOnly(dataIn) UAVObjReadOnly(SystemAlarmsHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/systemsettings.h
View File

@ -67,7 +67,7 @@
#define SystemSettingsInstUpdated(instId) UAVObjUpdated(SystemSettingsHandle(), instId)
#define SystemSettingsGetMetadata(dataOut) UAVObjGetMetadata(SystemSettingsHandle(), dataOut)
#define SystemSettingsSetMetadata(dataIn) UAVObjSetMetadata(SystemSettingsHandle(), dataIn)
#define SystemSettingsReadOnly(dataIn) UAVObjReadOnly(SystemSettingsHandle(), dataIn)
#define SystemSettingsReadOnly(dataIn) UAVObjReadOnly(SystemSettingsHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/systemstats.h
View File

@ -67,7 +67,7 @@
#define SystemStatsInstUpdated(instId) UAVObjUpdated(SystemStatsHandle(), instId)
#define SystemStatsGetMetadata(dataOut) UAVObjGetMetadata(SystemStatsHandle(), dataOut)
#define SystemStatsSetMetadata(dataIn) UAVObjSetMetadata(SystemStatsHandle(), dataIn)
#define SystemStatsReadOnly(dataIn) UAVObjReadOnly(SystemStatsHandle(), dataIn)
#define SystemStatsReadOnly(dataIn) UAVObjReadOnly(SystemStatsHandle())
// Object data
typedef struct {

2
flight/OpenPilot/UAVObjects/inc/telemetrysettings.h
View File

@ -67,7 +67,7 @@
#define TelemetrySettingsInstUpdated(instId) UAVObjUpdated(TelemetrySettingsHandle(), instId)
#define TelemetrySettingsGetMetadata(dataOut) UAVObjGetMetadata(TelemetrySettingsHandle(), dataOut)
#define TelemetrySettingsSetMetadata(dataIn) UAVObjSetMetadata(TelemetrySettingsHandle(), dataIn)
#define TelemetrySettingsReadOnly(dataIn) UAVObjReadOnly(TelemetrySettingsHandle(), dataIn)
#define TelemetrySettingsReadOnly(dataIn) UAVObjReadOnly(TelemetrySettingsHandle())
// Object data
typedef struct {

2
flight/OpenPilot/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(), dataIn)
#define $(NAME)ReadOnly(dataIn) UAVObjReadOnly($(NAME)Handle())
// Object data
typedef struct {