rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

baroaltitude: rename AltitudeActual to BaroAltitude

Browse Source 
This is to align the object names to matches the UAVObject
architecture doc.  No functional changes.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1351 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
stac 2010-08-21 16:19:10 +00:00 committed by stac
parent 47c36b3da0
commit 7b2111e512
22 changed files with 586 additions and 586 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/OpenPilot/Makefile
View File

@ -162,7 +162,7 @@ SRC += $(OPUAVOBJ)/manualcontrolsettings.c
SRC += $(OPUAVOBJ)/attitudedesired.c
SRC += $(OPUAVOBJ)/stabilizationsettings.c
SRC += $(OPUAVOBJ)/ahrsstatus.c
SRC += $(OPUAVOBJ)/altitudeactual.c
SRC += $(OPUAVOBJ)/baroaltitude.c
SRC += $(OPUAVOBJ)/attitudeactual.c
SRC += $(OPUAVOBJ)/attitudesettings.c
SRC += $(OPUAVOBJ)/flightsituationactual.c

38
flight/OpenPilot/Modules/AHRSComms/ahrs_comms.c
View File

@ -56,7 +56,7 @@
#include "attituderaw.h"
#include "ahrsstatus.h"
#include "alarms.h"
#include "altitudeactual.h"
#include "baroaltitude.h"
#include "stdbool.h"
#include "positionactual.h"
#include "homelocation.h"
@ -75,17 +75,17 @@ static xTaskHandle taskHandle;
// Private functions
static void ahrscommsTask(void* parameters);
static void load_altitude_actual(struct opahrs_msg_v1_req_altitude * altitude);
static void load_baro_altitude(struct opahrs_msg_v1_req_altitude * altitude);
static void load_magnetic_north(struct opahrs_msg_v1_req_north * north);
static void load_position_actual(struct opahrs_msg_v1_req_gps * gps);
static void update_attitude_actual(struct opahrs_msg_v1_rsp_attitude * attitude);
static void update_attitude_raw(struct opahrs_msg_v1_rsp_attituderaw * attituderaw);
static void update_ahrs_status(struct opahrs_msg_v1_rsp_serial * serial);
static bool AltitudeActualIsUpdatedFlag = false;
static void AltitudeActualUpdatedCb(UAVObjEvent * ev)
static bool BaroAltitudeIsUpdatedFlag = false;
static void BaroAltitudeUpdatedCb(UAVObjEvent * ev)
{
AltitudeActualIsUpdatedFlag = true;
BaroAltitudeIsUpdatedFlag = true;
}
static bool PositionActualIsUpdatedFlag = false;
@ -107,7 +107,7 @@ static bool AHRSKnowsHome = FALSE;
*/
int32_t AHRSCommsInitialize(void)
{
AltitudeActualConnectCallback(AltitudeActualUpdatedCb);
BaroAltitudeConnectCallback(BaroAltitudeUpdatedCb);
PositionActualConnectCallback(PositionActualUpdatedCb);
HomeLocationConnectCallback(HomeLocationUpdatedCb);
@ -177,17 +177,17 @@ static void ahrscommsTask(void* parameters)
break;
}
if (AltitudeActualIsUpdatedFlag) {
struct opahrs_msg_v1 req;
if (BaroAltitudeIsUpdatedFlag) {
struct opahrs_msg_v1 req;
load_altitude_actual(&(req.payload.user.v.req.altitude));
if ((result = PIOS_OPAHRS_SetAltitudeActual(&req)) == OPAHRS_RESULT_OK) {
AltitudeActualIsUpdatedFlag = false;
} else {
/* Comms error */
altitude_errors++;
break;
}
load_baro_altitude(&(req.payload.user.v.req.altitude));
if ((result = PIOS_OPAHRS_SetBaroAltitude(&req)) == OPAHRS_RESULT_OK) {
BaroAltitudeIsUpdatedFlag = false;
} else {
/* Comms error */
altitude_errors++;
break;
}
}
if (PositionActualIsUpdatedFlag) {
@ -251,11 +251,11 @@ static void load_magnetic_north(struct opahrs_msg_v1_req_north * mag_north)
}
static void load_altitude_actual(struct opahrs_msg_v1_req_altitude * altitude)
static void load_baro_altitude(struct opahrs_msg_v1_req_altitude * altitude)
{
AltitudeActualData data;
BaroAltitudeData data;
AltitudeActualGet(&data);
BaroAltitudeGet(&data);
altitude->altitude = data.Altitude;
altitude->pressure = data.Pressure;

12
flight/OpenPilot/Modules/Altitude/altitude.c
View File

@ -3,7 +3,7 @@
* @addtogroup OpenPilotModules OpenPilot Modules
* @{
* @addtogroup AltitudeModule Altitude Module
* @brief Communicate with BMP085 and update @ref AltitudeActual "AltitudeActual UAV Object"
* @brief Communicate with BMP085 and update @ref BaroAltitude "BaroAltitude UAV Object"
* @{
*
* @file altitude.c
@ -30,14 +30,14 @@
*/
/**
* Output object: AltitudeActual
* Output object: BaroAltitude
*
* This module will periodically update the value of the AltitudeActual object.
* This module will periodically update the value of the BaroAltitude object.
*
*/
#include "openpilot.h"
#include "altitudeactual.h" // object that will be updated by the module
#include "baroaltitude.h" // object that will be updated by the module
// Private constants
#define STACK_SIZE configMINIMAL_STACK_SIZE
@ -69,7 +69,7 @@ int32_t AltitudeInitialize()
*/
static void altitudeTask(void* parameters)
{
AltitudeActualData data;
BaroAltitudeData data;
portTickType lastSysTime;
PIOS_BMP085_Init();
@ -104,7 +104,7 @@ static void altitudeTask(void* parameters)
data.Altitude = 44330.0 * (1.0 - powf((data.Pressure/ (BMP085_P0 / 1000.0)), (1.0/5.255)));
// Update the AltitudeActual UAVObject
AltitudeActualSet(&data);
BaroAltitudeSet(&data);
// Delay until it is time to read the next sample
vTaskDelayUntil(&lastSysTime, UPDATE_PERIOD / portTICK_RATE_MS );

20
flight/OpenPilot/UAVObjects/altitudeactual.c → flight/OpenPilot/UAVObjects/baroaltitude.c
View File

@ -1,12 +1,12 @@
/**
******************************************************************************
*
* @file altitudeactual.c
* @file baroaltitude.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief Implementation of the AltitudeActual object. This file has been
* @brief Implementation of the BaroAltitude object. This file has been
* automatically generated by the UAVObjectGenerator.
*
* @note Object definition file: altitudeactual.xml.
* @note Object definition file: baroaltitude.xml.
* This is an automatically generated file.
* DO NOT modify manually.
*
@ -30,7 +30,7 @@
*/
#include "openpilot.h"
#include "altitudeactual.h"
#include "baroaltitude.h"
// Private variables
static UAVObjHandle handle;
@ -43,11 +43,11 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId);
* \return 0 Success
* \return -1 Failure
*/
int32_t AltitudeActualInitialize()
int32_t BaroAltitudeInitialize()
{
// Register object with the object manager
handle = UAVObjRegister(ALTITUDEACTUAL_OBJID, ALTITUDEACTUAL_NAME, ALTITUDEACTUAL_METANAME, 0,
ALTITUDEACTUAL_ISSINGLEINST, ALTITUDEACTUAL_ISSETTINGS, ALTITUDEACTUAL_NUMBYTES, &setDefaults);
handle = UAVObjRegister(BAROALTITUDE_OBJID, BAROALTITUDE_NAME, BAROALTITUDE_METANAME, 0,
BAROALTITUDE_ISSINGLEINST, BAROALTITUDE_ISSETTINGS, BAROALTITUDE_NUMBYTES, &setDefaults);
// Done
if (handle != 0)
@ -67,12 +67,12 @@ int32_t AltitudeActualInitialize()
*/
static void setDefaults(UAVObjHandle obj, uint16_t instId)
{
AltitudeActualData data;
BaroAltitudeData data;
UAVObjMetadata metadata;
// Initialize object fields to their default values
UAVObjGetInstanceData(obj, instId, &data);
memset(&data, 0, sizeof(AltitudeActualData));
memset(&data, 0, sizeof(BaroAltitudeData));
UAVObjSetInstanceData(obj, instId, &data);
@ -93,7 +93,7 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
/**
* Get object handle
*/
UAVObjHandle AltitudeActualHandle()
UAVObjHandle BaroAltitudeHandle()
{
return handle;
}

76
flight/OpenPilot/UAVObjects/inc/altitudeactual.h
View File

@ -1,76 +0,0 @@
/**
******************************************************************************
*
* @file altitudeactual.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief Implementation of the AltitudeActual object. This file has been
* automatically generated by the UAVObjectGenerator.
*
* @note Object definition file: altitudeactual.xml.
* This is an automatically generated file.
* DO NOT modify manually.
*
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef ALTITUDEACTUAL_H
#define ALTITUDEACTUAL_H
// Object constants
#define ALTITUDEACTUAL_OBJID 2251817750U
#define ALTITUDEACTUAL_NAME "AltitudeActual"
#define ALTITUDEACTUAL_METANAME "AltitudeActualMeta"
#define ALTITUDEACTUAL_ISSINGLEINST 1
#define ALTITUDEACTUAL_ISSETTINGS 0
#define ALTITUDEACTUAL_NUMBYTES sizeof(AltitudeActualData)
// Object access macros
#define AltitudeActualGet(dataOut) UAVObjGetData(AltitudeActualHandle(), dataOut)
#define AltitudeActualSet(dataIn) UAVObjSetData(AltitudeActualHandle(), dataIn)
#define AltitudeActualInstGet(instId, dataOut) UAVObjGetInstanceData(AltitudeActualHandle(), instId, dataOut)
#define AltitudeActualInstSet(instId, dataIn) UAVObjSetInstanceData(AltitudeActualHandle(), instId, dataIn)
#define AltitudeActualConnectQueue(queue) UAVObjConnectQueue(AltitudeActualHandle(), queue, EV_MASK_ALL_UPDATES)
#define AltitudeActualConnectCallback(cb) UAVObjConnectCallback(AltitudeActualHandle(), cb, EV_MASK_ALL_UPDATES)
#define AltitudeActualCreateInstance() UAVObjCreateInstance(AltitudeActualHandle())
#define AltitudeActualRequestUpdate() UAVObjRequestUpdate(AltitudeActualHandle())
#define AltitudeActualRequestInstUpdate(instId) UAVObjRequestInstanceUpdate(AltitudeActualHandle(), instId)
#define AltitudeActualUpdated() UAVObjUpdated(AltitudeActualHandle())
#define AltitudeActualInstUpdated(instId) UAVObjUpdated(AltitudeActualHandle(), instId)
#define AltitudeActualGetMetadata(dataOut) UAVObjGetMetadata(AltitudeActualHandle(), dataOut)
#define AltitudeActualSetMetadata(dataIn) UAVObjSetMetadata(AltitudeActualHandle(), dataIn)
// Object data
typedef struct {
float Altitude;
float Temperature;
float Pressure;
} __attribute__((packed)) AltitudeActualData;
// Field information
// Field Altitude information
// Field Temperature information
// Field Pressure information
// Generic interface functions
int32_t AltitudeActualInitialize();
UAVObjHandle AltitudeActualHandle();
#endif // ALTITUDEACTUAL_H

76
flight/OpenPilot/UAVObjects/inc/baroaltitude.h Normal file
View File

@ -0,0 +1,76 @@
/**
******************************************************************************
*
* @file baroaltitude.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief Implementation of the BaroAltitude object. This file has been
* automatically generated by the UAVObjectGenerator.
*
* @note Object definition file: baroaltitude.xml.
* This is an automatically generated file.
* DO NOT modify manually.
*
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef BAROALTITUDE_H
#define BAROALTITUDE_H
// Object constants
#define BAROALTITUDE_OBJID 3980666102U
#define BAROALTITUDE_NAME "BaroAltitude"
#define BAROALTITUDE_METANAME "BaroAltitudeMeta"
#define BAROALTITUDE_ISSINGLEINST 1
#define BAROALTITUDE_ISSETTINGS 0
#define BAROALTITUDE_NUMBYTES sizeof(BaroAltitudeData)
// Object access macros
#define BaroAltitudeGet(dataOut) UAVObjGetData(BaroAltitudeHandle(), dataOut)
#define BaroAltitudeSet(dataIn) UAVObjSetData(BaroAltitudeHandle(), dataIn)
#define BaroAltitudeInstGet(instId, dataOut) UAVObjGetInstanceData(BaroAltitudeHandle(), instId, dataOut)
#define BaroAltitudeInstSet(instId, dataIn) UAVObjSetInstanceData(BaroAltitudeHandle(), instId, dataIn)
#define BaroAltitudeConnectQueue(queue) UAVObjConnectQueue(BaroAltitudeHandle(), queue, EV_MASK_ALL_UPDATES)
#define BaroAltitudeConnectCallback(cb) UAVObjConnectCallback(BaroAltitudeHandle(), cb, EV_MASK_ALL_UPDATES)
#define BaroAltitudeCreateInstance() UAVObjCreateInstance(BaroAltitudeHandle())
#define BaroAltitudeRequestUpdate() UAVObjRequestUpdate(BaroAltitudeHandle())
#define BaroAltitudeRequestInstUpdate(instId) UAVObjRequestInstanceUpdate(BaroAltitudeHandle(), instId)
#define BaroAltitudeUpdated() UAVObjUpdated(BaroAltitudeHandle())
#define BaroAltitudeInstUpdated(instId) UAVObjUpdated(BaroAltitudeHandle(), instId)
#define BaroAltitudeGetMetadata(dataOut) UAVObjGetMetadata(BaroAltitudeHandle(), dataOut)
#define BaroAltitudeSetMetadata(dataIn) UAVObjSetMetadata(BaroAltitudeHandle(), dataIn)
// Object data
typedef struct {
float Altitude;
float Temperature;
float Pressure;
} __attribute__((packed)) BaroAltitudeData;
// Field information
// Field Altitude information
// Field Temperature information
// Field Pressure information
// Generic interface functions
int32_t BaroAltitudeInitialize();
UAVObjHandle BaroAltitudeHandle();
#endif // BAROALTITUDE_H

4
flight/OpenPilot/UAVObjects/uavobjectsinit.c
View File

@ -32,11 +32,11 @@
#include "actuatordesired.h"
#include "actuatorsettings.h"
#include "ahrsstatus.h"
#include "altitudeactual.h"
#include "attitudeactual.h"
#include "attitudedesired.h"
#include "attituderaw.h"
#include "attitudesettings.h"
#include "baroaltitude.h"
#include "exampleobject1.h"
#include "exampleobject2.h"
#include "examplesettings.h"
@ -68,11 +68,11 @@ void UAVObjectsInitializeAll()
ActuatorDesiredInitialize();
ActuatorSettingsInitialize();
AhrsStatusInitialize();
AltitudeActualInitialize();
AttitudeActualInitialize();
AttitudeDesiredInitialize();
AttitudeRawInitialize();
AttitudeSettingsInitialize();
BaroAltitudeInitialize();
ExampleObject1Initialize();
ExampleObject2Initialize();
ExampleSettingsInitialize();

2
flight/PiOS/Common/pios_opahrs.c
View File

@ -310,7 +310,7 @@ enum opahrs_result PIOS_OPAHRS_SetPositionActual(struct opahrs_msg_v1 *req)
return opahrs_msg_v1_recv_rsp (OPAHRS_MSG_V1_RSP_GPS, &rsp);
}
enum opahrs_result PIOS_OPAHRS_SetAltitudeActual(struct opahrs_msg_v1 *req)
enum opahrs_result PIOS_OPAHRS_SetBaroAltitude(struct opahrs_msg_v1 *req)
{
struct opahrs_msg_v1 rsp;
enum opahrs_result rc;

2
flight/PiOS/inc/pios_opahrs.h
View File

@ -43,7 +43,7 @@ extern enum opahrs_result PIOS_OPAHRS_Sync(struct opahrs_msg_v1 *rsp);
extern enum opahrs_result PIOS_OPAHRS_GetSerial(struct opahrs_msg_v1 *rsp);
extern enum opahrs_result PIOS_OPAHRS_GetAttitude(struct opahrs_msg_v1 *rsp);
extern enum opahrs_result PIOS_OPAHRS_GetAttitudeRaw(struct opahrs_msg_v1 *rsp);
extern enum opahrs_result PIOS_OPAHRS_SetAltitudeActual(struct opahrs_msg_v1 *req);
extern enum opahrs_result PIOS_OPAHRS_SetBaroAltitude(struct opahrs_msg_v1 *req);
extern enum opahrs_result PIOS_OPAHRS_SetMagNorth(struct opahrs_msg_v1 *req);
extern enum opahrs_result PIOS_OPAHRS_SetPositionActual(struct opahrs_msg_v1 *req);
extern enum opahrs_result PIOS_OPAHRS_resync(void);

16
ground/src/plugins/hitl/flightgearbridge.cpp
View File

@ -60,7 +60,7 @@ void FlightGearBridge::onStart()
ExtensionSystem::PluginManager* pm = ExtensionSystem::PluginManager::instance();
UAVObjectManager* objManager = pm->getObject<UAVObjectManager>();
actDesired = ActuatorDesired::GetInstance(objManager);
altActual = AltitudeActual::GetInstance(objManager);
baroAltitude = BaroAltitude::GetInstance(objManager);
attActual = AttitudeActual::GetInstance(objManager);
posActual = PositionActual::GetInstance(objManager);
telStats = GCSTelemetryStats::GetInstance(objManager);
@ -167,7 +167,7 @@ void FlightGearBridge::receiveUpdate()
void FlightGearBridge::setupObjects()
{
setupInputObject(actDesired, 75);
setupOutputObject(altActual, 250);
setupOutputObject(baroAltitude, 250);
setupOutputObject(attActual, 75);
setupOutputObject(posActual, 250);
}
@ -267,12 +267,12 @@ void FlightGearBridge::processUpdate(QString& data)
// Get pressure (kpa)
float pressure = fields[20].toFloat() * INHG2KPA;
// Update AltitudeActual object
AltitudeActual::DataFields altActualData;
altActualData.Altitude = altitudeAGL;
altActualData.Temperature = temperature;
altActualData.Pressure = pressure;
altActual->setData(altActualData);
// Update BaroAltitude object
BaroAltitude::DataFields baroAltitudeData;
baroAltitudeData.Altitude = altitudeAGL;
baroAltitudeData.Temperature = temperature;
baroAltitudeData.Pressure = pressure;
baroAltitude->setData(baroAltitudeData);
// Update attActual object
AttitudeActual::DataFields attActualData;

4
ground/src/plugins/hitl/flightgearbridge.h
View File

@ -35,7 +35,7 @@
#include "uavtalk/telemetrymanager.h"
#include "uavobjects/uavobjectmanager.h"
#include "uavobjects/actuatordesired.h"
#include "uavobjects/altitudeactual.h"
#include "uavobjects/baroaltitude.h"
#include "uavobjects/attitudeactual.h"
#include "uavobjects/positionactual.h"
#include "uavobjects/gcstelemetrystats.h"
@ -75,7 +75,7 @@ private:
QUdpSocket* inSocket;
QUdpSocket* outSocket;
ActuatorDesired* actDesired;
AltitudeActual* altActual;
BaroAltitude* baroAltitude;
AttitudeActual* attActual;
PositionActual* posActual;
GCSTelemetryStats* telStats;

18
ground/src/plugins/hitlil2/il2bridge.cpp
View File

@ -108,7 +108,7 @@ void Il2Bridge::onStart()
ExtensionSystem::PluginManager* pm = ExtensionSystem::PluginManager::instance();
UAVObjectManager* objManager = pm->getObject<UAVObjectManager>();
actDesired = ActuatorDesired::GetInstance(objManager);
altActual = AltitudeActual::GetInstance(objManager);
baroAltitude = BaroAltitude::GetInstance(objManager);
attActual = AttitudeActual::GetInstance(objManager);
posActual = PositionActual::GetInstance(objManager);
telStats = GCSTelemetryStats::GetInstance(objManager);
@ -218,7 +218,7 @@ void Il2Bridge::receiveUpdate()
void Il2Bridge::setupObjects()
{
setupInputObject(actDesired, 75);
setupOutputObject(altActual, 250);
setupOutputObject(baroAltitude, 250);
setupOutputObject(attActual, 75);
setupOutputObject(posActual, 250);
}
@ -356,12 +356,12 @@ void Il2Bridge::processUpdate(QString& data)
current.X = old.X + (current.dX*current.dT);
current.Y = old.Y + (current.dY*current.dT);
// Update AltitudeActual object
AltitudeActual::DataFields altActualData;
altActualData.Altitude = current.Z;
altActualData.Temperature = TEMP_GROUND + (current.Z * TEMP_LAPSE_RATE) - 273.0;
altActualData.Pressure = PRESSURE(current.Z)/1000.0; // kpa
altActual->setData(altActualData);
// Update BaroAltitude object
BaroAltitude::DataFields baroAltitudeData;
baroAltitudeData.Altitude = current.Z;
baroAltitudeData.Temperature = TEMP_GROUND + (current.Z * TEMP_LAPSE_RATE) - 273.0;
baroAltitudeData.Pressure = PRESSURE(current.Z)/1000.0; // kpa
baroAltitude->setData(baroAltitudeData);
// Update attActual object
AttitudeActual::DataFields attActualData;
@ -394,7 +394,7 @@ void Il2Bridge::processUpdate(QString& data)
// issue manual update
attActual->updated();
altActual->updated();
baroAltitude->updated();
posActual->updated();
}

4
ground/src/plugins/hitlil2/il2bridge.h
View File

@ -37,7 +37,7 @@
#include "uavtalk/telemetrymanager.h"
#include "uavobjects/uavobjectmanager.h"
#include "uavobjects/actuatordesired.h"
#include "uavobjects/altitudeactual.h"
#include "uavobjects/baroaltitude.h"
#include "uavobjects/attitudeactual.h"
#include "uavobjects/positionactual.h"
#include "uavobjects/gcstelemetrystats.h"
@ -122,7 +122,7 @@ private:
struct flightParams old;
QUdpSocket* outSocket;
ActuatorDesired* actDesired;
AltitudeActual* altActual;
BaroAltitude* baroAltitude;
AttitudeActual* attActual;
PositionActual* posActual;
GCSTelemetryStats* telStats;

2
ground/src/plugins/scope/plotdata.h
View File

@ -29,7 +29,7 @@
#define PLOTDATA_H
#include "uavobjects/uavobject.h"
#include "uavobjects/altitudeactual.h"
#include "uavobjects/baroaltitude.h"
#include "uavobjects/positionactual.h"

14
ground/src/plugins/scope/scopegadgetwidget.cpp
View File

@ -312,7 +312,7 @@ TestDataGen::TestDataGen()
ExtensionSystem::PluginManager* pm = ExtensionSystem::PluginManager::instance();
UAVObjectManager* objManager = pm->getObject<UAVObjectManager>();
altActual = AltitudeActual::GetInstance(objManager);
baroAltitude = BaroAltitude::GetInstance(objManager);
gps = PositionActual::GetInstance(objManager);
//Setup timer
@ -326,12 +326,12 @@ TestDataGen::TestDataGen()
void TestDataGen::genTestData()
{
// Update AltitudeActual object
AltitudeActual::DataFields altActualData;
altActualData.Altitude = 500 * sin(1 * testTime) + 200 * cos(4 * testTime) + 800;
altActualData.Temperature = 30 * sin(0.5 * testTime);
altActualData.Pressure = 100;
altActual->setData(altActualData);
// Update BaroAltitude object
BaroAltitude::DataFields baroAltitudeData;
baroAltitudeData.Altitude = 500 * sin(1 * testTime) + 200 * cos(4 * testTime) + 800;
baroAltitudeData.Temperature = 30 * sin(0.5 * testTime);
baroAltitudeData.Pressure = 100;
baroAltitude->setData(baroAltitudeData);
// Update gps objects

4
ground/src/plugins/scope/scopegadgetwidget.h
View File

@ -30,7 +30,7 @@
#include "plotdata.h"
#include "uavobjects/uavobject.h"
#include "uavobjects/altitudeactual.h"
#include "uavobjects/baroaltitude.h"
#include "uavobjects/positionactual.h"
@ -78,7 +78,7 @@ public:
~TestDataGen();
private:
AltitudeActual* altActual;
BaroAltitude* baroAltitude;
PositionActual* gps;
QTimer *timer;

26
ground/src/plugins/uavobjects/altitudeactual.cpp → ground/src/plugins/uavobjects/baroaltitude.cpp
View File

@ -1,7 +1,7 @@
/**
******************************************************************************
*
* @file altitudeactual.cpp
* @file baroaltitude.cpp
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @see The GNU Public License (GPL) Version 3
* @addtogroup GCSPlugins GCS Plugins
@ -9,7 +9,7 @@
* @addtogroup UAVObjectsPlugin UAVObjects Plugin
* @{
*
* @note Object definition file: altitudeactual.xml.
* @note Object definition file: baroaltitude.xml.
* This is an automatically generated file.
* DO NOT modify manually.
*
@ -30,15 +30,15 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "altitudeactual.h"
#include "baroaltitude.h"
#include "uavobjectfield.h"
const QString AltitudeActual::NAME = QString("AltitudeActual");
const QString BaroAltitude::NAME = QString("BaroAltitude");
/**
* Constructor
*/
AltitudeActual::AltitudeActual(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAME)
BaroAltitude::BaroAltitude(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAME)
{
// Create fields
QList<UAVObjectField*> fields;
@ -61,7 +61,7 @@ AltitudeActual::AltitudeActual(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS,
/**
* Get the default metadata for this object
*/
UAVObject::Metadata AltitudeActual::getDefaultMetadata()
UAVObject::Metadata BaroAltitude::getDefaultMetadata()
{
UAVObject::Metadata metadata;
metadata.flightAccess = ACCESS_READWRITE;
@ -82,7 +82,7 @@ UAVObject::Metadata AltitudeActual::getDefaultMetadata()
* If a default value is not specified the object fields
* will be initialized to zero.
*/
void AltitudeActual::setDefaultFieldValues()
void BaroAltitude::setDefaultFieldValues()
{
}
@ -90,7 +90,7 @@ void AltitudeActual::setDefaultFieldValues()
/**
* Get the object data fields
*/
AltitudeActual::DataFields AltitudeActual::getData()
BaroAltitude::DataFields BaroAltitude::getData()
{
QMutexLocker locker(mutex);
return data;
@ -99,7 +99,7 @@ AltitudeActual::DataFields AltitudeActual::getData()
/**
* Set the object data fields
*/
void AltitudeActual::setData(const DataFields& data)
void BaroAltitude::setData(const DataFields& data)
{
QMutexLocker locker(mutex);
// Get metadata
@ -118,9 +118,9 @@ void AltitudeActual::setData(const DataFields& data)
* Do not use this function directly to create new instances, the
* UAVObjectManager should be used instead.
*/
UAVDataObject* AltitudeActual::clone(quint32 instID)
UAVDataObject* BaroAltitude::clone(quint32 instID)
{
AltitudeActual* obj = new AltitudeActual();
BaroAltitude* obj = new BaroAltitude();
obj->initialize(instID, this->getMetaObject());
return obj;
}
@ -128,7 +128,7 @@ UAVDataObject* AltitudeActual::clone(quint32 instID)
/**
* Static function to retrieve an instance of the object.
*/
AltitudeActual* AltitudeActual::GetInstance(UAVObjectManager* objMngr, quint32 instID)
BaroAltitude* BaroAltitude::GetInstance(UAVObjectManager* objMngr, quint32 instID)
{
return dynamic_cast<AltitudeActual*>(objMngr->getObject(AltitudeActual::OBJID, instID));
return dynamic_cast<BaroAltitude*>(objMngr->getObject(BaroAltitude::OBJID, instID));
}

18
ground/src/plugins/uavobjects/altitudeactual.h → ground/src/plugins/uavobjects/baroaltitude.h
View File

@ -1,7 +1,7 @@
/**
******************************************************************************
*
* @file altitudeactual.h
* @file baroaltitude.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @see The GNU Public License (GPL) Version 3
* @addtogroup GCSPlugins GCS Plugins
@ -9,7 +9,7 @@
* @addtogroup UAVObjectsPlugin UAVObjects Plugin
* @{
*
* @note Object definition file: altitudeactual.xml.
* @note Object definition file: baroaltitude.xml.
* This is an automatically generated file.
* DO NOT modify manually.
*
@ -30,13 +30,13 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef ALTITUDEACTUAL_H
#define ALTITUDEACTUAL_H
#ifndef BAROALTITUDE_H
#define BAROALTITUDE_H
#include "uavdataobject.h"
#include "uavobjectmanager.h"
class UAVOBJECTS_EXPORT AltitudeActual: public UAVDataObject
class UAVOBJECTS_EXPORT BaroAltitude: public UAVDataObject
{
Q_OBJECT
@ -56,21 +56,21 @@ public:
// Constants
static const quint32 OBJID = 2251817750U;
static const quint32 OBJID = 3980666102U;
static const QString NAME;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);
// Functions
AltitudeActual();
BaroAltitude();
DataFields getData();
void setData(const DataFields& data);
Metadata getDefaultMetadata();
UAVDataObject* clone(quint32 instID);
static AltitudeActual* GetInstance(UAVObjectManager* objMngr, quint32 instID = 0);
static BaroAltitude* GetInstance(UAVObjectManager* objMngr, quint32 instID = 0);
private:
DataFields data;
@ -79,4 +79,4 @@ private:
};
#endif // ALTITUDEACTUAL_H
#endif // BAROALTITUDE_H

16
ground/src/plugins/uavobjects/altitudeactual.py → ground/src/plugins/uavobjects/baroaltitude.py
View File

@ -1,12 +1,12 @@
##
##############################################################################
#
# @file altitudeactual.py
# @file baroaltitude.py
# @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
# @brief Implementation of the AltitudeActual object. This file has been
# @brief Implementation of the BaroAltitude object. This file has been
# automatically generated by the UAVObjectGenerator.
#
# @note Object definition file: altitudeactual.xml.
# @note Object definition file: baroaltitude.xml.
# This is an automatically generated file.
# DO NOT modify manually.
#
@ -70,11 +70,11 @@ _fields = [ \
]
class AltitudeActual(uavobject.UAVObject):
class BaroAltitude(uavobject.UAVObject):
## Object constants
OBJID = 2251817750
NAME = "AltitudeActual"
METANAME = "AltitudeActualMeta"
OBJID = 3980666102
NAME = "BaroAltitude"
METANAME = "BaroAltitudeMeta"
ISSINGLEINST = 1
ISSETTINGS = 0
@ -98,7 +98,7 @@ class AltitudeActual(uavobject.UAVObject):
def main():
# Instantiate the object and dump out some interesting info
x = AltitudeActual()
x = BaroAltitude()
print (x)
if __name__ == "__main__":

4
ground/src/plugins/uavobjects/uavobjects.pro
View File

@ -13,7 +13,7 @@ HEADERS += uavobjects_global.h \
uavobjectsplugin.h \
examplesettings.h \
ahrsstatus.h \
altitudeactual.h \
baroaltitude.h \
attitudeactual.h \
attitudesettings.h \
exampleobject2.h \
@ -47,7 +47,7 @@ SOURCES += uavobject.cpp \
uavobjectsinit.cpp \
uavobjectsplugin.cpp \
ahrsstatus.cpp \
altitudeactual.cpp \
baroaltitude.cpp \
attitudeactual.cpp \
attitudesettings.cpp \
examplesettings.cpp \

4
ground/src/plugins/uavobjects/uavobjectsinit.cpp
View File

@ -34,11 +34,11 @@
#include "actuatordesired.h"
#include "actuatorsettings.h"
#include "ahrsstatus.h"
#include "altitudeactual.h"
#include "attitudeactual.h"
#include "attitudedesired.h"
#include "attituderaw.h"
#include "attitudesettings.h"
#include "baroaltitude.h"
#include "exampleobject1.h"
#include "exampleobject2.h"
#include "examplesettings.h"
@ -70,11 +70,11 @@ void UAVObjectsInitialize(UAVObjectManager* objMngr)
objMngr->registerObject( new ActuatorDesired() );
objMngr->registerObject( new ActuatorSettings() );
objMngr->registerObject( new AhrsStatus() );
objMngr->registerObject( new AltitudeActual() );
objMngr->registerObject( new AttitudeActual() );
objMngr->registerObject( new AttitudeDesired() );
objMngr->registerObject( new AttitudeRaw() );
objMngr->registerObject( new AttitudeSettings() );
objMngr->registerObject( new BaroAltitude() );
objMngr->registerObject( new ExampleObject1() );
objMngr->registerObject( new ExampleObject2() );
objMngr->registerObject( new ExampleSettings() );

2
ground/src/shared/uavobjectdefinition/altitudeactual.xml → ground/src/shared/uavobjectdefinition/baroaltitude.xml
View File

@ -1,5 +1,5 @@
<xml>
<object name="AltitudeActual" singleinstance="true" settings="false">
<object name="BaroAltitude" singleinstance="true" settings="false">
<field name="Altitude" units="m" type="float" elements="1"/>
<field name="Temperature" units="C" type="float" elements="1"/>
<field name="Pressure" units="kPa" type="float" elements="1"/>