Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 448 → Rev 449

/QMK-Groundstation/branches/libMK/Forms/dlg_MotorMixer.cpp
76,10 → 76,10
}
 
// Motordaten übernehmen.
//FIXME: put this in libMK/Handler.cpp and fill motor values in KopterData
/*
void dlg_MotorMixer::set_MotorConfig(sRxData RX)
{
//FIXME: put this in libMK/Handler.cpp and fill motor values in KopterData
/*
int Pos = 0;
 
MixerName = ToolBox::dataToQString(RX.decode, 1, 12);
96,8 → 96,8
}
 
set_MotorData();
}
*/
}
 
// Motordaten aus GUI übernehmen
void dlg_MotorMixer::get_MotorData()
104,8 → 104,7
{
sMotorData motorData;
 
char * mixerName = le_NAME->text().toAscii().data();
motorData.mixer_name = string(mixerName);
motorData.mixer_name = le_NAME->text().toAscii().data();
 
int gas[MAX_MOTORS] = {
sb_GAS_1->value(), sb_GAS_2->value(), sb_GAS_3->value(), sb_GAS_4->value(),
140,7 → 139,7
void dlg_MotorMixer::set_MotorData()
{
sMotorData motorData = handler->data->motor;
le_NAME->setText(motorData.mixer_name.c_str());
le_NAME->setText(motorData.mixer_name);
 
sb_GAS_1->setValue(motorData.mixer_gas[0]);
sb_GAS_2->setValue(motorData.mixer_gas[1]);
361,7 → 360,7
QSettings Setting(Filename, QSettings::IniFormat);
 
Setting.beginGroup("Info");
Setting.setValue("Name", data->motor.mixer_name.c_str());
Setting.setValue("Name", data->motor.mixer_name);
Setting.setValue("Version", data->motor.mixer_version);
Setting.endGroup();