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

Fix GCS problems with renaming the accels_filtered to accels. You'll have to

Browse Source 
update your .ini file

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2708 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2011-02-03 02:42:46 +00:00 committed by peabody124
parent fedadb1275
commit 0de938090b
5 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/openpilotgcs/src/plugins/config/configahrswidget.cpp
View File

@ -289,7 +289,7 @@ void ConfigAHRSWidget::launchAccelBiasCalibration()
*/
void ConfigAHRSWidget::accelBiasattitudeRawUpdated(UAVObject *obj)
{
UAVObjectField *accel_field = obj->getField(QString("accels_filtered"));
UAVObjectField *accel_field = obj->getField(QString("accels"));
Q_ASSERT(accel_field != 0);
// This is necessary to prevent a race condition on disconnect signal and another update
@ -537,8 +537,8 @@ void ConfigAHRSWidget::saveAHRSCalibration()
void ConfigAHRSWidget::attitudeRawUpdated(UAVObject * obj)
{
QMutexLocker lock(&attitudeRawUpdateLock);
UAVObjectField *accel_field = obj->getField(QString("accels_filtered"));
UAVObjectField *gyro_field = obj->getField(QString("gyros_filtered"));
UAVObjectField *accel_field = obj->getField(QString("accels"));
UAVObjectField *gyro_field = obj->getField(QString("gyros"));
UAVObjectField *mag_field = obj->getField(QString("magnetometers"));
Q_ASSERT(gyro_field != 0 && accel_field != 0 && mag_field != 0);

154
ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.ini
View File

@ -956,7 +956,7 @@ ScopeGadget\Pitch%20behaviour\data\plotCurve2\yScalePower=0
ScopeGadget\Pitch%20behaviour\data\plotCurve2\yMinimum=0
ScopeGadget\Pitch%20behaviour\data\plotCurve2\yMaximum=0
ScopeGadget\Pitch%20behaviour\data\plotCurve3\uavObject=AttitudeRaw
ScopeGadget\Pitch%20behaviour\data\plotCurve3\uavField=accels_filtered-X
ScopeGadget\Pitch%20behaviour\data\plotCurve3\uavField=accels-X
ScopeGadget\Pitch%20behaviour\data\plotCurve3\color=4278233600
ScopeGadget\Pitch%20behaviour\data\plotCurve3\yScalePower=0
ScopeGadget\Pitch%20behaviour\data\plotCurve3\yMinimum=0
@ -1300,79 +1300,79 @@ HITL\XPlane%20HITL\data\latitude=
HITL\XPlane%20HITL\data\longitude=
HITL\XPlane%20HITL\configInfo\version=0.0.0
HITL\XPlane%20HITL\configInfo\locked=false
ScopeGadget\AccelFiltered\data\configurationStreamVersion=1000
ScopeGadget\AccelFiltered\data\plotType=1
ScopeGadget\AccelFiltered\data\dataSize=60
ScopeGadget\AccelFiltered\data\refreshInterval=100
ScopeGadget\AccelFiltered\data\plotCurveCount=3
ScopeGadget\AccelFiltered\data\plotCurve0\uavObject=AttitudeRaw
ScopeGadget\AccelFiltered\data\plotCurve0\uavField=accels_filtered-X
ScopeGadget\AccelFiltered\data\plotCurve0\color=4294901760
ScopeGadget\AccelFiltered\data\plotCurve0\yScalePower=0
ScopeGadget\AccelFiltered\data\plotCurve0\yMinimum=0
ScopeGadget\AccelFiltered\data\plotCurve0\yMaximum=0
ScopeGadget\AccelFiltered\data\plotCurve1\uavObject=AttitudeRaw
ScopeGadget\AccelFiltered\data\plotCurve1\uavField=accels_filtered-Y
ScopeGadget\AccelFiltered\data\plotCurve1\color=4283782655
ScopeGadget\AccelFiltered\data\plotCurve1\yScalePower=0
ScopeGadget\AccelFiltered\data\plotCurve1\yMinimum=0
ScopeGadget\AccelFiltered\data\plotCurve1\yMaximum=0
ScopeGadget\AccelFiltered\data\plotCurve2\uavObject=AttitudeRaw
ScopeGadget\AccelFiltered\data\plotCurve2\uavField=accels_filtered-Z
ScopeGadget\AccelFiltered\data\plotCurve2\color=4283804160
ScopeGadget\AccelFiltered\data\plotCurve2\yScalePower=0
ScopeGadget\AccelFiltered\data\plotCurve2\yMinimum=0
ScopeGadget\AccelFiltered\data\plotCurve2\yMaximum=0
ScopeGadget\AccelFiltered\configInfo\version=0.0.0
ScopeGadget\AccelFiltered\configInfo\locked=false
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\dFile=%%DATAPATH%%dials/default/lineardial-horizontal.svg
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\sourceDataObject=AttitudeRaw
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\sourceObjectField=accels_filtered-X
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\minValue=-11
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\maxValue=11
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\redMin=-11
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\redMax=11
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\yellowMin=-11
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\yellowMax=-5
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\greenMin=-10
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\greenMax=-9
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\font="Andale Mono,8,-1,5,50,0,0,0,0,0"
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\decimalPlaces=2
LineardialGadget\Accel%20Filtered%20Horizontal%20X\data\factor=1
LineardialGadget\Accel%20Filtered%20Horizontal%20X\configInfo\version=0.0.0
LineardialGadget\Accel%20Filtered%20Horizontal%20X\configInfo\locked=false
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\dFile=%%DATAPATH%%dials/default/lineardial-horizontal.svg
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\sourceDataObject=AttitudeRaw
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\sourceObjectField=accels_filtered-Y
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\minValue=-11
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\maxValue=11
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\redMin=-11
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\redMax=11
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\yellowMin=-11
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\yellowMax=-5
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\greenMin=-10
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\greenMax=-9
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\font="Andale Mono,6,-1,5,50,0,0,0,0,0"
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\decimalPlaces=2
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\data\factor=1
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\configInfo\version=0.0.0
LineardialGadget\Accel%20Filtered%20Horizontal%20Y\configInfo\locked=false
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\dFile=%%DATAPATH%%dials/default/lineardial-horizontal.svg
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\sourceDataObject=AttitudeRaw
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\sourceObjectField=accels_filtered-Z
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\minValue=-11
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\maxValue=11
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\redMin=-11
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\redMax=11
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\yellowMin=-11
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\yellowMax=-5
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\greenMin=-10
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\greenMax=-9
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\font="Andale Mono,8,-1,5,50,0,0,0,0,0"
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\decimalPlaces=2
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\data\factor=1
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\configInfo\version=0.0.0
LineardialGadget\Accel%20Filtered%20Horizontal%20Z\configInfo\locked=false
ScopeGadget\Accel\data\configurationStreamVersion=1000
ScopeGadget\Accel\data\plotType=1
ScopeGadget\Accel\data\dataSize=60
ScopeGadget\Accel\data\refreshInterval=100
ScopeGadget\Accel\data\plotCurveCount=3
ScopeGadget\Accel\data\plotCurve0\uavObject=AttitudeRaw
ScopeGadget\Accel\data\plotCurve0\uavField=accels-X
ScopeGadget\Accel\data\plotCurve0\color=4294901760
ScopeGadget\Accel\data\plotCurve0\yScalePower=0
ScopeGadget\Accel\data\plotCurve0\yMinimum=0
ScopeGadget\Accel\data\plotCurve0\yMaximum=0
ScopeGadget\Accel\data\plotCurve1\uavObject=AttitudeRaw
ScopeGadget\Accel\data\plotCurve1\uavField=accels-Y
ScopeGadget\Accel\data\plotCurve1\color=4283782655
ScopeGadget\Accel\data\plotCurve1\yScalePower=0
ScopeGadget\Accel\data\plotCurve1\yMinimum=0
ScopeGadget\Accel\data\plotCurve1\yMaximum=0
ScopeGadget\Accel\data\plotCurve2\uavObject=AttitudeRaw
ScopeGadget\Accel\data\plotCurve2\uavField=accels-Z
ScopeGadget\Accel\data\plotCurve2\color=4283804160
ScopeGadget\Accel\data\plotCurve2\yScalePower=0
ScopeGadget\Accel\data\plotCurve2\yMinimum=0
ScopeGadget\Accel\data\plotCurve2\yMaximum=0
ScopeGadget\Accel\configInfo\version=0.0.0
ScopeGadget\Accel\configInfo\locked=false
LineardialGadget\Accel%20Horizontal%20X\data\dFile=%%DATAPATH%%dials/default/lineardial-horizontal.svg
LineardialGadget\Accel%20Horizontal%20X\data\sourceDataObject=AttitudeRaw
LineardialGadget\Accel%20Horizontal%20X\data\sourceObjectField=accels-X
LineardialGadget\Accel%20Horizontal%20X\data\minValue=-11
LineardialGadget\Accel%20Horizontal%20X\data\maxValue=11
LineardialGadget\Accel%20Horizontal%20X\data\redMin=-11
LineardialGadget\Accel%20Horizontal%20X\data\redMax=11
LineardialGadget\Accel%20Horizontal%20X\data\yellowMin=-11
LineardialGadget\Accel%20Horizontal%20X\data\yellowMax=-5
LineardialGadget\Accel%20Horizontal%20X\data\greenMin=-10
LineardialGadget\Accel%20Horizontal%20X\data\greenMax=-9
LineardialGadget\Accel%20Horizontal%20X\data\font="Andale Mono,8,-1,5,50,0,0,0,0,0"
LineardialGadget\Accel%20Horizontal%20X\data\decimalPlaces=2
LineardialGadget\Accel%20Horizontal%20X\data\factor=1
LineardialGadget\Accel%20Horizontal%20X\configInfo\version=0.0.0
LineardialGadget\Accel%20Horizontal%20X\configInfo\locked=false
LineardialGadget\Accel%20Horizontal%20Y\data\dFile=%%DATAPATH%%dials/default/lineardial-horizontal.svg
LineardialGadget\Accel%20Horizontal%20Y\data\sourceDataObject=AttitudeRaw
LineardialGadget\Accel%20Horizontal%20Y\data\sourceObjectField=accels-Y
LineardialGadget\Accel%20Horizontal%20Y\data\minValue=-11
LineardialGadget\Accel%20Horizontal%20Y\data\maxValue=11
LineardialGadget\Accel%20Horizontal%20Y\data\redMin=-11
LineardialGadget\Accel%20Horizontal%20Y\data\redMax=11
LineardialGadget\Accel%20Horizontal%20Y\data\yellowMin=-11
LineardialGadget\Accel%20Horizontal%20Y\data\yellowMax=-5
LineardialGadget\Accel%20Horizontal%20Y\data\greenMin=-10
LineardialGadget\Accel%20Horizontal%20Y\data\greenMax=-9
LineardialGadget\Accel%20Horizontal%20Y\data\font="Andale Mono,6,-1,5,50,0,0,0,0,0"
LineardialGadget\Accel%20Horizontal%20Y\data\decimalPlaces=2
LineardialGadget\Accel%20Horizontal%20Y\data\factor=1
LineardialGadget\Accel%20Horizontal%20Y\configInfo\version=0.0.0
LineardialGadget\Accel%20Horizontal%20Y\configInfo\locked=false
LineardialGadget\Accel%20Horizontal%20Z\data\dFile=%%DATAPATH%%dials/default/lineardial-horizontal.svg
LineardialGadget\Accel%20Horizontal%20Z\data\sourceDataObject=AttitudeRaw
LineardialGadget\Accel%20Horizontal%20Z\data\sourceObjectField=accels-Z
LineardialGadget\Accel%20Horizontal%20Z\data\minValue=-11
LineardialGadget\Accel%20Horizontal%20Z\data\maxValue=11
LineardialGadget\Accel%20Horizontal%20Z\data\redMin=-11
LineardialGadget\Accel%20Horizontal%20Z\data\redMax=11
LineardialGadget\Accel%20Horizontal%20Z\data\yellowMin=-11
LineardialGadget\Accel%20Horizontal%20Z\data\yellowMax=-5
LineardialGadget\Accel%20Horizontal%20Z\data\greenMin=-10
LineardialGadget\Accel%20Horizontal%20Z\data\greenMax=-9
LineardialGadget\Accel%20Horizontal%20Z\data\font="Andale Mono,8,-1,5,50,0,0,0,0,0"
LineardialGadget\Accel%20Horizontal%20Z\data\decimalPlaces=2
LineardialGadget\Accel%20Horizontal%20Z\data\factor=1
LineardialGadget\Accel%20Horizontal%20Z\configInfo\version=0.0.0
LineardialGadget\Accel%20Horizontal%20Z\configInfo\locked=false
DialGadget\Deluxe%20Turn%20Coordinator\data\dialFile=/home/lafargue/OP/OpenPilot/trunk/artwork/Dials/deluxe/turncoordinator.svg
DialGadget\Deluxe%20Turn%20Coordinator\data\dialBackgroundID=background
DialGadget\Deluxe%20Turn%20Coordinator\data\dialForegroundID=foreground
@ -1388,9 +1388,9 @@ DialGadget\Deluxe%20Turn%20Coordinator\data\needle3MaxValue=360
DialGadget\Deluxe%20Turn%20Coordinator\data\needle1DataObject=AttitudeActual
DialGadget\Deluxe%20Turn%20Coordinator\data\needle1ObjectField=Roll
DialGadget\Deluxe%20Turn%20Coordinator\data\needle2DataObject=AttitudeRaw
DialGadget\Deluxe%20Turn%20Coordinator\data\needle2ObjectField=accels_filtered-X
DialGadget\Deluxe%20Turn%20Coordinator\data\needle2ObjectField=accels-X
DialGadget\Deluxe%20Turn%20Coordinator\data\needle3DataObject=AttitudeRaw
DialGadget\Deluxe%20Turn%20Coordinator\data\needle3ObjectField=accels_filtered-X
DialGadget\Deluxe%20Turn%20Coordinator\data\needle3ObjectField=accels-X
DialGadget\Deluxe%20Turn%20Coordinator\data\needle1Factor=-1
DialGadget\Deluxe%20Turn%20Coordinator\data\needle2Factor=1
DialGadget\Deluxe%20Turn%20Coordinator\data\needle3Factor=-1
@ -1858,4 +1858,4 @@ Mode3\splitter\side0\side1\side1\side1\classId=DialGadget
Mode3\splitter\side0\side1\side1\side1\gadget\activeConfiguration=Deluxe Barometer
Mode5\splitter\side1\side1\side1\side0\classId=EmptyGadget
Mode5\splitter\side0\classId=ScopeGadget
Mode5\splitter\side0\gadget\activeConfiguration=AccelFiltered
Mode5\splitter\side0\gadget\activeConfiguration=Accel

10
ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
View File

@ -385,11 +385,11 @@ void FGSimulator::processUpdate(const QByteArray& inp)
AttitudeRaw::DataFields rawData;
memset(&rawData, 0, sizeof(AttitudeRaw::DataFields));
rawData = attRaw->getData();
rawData.gyros_filtered[0] = rollRate;
//rawData.gyros_filtered[1] = cos(DEG2RAD * roll) * pitchRate + sin(DEG2RAD * roll) * yawRate;
//rawData.gyros_filtered[2] = cos(DEG2RAD * roll) * yawRate - sin(DEG2RAD * roll) * pitchRate;
rawData.gyros_filtered[1] = pitchRate;
rawData.gyros_filtered[2] = yawRate;
rawData.gyros[0] = rollRate;
//rawData.gyros[1] = cos(DEG2RAD * roll) * pitchRate + sin(DEG2RAD * roll) * yawRate;
//rawData.gyros[2] = cos(DEG2RAD * roll) * yawRate - sin(DEG2RAD * roll) * pitchRate;
rawData.gyros[1] = pitchRate;
rawData.gyros[2] = yawRate;
attRaw->setData(rawData);
// attRaw->updated();
}

6
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
View File

@ -272,9 +272,9 @@ void IL2Simulator::processUpdate(const QByteArray& inp)
AttitudeRaw::DataFields rawData;
memset(&rawData, 0, sizeof(AttitudeRaw::DataFields));
rawData = attRaw->getData();
rawData.gyros_filtered[0] = current.dRoll;
rawData.gyros_filtered[1] = cos(DEG2RAD * current.roll) * current.dPitch + sin(DEG2RAD * current.roll) * current.dAzimuth;
rawData.gyros_filtered[2] = cos(DEG2RAD * current.roll) * current.dAzimuth - sin(DEG2RAD * current.roll) * current.dPitch;
rawData.gyros[0] = current.dRoll;
rawData.gyros[1] = cos(DEG2RAD * current.roll) * current.dPitch + sin(DEG2RAD * current.roll) * current.dAzimuth;
rawData.gyros[2] = cos(DEG2RAD * current.roll) * current.dAzimuth - sin(DEG2RAD * current.roll) * current.dPitch;
// Update homelocation
HomeLocation::DataFields homeData;

6
ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
View File

@ -370,11 +370,11 @@ void XplaneSimulator::processUpdate(const QByteArray& dataBuf)
AttitudeRaw::DataFields rawData;
memset(&rawData, 0, sizeof(AttitudeRaw::DataFields));
rawData = attRaw->getData();
rawData.gyros_filtered[0] = rollRate;
rawData.gyros[0] = rollRate;
//rawData.gyros_filtered[1] = cos(DEG2RAD * roll) * pitchRate + sin(DEG2RAD * roll) * yawRate;
//rawData.gyros_filtered[2] = cos(DEG2RAD * roll) * yawRate - sin(DEG2RAD * roll) * pitchRate;
rawData.gyros_filtered[1] = pitchRate;
rawData.gyros_filtered[2] = yawRate;
rawData.gyros[1] = pitchRate;
rawData.gyros[2] = yawRate;
attRaw->setData(rawData);