rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-03 11:24:10 +01:00
Code Issues Releases Activity

CCPM Mixer: Field names should not be translated. This would break heli

Browse Source 
support in non-english languages :)
This commit is contained in:
James Cotton 2011-08-05 18:51:01 -05:00
parent faca2e9651
commit 218438e6f8
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ground/openpilotgcs/src/plugins/config/configccpmwidget.cpp
View File

@ -1284,10 +1284,6 @@ void ConfigccpmWidget::requestccpmUpdate()
ServoCurve2[NumServos]=MixerDataFromHeli[i][1];//record the ThrottleCurve2 contribution to this servo ServoCurve2[NumServos]=MixerDataFromHeli[i][1];//record the ThrottleCurve2 contribution to this servo
ServoAngles[NumServos]=NumServos*45;//make this 0 for the final version ServoAngles[NumServos]=NumServos*45;//make this 0 for the final version
//if (NumServos==0)m_ccpm->ccpmServoWChannel->setCurrentIndex(i);
//if (NumServos==1)m_ccpm->ccpmServoXChannel->setCurrentIndex(i);
//if (NumServos==2)m_ccpm->ccpmServoYChannel->setCurrentIndex(i);
//if (NumServos==3)m_ccpm->ccpmServoZChannel->setCurrentIndex(i);
NumServos++; NumServos++;
} }
@ -1342,7 +1338,7 @@ void ConfigccpmWidget::sendccpmUpdate()
//clear the output types //clear the output types
for (i=0;i<8;i++) for (i=0;i<8;i++)
{ {
field = obj->getField(tr( "Mixer%1Type" ).arg( i+1 )); field = obj->getField( QString( "Mixer%1Type" ).arg( i+1 ));
//clear the mixer type //clear the mixer type
field->setValue("Disabled"); field->setValue("Disabled");
} }
@ -1363,7 +1359,7 @@ void ConfigccpmWidget::sendccpmUpdate()
if (MixerChannelData[i]<8) if (MixerChannelData[i]<8)
{ {
//select the correct mixer for this config element //select the correct mixer for this config element
field = obj->getField(tr( "Mixer%1Type" ).arg( MixerChannelData[i]+1 )); field = obj->getField(QString( "Mixer%1Type" ).arg( MixerChannelData[i]+1 ));
//set the mixer type //set the mixer type
if (i==0) if (i==0)
{ {
@ -1375,7 +1371,7 @@ void ConfigccpmWidget::sendccpmUpdate()
} }
//select the correct mixer for this config element //select the correct mixer for this config element
field = obj->getField(tr( "Mixer%1Vector" ).arg( MixerChannelData[i]+1 )); field = obj->getField(QString( "Mixer%1Vector" ).arg( MixerChannelData[i]+1 ));
//config the vector //config the vector
for (j=0;j<5;j++) for (j=0;j<5;j++)
{ {